1 files changed, 16 insertions, 3 deletions

diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index fc20ef7c..1bcf0261 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -8,15 +8,28 @@
         options = [ "fmask=0033" "dmask=0022" ];
       };
     "/.bcachefs" =
-      { device = "/dev/mapper/sif-nvm0:/dev/mapper/sif-nvm1";
+      { options = [
+          "x-systemd.requires=/dev/disk/by-id/dm-name-sif-nvm0"
+          "x-systemd.requires=/dev/disk/by-id/dm-name-sif-nvm1"
+        ];
+        device = "/dev/disk/by-uuid/fe7bdaac-d2f3-4535-a635-e2fb97ef3802";
         fsType = "bcachefs";
         neededForBoot = true;
       };
     "/var/lib/sops-nix".neededForBoot = true;
     "/var/lib/systemd".neededForBoot = true;
   };
-  system.etc.overlay.enable = false;
-  systemd.sysusers.enable = false;
+  swapDevices = [
+    { label = "swap"; }
+  ];
+  # system.etc.overlay.enable = false;
+
+  boot.initrd.systemd.packages = [
+    (pkgs.writeTextDir "/etc/systemd/system/\\x2ebcachefs.mount.d/block_scan.conf" ''
+      [Mount]
+      Environment=BCACHEFS_BLOCK_SCAN=1
+    '')
+  ];
 
   # boot.initrd.supportedFilesystems.bcachefs = true;
   # boot.initrd.systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false;