zfs full pool encryption

This commit is contained in:
Simon Gardling 2025-01-29 23:47:35 -05:00
parent 199b9f3d78
commit f836aa06b4
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
4 changed files with 27 additions and 26 deletions

View File

@ -101,14 +101,10 @@
mkdir -p ${config.boot.lanzaboote.pkiBundle} mkdir -p ${config.boot.lanzaboote.pkiBundle}
${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${config.boot.lanzaboote.pkiBundle} ${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${config.boot.lanzaboote.pkiBundle}
''; '';
"zfs-encryption-keys".text = ''
#!/bin/sh
rm -fr /etc/zfs-key
cp /etc/nixos/secrets/zfs-key /etc/zfs-key
'';
}; };
boot.initrd.secrets."/etc/zfs-key" = /etc/nixos/secrets/zfs-key;
environment.etc = { environment.etc = {
"issue".text = ""; "issue".text = "";
}; };
@ -292,6 +288,9 @@
"wheel" "wheel"
"video" "video"
"render" "render"
"postgres"
"owntracks"
"immich"
]; ];
hashedPasswordFile = "/etc/nixos/secrets/hashedPass"; hashedPasswordFile = "/etc/nixos/secrets/hashedPass";
@ -353,5 +352,5 @@
"d ${config.services.postgresql.dataDir} 0700 postgres postgres" "d ${config.services.postgresql.dataDir} 0700 postgres postgres"
]; ];
system.stateVersion = "24.05"; system.stateVersion = "24.11";
} }

12
flake.lock generated
View File

@ -163,11 +163,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738028598, "lastModified": 1738201338,
"narHash": "sha256-0AjsOFj8Tyl1S8mEgr2MKCHIj0Y+/Gy275xas2kduqQ=", "narHash": "sha256-yO1zdfkSyNWywriGUTRbDnJsoZkjFwpl/1DVwdv9GNA=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "381b2e789876208216b26725009826c80c99399f", "rev": "ce78a3fcb768948c3b2ed1196fdd124a4316a863",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737885640, "lastModified": 1738023785,
"narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "narHash": "sha256-BPHmb3fUwdHkonHyHi1+x89eXB3kA1jffIpwPVJIVys=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "rev": "2b4230bf03deb33103947e2528cac2ed516c5c89",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -64,8 +64,8 @@ in
}; };
moonrise = fetchurl { moonrise = fetchurl {
url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/a8Zqa1bJ/Moonrise-Fabric-0.2.0-beta.7%2B6ec14ff.jar"; url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/J5ayzvZp/Moonrise-Fabric-0.2.0-beta.8%2B0cbff02.jar";
sha512 = "4ebc97764038aebd0b4bc5f6b25f9356419cf32f6c8bd64016665d9aad5c9f79ca9df2decac3038f7f713ff595c2b3286b3a1eb4d6debcd6639a52556416581a"; sha512 = "d6f8b698226ebfcd87635cc2796022b0dad030f1d9ff5fd77d184b729c4d0c1f7dcfd265ab0f80186178c8c89fbdce20407b1025af05edec8c4a4f8df605ebf6";
}; };
squaremap = fetchurl { squaremap = fetchurl {

View File

@ -64,7 +64,8 @@
QueueingSystemEnabled = false; # seed all torrents all the time QueueingSystemEnabled = false; # seed all torrents all the time
AddTrackersEnabled = true; AddTrackersEnabled = true;
AdditionalTrackers = (lib.concatStrings ( AdditionalTrackers = (
lib.concatStrings (
map (url: url + "\\n") [ map (url: url + "\\n") [
"udp://tracker.opentrackr.org:1337/announce" "udp://tracker.opentrackr.org:1337/announce"
"udp://open.stealth.si:80/announce" "udp://open.stealth.si:80/announce"
@ -74,7 +75,8 @@
"udp://tracker.bittor.pw:1337/announce" "udp://tracker.bittor.pw:1337/announce"
"udp://tracker.torrent.eu.org:451/announce" "udp://tracker.torrent.eu.org:451/announce"
] ]
)); )
);
}; };
}; };
}; };