fix server disk config (i think)

1 files changed, 59 insertions, 56 deletions

diff --git a/hosts/canadian-government-system/disks.nix b/hosts/canadian-government-system/disks.nix
index 01a23e7..6e86a26 100644
--- a/hosts/canadian-government-system/disks.nix
+++ b/hosts/canadian-government-system/disks.nix
@@ -1,63 +1,85 @@
 {
-  disko.devices.disk = {
-    boot1 = {
-      content = {
-        partitions = {
-          boot = {
-            content = {
-              name = "boot";
-              type = "mdraid";
+  disko.devices = {
+    disk = {
+      boot1 = {
+        content = {
+          partitions = {
+            boot = {
+              content = {
+                name = "boot";
+                type = "mdraid";
+              };
+
+              size = "500M";
+              type = "EF00";
             };
 
-            size = "500M";
-            type = "EF00";
-          };
+            root = {
+              content = {
+                name = "raid1";
+                type = "mdraid";
+              };
 
-          root = {
-            content = {
-              name = "raid1";
-              type = "mdraid";
+              size = "100%";
             };
-
-            size = "100%";
           };
+
+          type = "gpt";
         };
 
-        type = "gpt";
+        device = "/dev/sda";
+        type = "disk";
       };
 
-      device = "/dev/sda";
-      type = "disk";
-    };
+      boot2 = {
+        content = {
+          partitions = {
+            boot = {
+              content = {
+                name = "boot";
+                type = "mdraid";
+              };
 
-    boot2 = {
-      content = {
-        partitions = {
-          boot = {
-            content = {
-              name = "boot";
-              type = "mdraid";
+              size = "500M";
+              type = "EF00";
             };
 
-            size = "500M";
-            type = "EF00";
+            root = {
+              content = {
+                name = "raid1";
+                type = "mdraid";
+              };
+
+              size = "100%";
+            };
           };
 
-          root = {
+          type = "gpt";
+        };
+
+        device = "/dev/sdb";
+        type = "disk";
+      };
+
+      mass-storage = {
+        content = {
+          partitions.main = {
             content = {
-              name = "raid1";
-              type = "mdraid";
+              format = "xfs";
+              mountOptions = [ "noatime" ];
+              mountpoint = "/mnt/mass-storage";
+              type = "filesystem";
             };
 
             size = "100%";
           };
+
+          type = "gpt";
         };
 
-        type = "gpt";
+        device = "/dev/sdc";
+        type = "disk";
       };
-
-      device = "/dev/sdb";
-      type = "disk";
     };
 
     mdadm = {
@@ -95,24 +117,5 @@
       };
     };
 
-    mass-storage = {
-      content = {
-        partitions.main = {
-          content = {
-            format = "xfs";
-            mountOptions = [ "noatime" ];
-            mountpoint = "/mnt/mass-storage";
-            type = "filesystem";
-          };
-
-          size = "100%";
-        };
-
-        type = "gpt";
-      };
-
-      device = "/dev/sdc";
-      type = "disk";
-    };
   };
 }