nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Compare commits

base: nki:578ae91c59330ac0a46eb5289f17d2af2343bb87
Branches Tags
nki:master
nki:remove-macbook
nki:invi
nki:local-net
nki:test
..
compare: nki:ac483e1d9d1ee64c50fd40b8722678d43c036abe
Branches Tags
nki:master
nki:remove-macbook
nki:invi
nki:local-net
nki:test

No commits in common. "578ae91c59330ac0a46eb5289f17d2af2343bb87" and "ac483e1d9d1ee64c50fd40b8722678d43c036abe" have entirely different histories.
578ae91c59 ... ac483e1d9d

2 changed files with 38 additions and 49 deletions
Show stats Expand all files Collapse all files

32
nki-home/hardware-configuration.nix
View file

@ -9,22 +9,6 @@
... ...
}: }:
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")
@ -61,8 +45,20 @@ in
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/steam" = from-encdata "steam"; fileSystems."/mnt/steam" = {
fileSystems."/nix" = from-encdata "nix"; device = "/dev/disk/by-uuid/d1db9f65-6add-4714-b9d7-16e16f687396";
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"; } ];

55
overlay.nix
View file

@ -31,38 +31,31 @@ let
}; };
overlay-versioning = final: prev: { overlay-versioning = final: prev: {
gotosocial = gotosocial = prev.gotosocial.overrideAttrs (attrs: rec {
let version = "0.18.1";
local = prev.gotosocial.overrideAttrs (attrs: rec { ldflags = [
version = "0.18.1"; "-s"
ldflags = [ "-w"
"-s" "-X main.Version=${version}"
"-w" ];
"-X main.Version=${version}" doCheck = false;
];
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;