diff options
| -rw-r--r-- | hosts/skadhi/fs.nix | 3 | ||||
| -rw-r--r-- | hosts/skadhi/hw.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hosts/skadhi/fs.nix b/hosts/skadhi/fs.nix index a2a01392..055769f3 100644 --- a/hosts/skadhi/fs.nix +++ b/hosts/skadhi/fs.nix | |||
| @@ -52,6 +52,7 @@ | |||
| 52 | content = { | 52 | content = { |
| 53 | type = "btrfs"; | 53 | type = "btrfs"; |
| 54 | extraArgs = let | 54 | extraArgs = let |
| 55 | dirs = map (p: "/persistent/${p}") ["/etc"]; | ||
| 55 | subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"]; | 56 | subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"]; |
| 56 | restricted = map (p: "/persistent/${p}") ["/root"]; | 57 | restricted = map (p: "/persistent/${p}") ["/root"]; |
| 57 | in [ | 58 | in [ |
| @@ -60,7 +61,7 @@ | |||
| 60 | "--rootdir" (toString (pkgs.runCommand "rootdir" { | 61 | "--rootdir" (toString (pkgs.runCommand "rootdir" { |
| 61 | } '' | 62 | } '' |
| 62 | mkdir $out | 63 | mkdir $out |
| 63 | install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") subvols} | 64 | install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") (dirs ++ subvols)} |
| 64 | install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted} | 65 | install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted} |
| 65 | '')) | 66 | '')) |
| 66 | ] ++ lib.concatMap (p: ["--subvol" p]) (subvols ++ restricted); | 67 | ] ++ lib.concatMap (p: ["--subvol" p]) (subvols ++ restricted); |
diff --git a/hosts/skadhi/hw.nix b/hosts/skadhi/hw.nix index ad353208..b5391d81 100644 --- a/hosts/skadhi/hw.nix +++ b/hosts/skadhi/hw.nix | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | services.fstrim.enable = false; | 10 | services.fstrim.enable = false; |
| 11 | 11 | ||
| 12 | services.udev.extraRules = '' | 12 | services.udev.extraRules = '' |
| 13 | ACTION=="add", SUBSYSTEM=="platform", DRIVER=="acpi-button", KERNEL=="PNP0C0D:00", ATTR{power/wakeup}="disabled" | 13 | ACTION=="add", SUBSYSTEM=="platform", DRIVERS=="acpi-button", KERNELS=="PNP0C0D:00", ATTR{power/wakeup}="disabled" |
| 14 | ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" | 14 | ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" |
| 15 | ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" | 15 | ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" |
| 16 | ''; | 16 | ''; |
