From 6979be2400771fb7547e56dedd617cabb939c83c Mon Sep 17 00:00:00 2001
From: Sokhibjon Orzikulov <sakhib@orzklv.uz>
Date: Tue, 18 Jun 2024 21:01:17 +0500
Subject: [PATCH] Update disk-config.nix

---
 disk-config.nix | 58 +++++++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/disk-config.nix b/disk-config.nix
index 603a86b..49b8634 100644
--- a/disk-config.nix
+++ b/disk-config.nix
@@ -1,7 +1,18 @@
+# /dev/nvme0n1
+# /dev/nvme1n1
+#
+# Disk
+# |- BOOT
+# |- ESP
+# |  |- mdraid
+# |- SWAP
+# |  |- mdraid
+# |- ROOT
+#    |- mdraid
 {
   disko.devices = {
     disk = {
-      nvme0n1 = {
+      one = {
         type = "disk";
         device = "/dev/nvme0n1";
         content = {
@@ -10,12 +21,10 @@
             BOOT = {
               size = "1M";
               type = "EF02";
-              priority = 1;
             };
             ESP = {
               size = "500M";
               type = "EF00";
-              priority = 2;
               content = {
                 type = "mdraid";
                 name = "boot";
@@ -28,25 +37,26 @@
                 name = "swap";
               };
             };
-            ROOT = {
+            mdadm = {
               size = "100%";
               content = {
                 type = "mdraid";
-                name = "root";
+                name = "raid1";
               };
             };
           };
         };
       };
-      nvme1n1 = {
+      two = {
         type = "disk";
         device = "/dev/nvme1n1";
         content = {
           type = "gpt";
           partitions = {
-            BOOT = {
+            boot = {
               size = "1M";
               type = "EF02";
+              priority = 1; # Needs to be first partition
             };
             ESP = {
               size = "500M";
@@ -63,11 +73,11 @@
                 name = "swap";
               };
             };
-            ROOT = {
+            mdadm = {
               size = "100%";
               content = {
                 type = "mdraid";
-                name = "root";
+                name = "raid1";
               };
             };
           };
@@ -75,21 +85,6 @@
       };
     };
     mdadm = {
-      root = {
-        type = "mdadm";
-        level = 1;
-        content = {
-          type = "gpt";
-          partitions.primary = {
-            size = "100%";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-            };
-          };
-        };
-      };
       boot = {
         type = "mdadm";
         level = 1;
@@ -107,6 +102,21 @@
           type = "swap";
         };
       };
+      raid1 = {
+        type = "mdadm";
+        level = 1;
+        content = {
+          type = "gpt";
+          partitions.primary = {
+            size = "100%";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
+            };
+          };
+        };
+      };
     };
   };
 }