...

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 @@
                 content = {
                   type = "btrfs";
                   extraArgs = let
+                    dirs = map (p: "/persistent/${p}") ["/etc"];
                     subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"];
                     restricted = map (p: "/persistent/${p}") ["/root"];
                   in [
@@ -60,7 +61,7 @@
                     "--rootdir" (toString (pkgs.runCommand "rootdir" {
                     } ''
                       mkdir $out
-                      install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") subvols}
+                      install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") (dirs ++ subvols)}
                       install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted}
                     ''))
                   ] ++ 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 @@
     services.fstrim.enable = false;
 
     services.udev.extraRules = ''
-      ACTION=="add", SUBSYSTEM=="platform", DRIVER=="acpi-button", KERNEL=="PNP0C0D:00", ATTR{power/wakeup}="disabled"
+      ACTION=="add", SUBSYSTEM=="platform", DRIVERS=="acpi-button", KERNELS=="PNP0C0D:00", ATTR{power/wakeup}="disabled"
       ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
       ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
    '';