From 36e509ee4c53eb55b14e15f7aa77a372659c6002 Mon Sep 17 00:00:00 2001
From: macronova <trivial@invariantspace.com>
Date: Fri, 12 Jan 2024 21:01:53 +0800
Subject: [PATCH] Update disko

---
 linux/blitzar/disko.nix                | 53 +++++++++++---------------
 linux/comet/hardware-configuration.nix |  9 +++--
 linux/nebula/disko.nix                 | 53 +++++++++++---------------
 3 files changed, 52 insertions(+), 63 deletions(-)

diff --git a/linux/blitzar/disko.nix b/linux/blitzar/disko.nix
index 462b1ca..fd91741 100644
--- a/linux/blitzar/disko.nix
+++ b/linux/blitzar/disko.nix
@@ -1,36 +1,29 @@
 { ... }: {
   disko.devices = {
     # Partition the physical disk
-    disk = {
-      storage = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "table";
-          format = "gpt";
-          partitions = [
-            {
-              name = "esp";
-              start = "2MiB";
-              end = "2GiB";
-              fs-type = "fat32";
-              bootable = true;
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            }
-            {
-              name = "zfs";
-              start = "2GiB";
-              end = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            }
-          ];
+    disk.storage = {
+      type = "disk";
+      device = "/dev/nvme0n1";
+      content = {
+        type = "gpt";
+        partitions = {
+          ESP = {
+            start = "2MiB";
+            end = "2GiB";
+            type = "EF00";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+            };
+          };
+          zfs = {
+            size = "100%";
+            content = {
+              type = "zfs";
+              pool = "zroot";
+            };
+          };
         };
       };
     };
diff --git a/linux/comet/hardware-configuration.nix b/linux/comet/hardware-configuration.nix
index ca06acd..a677ed4 100644
--- a/linux/comet/hardware-configuration.nix
+++ b/linux/comet/hardware-configuration.nix
@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "uas" "sd_mod" "sdhci_acpi" ];
@@ -14,12 +15,14 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9f65c4b3-1c87-42a0-8c1d-f3c1ff2e71b1";
+    {
+      device = "/dev/disk/by-uuid/9f65c4b3-1c87-42a0-8c1d-f3c1ff2e71b1";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1C5A-E5B5";
+    {
+      device = "/dev/disk/by-uuid/1C5A-E5B5";
       fsType = "vfat";
     };
 
diff --git a/linux/nebula/disko.nix b/linux/nebula/disko.nix
index cf9d602..ded3383 100644
--- a/linux/nebula/disko.nix
+++ b/linux/nebula/disko.nix
@@ -1,36 +1,29 @@
 { ... }: {
   disko.devices = {
     # Partition the physical disk
-    disk = {
-      storage = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "table";
-          format = "gpt";
-          partitions = [
-            {
-              name = "esp";
-              start = "1MiB";
-              end = "1GiB";
-              fs-type = "fat32";
-              bootable = true;
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            }
-            {
-              name = "zfs";
-              start = "1GiB";
-              end = "100%";
-              content = {
-                type = "zfs";
-                pool = "zroot";
-              };
-            }
-          ];
+    disk.storage = {
+      type = "disk";
+      device = "/dev/nvme0n1";
+      content = {
+        type = "gpt";
+        partitions = {
+          ESP = {
+            start = "1MiB";
+            end = "1GiB";
+            type = "EF00";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+            };
+          };
+          zfs = {
+            size = "100%";
+            content = {
+              type = "zfs";
+              pool = "zroot";
+            };
+          };
         };
       };
     };