From 493d4ea2cc87309d96c2ee6a4f2590171f934294 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 6 Jan 2025 17:46:24 +0100
Subject: ...

---
 hosts/sif/default.nix |  1 -
 hosts/sif/hw.nix      | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 7c8da63a..088e1022 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -34,7 +34,6 @@ in {
     boot = {
       initrd = {
         systemd = {
-          enable = false;
           emergencyAccess = config.users.users.root.hashedPassword;
         };
         luks.devices = {
diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index bfd91d57..d80f959c 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -8,14 +8,22 @@
         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 = "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;
+  # system.etc.overlay.enable = false;
+
+  boot.initrd.systemd.contents."/etc/systemd/system/\\x2ebcachefs.mount.d/block_scan.conf".text = ''
+    Environment=BCACHEFS_BLOCK_SCAN=1
+  '';
 
   # boot.initrd.supportedFilesystems.bcachefs = true;
   # boot.initrd.systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false;
-- 
cgit v1.2.3