hosts/alice/default.nix

@@ -1,8 +1,8 @@
 {
   agenix,
-  disko,
   home-manager,
   lix-module,
+  nixos-hardware,
   nur,
   pkgs,
   ...
@@ -11,13 +11,11 @@
     ./hardware-configuration.nix
     ./system.nix
     agenix.nixosModules.default
-    disko.nixosModules.disko
     home-manager.nixosModule
     lix-module.nixosModules.default
     nur.nixosModules.nur
 
     ./borg.nix
-    ./disk-config.nix
     ./gdm.nix
     ./pipewire.nix
     ./printer.nix

hosts/alice/disk-config.nix

@@ -1,40 +0,0 @@
-{
-  disko.devices = {
-    disk.main = {
-      device = "/dev/nvme0n1";
-      type = "disk";
-      content = {
-        type = "gpt";
-        partitions = {
-          esp = {
-            name = "esp";
-            size = "1G";
-            type = "EF00";
-            content = {
-              type = "filesystem";
-              format = "vfat";
-              mountpoint = "/boot";
-              mountOptions = ["umask=0077"];
-            };
-          };
-          luks = {
-            size = "100%";
-            label = "luks";
-            content = {
-              type = "luks";
-              name = "crypted";
-              settings = {
-                allowDiscards = true;
-              };
-              content = {
-                type = "filesystem";
-                format = "ext4";
-                mountpoint = "/";
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

hosts/alice/hardware-configuration.nix

@@ -19,6 +19,20 @@
     extraModulePackages = [];
   };
 
+  fileSystems."/" = {
+    device = "UUID=288cfd6e-dd6d-4ac4-bc2f-36c1309f8619";
+    fsType = "bcachefs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/6029-DD49";
+    fsType = "vfat";
+  };
+
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/62a6b7a0-413a-46e8-bf6f-aba4eedf06a9";}
+  ];
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction