disk settings

modules/disks/sys/singledisk-deck.nix

@@ -1,23 +0,0 @@
-{ ... }: {
-  flake.nixosModules.disks-sys-singledisk-deck = { inputs, ... }: {
-    imports = [ inputs.disko.nixosModules.disko ];
-
-    disko.enableConfig = false;
-
-    fileSystems."/" = {
-      device = "/dev/disk/by-label/root";
-      fsType = "xfs";
-    };
-
-    fileSystems."/boot" = {
-      device = "/dev/disk/by-label/boot";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-    swapDevices = [{
-      device = "/var/lib/swapfile";
-      size = 16 * 1024;
-    }];
-  };
-}

modules/disks/sys/singledisk-encrypted.nix

@@ -1,5 +1,5 @@
 { ... }: {
-  flake.nixosModules.disks-sys-singledisk = { inputs, lib, ... }: {
+  flake.nixosModules.disks-sys-singledisk-encrypted = { inputs, lib, ... }: {
     imports = [ inputs.disko.nixosModules.disko ];
 
     disko.devices = {
@@ -11,7 +11,7 @@
             type = "gpt";
             partitions = {
               ESP = {
-                size = "512M";
+                size = "1024M";
                 type = "EF00";
                 content = {
                   type = "filesystem";

modules/disks/sys/singledisk-unencrypted.nix

@@ -0,0 +1,42 @@
+{ ... }: {
+  flake.nixosModules.disks-sys-singledisk-unencrypted = { inputs, ... }: {
+    imports = [ inputs.disko.nixosModules.disko ];
+    disko.devices = {
+      disk = {
+        main = {
+          type = "disk";
+          device = "/dev/nvme0n1";
+          content = {
+            type = "gpt";
+            partitions = {
+              ESP = {
+                size = "1024M";
+                type = "EF00";
+                content = {
+                  type = "filesystem";
+                  format = "vfat";
+                  mountpoint = "/boot";
+                  mountOptions = [ "fmask=0077" "dmask=0077" ];
+                  extraArgs = [ "-n" "boot" ];
+                };
+              };
+              root = {
+                size = "100%";
+                content = {
+                  type = "filesystem";
+                  format = "xfs";
+                  mountpoint = "/";
+                  extraArgs = [ "-L" "root" ];
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+    swapDevices = [{
+      device = "/var/lib/swapfile";
+      size = 16 * 1024;
+    }];
+  };
+}

modules/hosts/computer-mo/computer-mo.nix

@@ -12,7 +12,7 @@
       apps-sys-vesktop
       base-sys-group
       desktop-sys-group
-      disks-sys-singledisk
+      disks-sys-singledisk-encrypted
       gaming-sys-controller
       gaming-sys-lact
       gaming-sys-nexusmods

modules/hosts/computer-nadine/computer-nadine.nix

@@ -10,7 +10,7 @@
       apps-sys-vesktop
       base-sys-group
       desktop-sys-group
-      disks-sys-singledisk
+      disks-sys-singledisk-encrypted
       gaming-sys-controller
       gaming-sys-lact
       gaming-sys-steam

modules/hosts/deck/deck.nix

@@ -10,7 +10,7 @@
       apps-sys-vesktop
       base-sys-group
       desktop-sys-group
-      disks-sys-singledisk-deck
+      disks-sys-singledisk-unencrypted
       gaming-sys-controller
       gaming-sys-jovian
       kde-sys-plasma