diff options
Diffstat (limited to 'hosts/skadhi/fs.nix')
| -rw-r--r-- | hosts/skadhi/fs.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hosts/skadhi/fs.nix b/hosts/skadhi/fs.nix index a2a01392..73191aa9 100644 --- a/hosts/skadhi/fs.nix +++ b/hosts/skadhi/fs.nix | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | "/var/lib/systemd" | 17 | "/var/lib/systemd" |
| 18 | config.boot.lanzaboote.pkiBundle | 18 | config.boot.lanzaboote.pkiBundle |
| 19 | ]; | 19 | ]; |
| 20 | timezone = true; | ||
| 21 | }; | 20 | }; |
| 22 | 21 | ||
| 23 | disko.devices = { | 22 | disko.devices = { |
| @@ -52,6 +51,7 @@ | |||
| 52 | content = { | 51 | content = { |
| 53 | type = "btrfs"; | 52 | type = "btrfs"; |
| 54 | extraArgs = let | 53 | extraArgs = let |
| 54 | dirs = map (p: "/persistent/${p}") ["/etc"]; | ||
| 55 | subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"]; | 55 | subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"]; |
| 56 | restricted = map (p: "/persistent/${p}") ["/root"]; | 56 | restricted = map (p: "/persistent/${p}") ["/root"]; |
| 57 | in [ | 57 | in [ |
| @@ -60,8 +60,9 @@ | |||
| 60 | "--rootdir" (toString (pkgs.runCommand "rootdir" { | 60 | "--rootdir" (toString (pkgs.runCommand "rootdir" { |
| 61 | } '' | 61 | } '' |
| 62 | mkdir $out | 62 | mkdir $out |
| 63 | install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") subvols} | 63 | install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") (dirs ++ subvols)} |
| 64 | install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted} | 64 | install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted} |
| 65 | ln -s /etc/zoneinfo/UTC /persistent/etc/localtime | ||
| 65 | '')) | 66 | '')) |
| 66 | ] ++ lib.concatMap (p: ["--subvol" p]) (subvols ++ restricted); | 67 | ] ++ lib.concatMap (p: ["--subvol" p]) (subvols ++ restricted); |
| 67 | subvolumes = { | 68 | subvolumes = { |
