root first, then rest

kolyma-labs · Jun 12, 2024 · 53def2d · 53def2d
1 parent 37e5b82
commit 53def2d
Showing 1 changed file with 25 additions and 24 deletions.
diff --git a/disk-config.nix b/disk-config.nix
@@ -1,7 +1,7 @@
 {
   disko.devices = {
     disk = {
-      one = {
+      nvme0n1 = {
         type = "disk";
         device = "/dev/nvme0n1";
         content = {
@@ -15,6 +15,7 @@
             ESP = {
               size = "500M";
               type = "EF00";
+              priority = 2;
               content = {
                 type = "mdraid";
                 name = "boot";
@@ -24,20 +25,20 @@
               size = "32G";
               content = {
                 type = "mdraid";
-                name = "plainSwap";
+                name = "swap";
               };
             };
-            mdadm = {
+            ROOT = {
               size = "100%";
               content = {
                 type = "mdraid";
-                name = "raid1";
+                name = "root";
               };
             };
           };
         };
       };
-      two = {
+      nvme1n1 = {
         type = "disk";
         device = "/dev/nvme1n1";
         content = {
@@ -59,21 +60,36 @@
               size = "32G";
               content = {
                 type = "mdraid";
-                name = "plainSwap";
+                name = "swap";
               };
             };
-            mdadm = {
+            ROOT = {
               size = "100%";
               content = {
                 type = "mdraid";
-                name = "raid1";
+                name = "root";
               };
             };
           };
         };
       };
     };
     mdadm = {
+      root = {
+        type = "mdadm";
+        level = 1;
+        content = {
+          type = "gpt";
+          partitions.primary = {
+            size = "100%";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
+            };
+          };
+        };
+      };
       boot = {
         type = "mdadm";
         level = 1;
@@ -84,28 +100,13 @@
           mountpoint = "/boot";
         };
       };
-      plainSwap = {
+      swap = {
         type = "mdadm";
         level = 1;
         content = {
           type = "swap";
         };
       };
-      raid1 = {
-        type = "mdadm";
-        level = 1;
-        content = {
-          type = "gpt";
-          partitions.primary = {
-            size = "100%";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-            };
-          };
-        };
-      };
     };
   };
 }