Fixed? dimondback

modules/nixos/presets/disko/ext4Swap/default.nix

@@ -18,7 +18,7 @@ in {
   options.${namespace}.presets.disko.ext4Swap = with types; {
     enable = mkBoolOpt false "Enable preset";
     device = mkOpt' str "/dev/nvme0n1";
-    swapSize = mkOpt' int 32;
+    swapSize = mkOpt' (nullOr int) 32;
     mountpoint = mkOpt' path "/";
   };
 
@@ -58,7 +58,7 @@ in {
           type = "lvm_vg";
           lvs = {
             # lvcreate
-            swap = {
+            swap = mkIf (cfg.swapSize != null) {
               # Logical Volume = "swap", /dev/vg1/swap
               size = "${builtins.toString cfg.swapSize}G";
               content = {

systems/x86_64-linux/dimondback/default.nix

@@ -25,8 +25,9 @@ in {
     else null;
   imports = lib.snowfall.fs.get-non-default-nix-files ./. ++ [../stargate/services/adguardhome.nix];
 
-  custom.presets.disko.ext4 = {
+  custom.presets.disko.ext4Swap = {
     enable = true;
+    swapSize = null;
     device = "/dev/sda";
   };
   custom.presets.default = enabled;