From 2e26046d078bbdf109c51e38160d11c0dc9fa935 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Mon, 21 Aug 2023 21:16:47 -0400
Subject: [PATCH] updated disko to submodule

---
 hosts/game-laptop/disko.nix  | 18 +++++--------
 hosts/gerg-desktop/disko.nix | 50 +++++++++++++++---------------------
 hosts/moms-laptop/disko.nix  | 20 ++++++---------
 3 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/hosts/game-laptop/disko.nix b/hosts/game-laptop/disko.nix
index 5e4e7f6..e523569 100644
--- a/hosts/game-laptop/disko.nix
+++ b/hosts/game-laptop/disko.nix
@@ -5,33 +5,29 @@
       device = "/dev/disk/by-id/nvme-WDC_PC_SN530_SDBPNPZ-512G-1006_21311N802456";
       type = "disk";
       content = {
-        type = "table";
-        format = "gpt";
-        partitions = [
-          {
+        type = "gpt";
+        partitions = {
+          ESP = {
             name = "ESP";
             start = "1MiB";
             end = "1GiB";
-            bootable = true;
             content = {
               type = "filesystem";
               format = "vfat";
               mountpoint = "/boot";
             };
-          }
-          {
-            name = "root";
+          };
+          root = {
             start = "1GiB";
             end = "100%";
             part-type = "primary";
-            bootable = true;
             content = {
               type = "filesystem";
               format = "ext4";
               mountpoint = "/";
             };
-          }
-        ];
+          };
+        };
       };
     };
   };
diff --git a/hosts/gerg-desktop/disko.nix b/hosts/gerg-desktop/disko.nix
index 6170169..edb19b5 100644
--- a/hosts/gerg-desktop/disko.nix
+++ b/hosts/gerg-desktop/disko.nix
@@ -4,82 +4,72 @@
     disk = {
       "0E" = {
         type = "disk";
-
         device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E";
         content = {
-          type = "table";
-          format = "gpt";
-          partitions = [
-            {
-              name = "BOOT";
+          type = "gpt";
+          partitions = {
+            BOOT = {
+              type = "EF00";
               start = "0";
               end = "4G";
-              bootable = true;
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/efi0E";
               };
-            }
-            {
-              name = "swap";
+            };
+            swap = {
               start = "5G";
               end = "21G";
               content = {
                 type = "swap";
                 randomEncryption = true;
               };
-            }
-            {
-              name = "zfsroot";
+            };
+            zfsroot = {
               start = "21G";
               end = "100%";
               content = {
                 type = "zfs";
                 pool = "rpool";
               };
-            }
-          ];
+            };
+          };
         };
       };
       "22" = {
         type = "disk";
-
         device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N22";
         content = {
-          type = "table";
-          format = "gpt";
-          partitions = [
-            {
-              name = "BOOT";
+          type = "gpt";
+          partitions = {
+            BOOT = {
+              type = "EF00";
               start = "0";
               end = "4G";
-              bootable = true;
               content = {
                 type = "filesystem";
                 format = "vfat";
                 mountpoint = "/efi22";
               };
-            }
-            {
-              name = "swap";
+            };
+            swap = {
               start = "5G";
               end = "21G";
               content = {
                 type = "swap";
                 randomEncryption = true;
               };
-            }
-            {
-              name = "zfsroot ";
+            };
+            zfsroot = {
               start = "21G";
               end = "100%";
               content = {
                 type = "zfs";
                 pool = "rpool";
               };
-            }
-          ];
+            };
+          };
         };
       };
     };
diff --git a/hosts/moms-laptop/disko.nix b/hosts/moms-laptop/disko.nix
index 7e578fa..b4901b9 100644
--- a/hosts/moms-laptop/disko.nix
+++ b/hosts/moms-laptop/disko.nix
@@ -5,33 +5,29 @@
       device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144";
       type = "disk";
       content = {
-        type = "table";
-        format = "gpt";
-        partitions = [
-          {
-            name = "ESP";
+        type = "gpt";
+        partitions = {
+          ESP = {
             start = "1MiB";
             end = "1GiB";
-            bootable = true;
             content = {
               type = "filesystem";
               format = "vfat";
               mountpoint = "/boot";
             };
-          }
-          {
-            name = "root";
+          };
+          root = {
             start = "1GiB";
             end = "100%";
             part-type = "primary";
-            bootable = true;
+            type = "EF00";
             content = {
               type = "filesystem";
               format = "ext4";
               mountpoint = "/";
             };
-          }
-        ];
+          };
+        };
       };
     };
   };