Compare commits

..

2 commits

2 changed files with 49 additions and 38 deletions

View file

@ -9,6 +9,22 @@
... ...
}: }:
let
from-encdata = subvol: {
device = "/dev/disk/by-uuid/d1db9f65-6add-4714-b9d7-16e16f687396";
fsType = "btrfs";
options = [
"compress=zstd"
"subvol=${subvol}"
];
encrypted = {
enable = true;
label = "encdata";
blkDev = "/dev/disk/by-uuid/6544f506-9a22-479c-8bfc-aee1b9e0deda";
keyFile = "/sysroot/var/crypto/key_data";
};
};
in
{ {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
@ -45,20 +61,8 @@
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/steam" = { fileSystems."/mnt/steam" = from-encdata "steam";
device = "/dev/disk/by-uuid/d1db9f65-6add-4714-b9d7-16e16f687396"; fileSystems."/nix" = from-encdata "nix";
fsType = "btrfs";
options = [
"compress=zstd"
"subvol=steam"
];
encrypted = {
enable = true;
label = "encdata";
blkDev = "/dev/disk/by-uuid/6544f506-9a22-479c-8bfc-aee1b9e0deda";
keyFile = "/sysroot/var/crypto/key_data";
};
};
swapDevices = [ { device = "/dev/disk/by-uuid/561f6441-1915-4059-a5e1-76a449b0c9bf"; } ]; swapDevices = [ { device = "/dev/disk/by-uuid/561f6441-1915-4059-a5e1-76a449b0c9bf"; } ];

View file

@ -31,31 +31,38 @@ let
}; };
overlay-versioning = final: prev: { overlay-versioning = final: prev: {
gotosocial = prev.gotosocial.overrideAttrs (attrs: rec { gotosocial =
version = "0.18.1"; let
ldflags = [ local = prev.gotosocial.overrideAttrs (attrs: rec {
"-s" version = "0.18.1";
"-w" ldflags = [
"-X main.Version=${version}" "-s"
]; "-w"
doCheck = false; "-X main.Version=${version}"
];
doCheck = false;
web-assets = final.fetchurl { web-assets = final.fetchurl {
url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v${version}/gotosocial_${version}_web-assets.tar.gz"; url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v${version}/gotosocial_${version}_web-assets.tar.gz";
hash = "sha256-5MSABLPyTbFMTno9vUDvLT9h7oQM6eNUuwD+dsHiCLo="; hash = "sha256-5MSABLPyTbFMTno9vUDvLT9h7oQM6eNUuwD+dsHiCLo=";
}; };
src = final.fetchFromGitHub { src = final.fetchFromGitHub {
owner = "superseriousbusiness"; owner = "superseriousbusiness";
repo = "gotosocial"; repo = "gotosocial";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-4jV1G1HwpIST2Y27RAhJB3CoJevwuhxdzi615hj0Qv0="; hash = "sha256-4jV1G1HwpIST2Y27RAhJB3CoJevwuhxdzi615hj0Qv0=";
}; };
postInstall = '' postInstall = ''
tar xf ${web-assets} tar xf ${web-assets}
mkdir -p $out/share/gotosocial mkdir -p $out/share/gotosocial
mv web $out/share/gotosocial/ mv web $out/share/gotosocial/
''; '';
}); });
in
if builtins.compareVersions prev.gotosocial.version local.version == -1 then
local
else
prev.gotosocial;
input-remapper = final.unstable.input-remapper; input-remapper = final.unstable.input-remapper;