1 files changed, 41 insertions, 22 deletions

diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix
index 3442a93a..fc20ef7c 100644
--- a/hosts/sif/hw.nix
+++ b/hosts/sif/hw.nix
@@ -1,31 +1,50 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
 
 {
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/f094bf06-66f9-40a8-9ab2-2b54d05223d2";
-      fsType = "btrfs";
-    };
+  fileSystems = {
+    "/boot" =
+      { label = "boot";
+        fsType = "vfat";
+        options = [ "fmask=0033" "dmask=0022" ];
+      };
+    "/.bcachefs" =
+      { device = "/dev/mapper/sif-nvm0:/dev/mapper/sif-nvm1";
+        fsType = "bcachefs";
+        neededForBoot = true;
+      };
+    "/var/lib/sops-nix".neededForBoot = true;
+    "/var/lib/systemd".neededForBoot = true;
+  };
+  system.etc.overlay.enable = false;
+  systemd.sysusers.enable = false;
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B3A2-D029";
-      fsType = "vfat";
-    };
+  # boot.initrd.supportedFilesystems.bcachefs = true;
+  # boot.initrd.systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false;
+  # systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false;
+  # boot.initrd.systemd.services."bcachefs" = {
+  #   before = [ "initrd-fs.target" ];
+  #   after = [ "local-fs-pre.target"  "dev-sif-nvm0.device" "dev-sif-nvm1.device" ];
+  #   requires = [ "dev-sif-nvm0.device" "dev-sif-nvm1.device"  ];
+  #   wantedBy = [ "initrd-fs.target" ];
+  #   unitConfig = {
+  #     DefaultDependencies = false;
+  #     StopPropagatedFrom = [ "dev-sif-nvm0.device" "dev-sif-nvm1.device"  ];
+  #   };
+  #   serviceConfig = {
+  #     Type = "oneshot";
+  #     ExecStart = "/bin/mount -o X-mount.mkdir -t bcachefs /dev/sif/nvm0:/dev/sif/nvm1 /sysroot/.bcachefs";
+  #     RemainAfterExit = true;
+  #   };
+  # };
+  # systemd.services."bcachefs" = {
+  #   serviceConfig = {
+  #     Type = "oneshot";
+  #     ExecStart = "${pkgs.coreutils}/bin/true";
+  #   };
+  # };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/9e932072-3c56-4a9c-8da7-3163d2a8bf28";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/var/media" =
-    { device = "/dev/disk/by-uuid/437eca70-d017-4d52-a1fa-2f4c7a87f096";
-      fsType = "btrfs";
-    };
-
-  nix.settings.max-jobs = 12;
   # High-DPI console
   console.font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
 
-  hardware.cpu.intel.updateMicrocode = true;
-  
   hardware.enableRedistributableFirmware = true;
 }