fixes, config passes nix flake check .

2026-06-21 22:40:03 -05:00
parent 1c7f690500
commit 3b813df802
11 changed files with 100 additions and 84 deletions
@@ -1,71 +1,68 @@
 { disk, ... }:

 {
-  disko.devices.disk.main = {
-    type = "disk";
-    device = disk;
-    content = {
-      type = "gpt";
-
-      partitions = {
-        ESP = {
-          size = "1G";
-          type = "EF00";
-
-          content = {
-            type = "filesystem";
-            format = "vfat";
-            mountpoint = "/boot";
-          };
-        };
-
-        luks = {
-          size = "100%";
-
-          content = {
-            type = "luks";
-            name = "cryptroot";
-
-            # important: allow TPM-based unlocking
-            settings = {
-              allowDiscards = true;
-            };
-
-            # this is key for TPM workflows
-            initrdUnlock = true;
+  disko.devices = {
+    disk.main = {
+      type = "disk";
+      device = disk;
+      content = {
+        type = "gpt";
+        partitions = {
+          ESP = {
+            size = "1G";
+            type = "EF00";

            content = {
-              type = "zfs";
-              pool = "rpool";
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+            };
+          };
+
+          luks = {
+            size = "100%";
+            content = {
+              type = "luks";
+              name = "cryptroot";
+              # important: allow TPM-based unlocking
+              settings = {
+                allowDiscards = true;
+              };
+
+              # this is key for TPM workflows
+              initrdUnlock = true;
+              content = {
+                type = "zfs";
+                pool = "rpool";
+              };
            };
          };
        };
      };
    };
-  };

-  zpool.rpool = {
-    type = "zpool";
-
-    rootFsOptions = {
-      compression = "zstd";
-      "com.sun:auto-snapshot" = "true";
-    };
-
-    datasets = {
-      root = {
-        type = "zfs_fs";
-        mountpoint = "/";
+    # Moved inside disko.devices
+    zpool.rpool = {
+      type = "zpool";
+      rootFsOptions = {
+        compression = "zstd";
+        "com.sun:auto-snapshot" = "true";
      };
+      datasets = {
+        root = {
+          type = "zfs_fs";
+          mountpoint = "/";
+        };

-      nix = {
-        type = "zfs_fs";
-        mountpoint = "/nix";
-      };
+        nix = {
+          type = "zfs_fs";
+          mountpoint = "/nix";
+        };

-      home = {
-        type = "zfs_fs";
-        mountpoint = "/home";
+        home = {
+          type = "zfs_fs";
+          mountpoint = "/home";
+        };
      };
    };
  };