config(mcl-disko): Add option for swap randomEncryption

Author: MartinNikov

modules/mcl-disko/default.nix

@@ -29,11 +29,20 @@
           description = "Declare the type of the primary partition";
         };
 
-        swapSize = mkOption {
-          type = types.nullOr types.str;
-          default = "32G";
-          example = "32768M";
-          description = "The size of the hard disk space used when RAM is full";
+        swap = {
+          size = mkOption {
+            type = types.nullOr types.str;
+            default = "32G";
+            example = "32768M";
+            description = "The size of the hard disk space used when RAM is full";
+          };
+
+          randomEncryption = mkOption {
+            type = types.bool;
+            default = true;
+            example = false;
+            description = "Whether to use random encryption for swap partition";
+          };
         };
 
         espSize = mkOption {
@@ -162,9 +171,10 @@
                     inherit disk lib;
                     isSecondary = true;
                     espSize = cfg.espSize;
-                    swapSize = cfg.swapSize;
+                    swapSize = cfg.swap.size;
                     partitioningPreset = cfg.partitioningPreset;
                     poolName = cfg.zpool.name;
+                    randomEncryption = cfg.swap.randomEncryption;
                   }
                 else
                   makeSecondaryZfsDisk {
@@ -183,9 +193,10 @@
                 disk = first;
                 isSecondary = false;
                 espSize = cfg.espSize;
-                swapSize = cfg.swapSize;
+                swapSize = cfg.swap.size;
                 partitioningPreset = cfg.partitioningPreset;
                 poolName = cfg.zpool.name;
+                randomEncryption = cfg.swap.randomEncryption;
               };
             };
             zpool = import ./zpool.nix {

modules/mcl-disko/primaryPartition/default.nix

@@ -6,6 +6,7 @@
   swapSize,
   partitioningPreset,
   poolName,
+  randomEncryption,
 }:
 {
   type = "disk";
@@ -21,10 +22,18 @@
             espSize
             swapSize
             poolName
+            randomEncryption
             ;
         }
       else if partitioningPreset == "ext4" then
-        import ./ext4.nix { inherit lib espSize swapSize; }
+        import ./ext4.nix {
+          inherit
+            lib
+            espSize
+            swapSize
+            randomEncryption
+            ;
+        }
       else
         import ./zfs.nix {
           inherit
@@ -34,6 +43,7 @@
             espSize
             swapSize
             poolName
+            randomEncryption
             ;
         };
   }

modules/mcl-disko/primaryPartition/ext4.nix

@@ -2,6 +2,7 @@
   lib,
   espSize,
   swapSize,
+  randomEncryption,
 }:
 {
   ESP = {
@@ -33,7 +34,7 @@
     size = swapSize;
     content = {
       type = "swap";
-      randomEncryption = true;
+      inherit randomEncryption;
     };
   };
 }

modules/mcl-disko/primaryPartition/zfs-legacy-boot.nix

@@ -4,6 +4,7 @@
   espSize,
   swapSize,
   poolName,
+  randomEncryption,
 }:
 [
   {
@@ -43,7 +44,7 @@
     part-type = "primary";
     content = {
       type = "swap";
-      randomEncryption = true;
+      inherit randomEncryption;
     };
   }
 ]

modules/mcl-disko/primaryPartition/zfs.nix

@@ -5,6 +5,7 @@
   espSize,
   swapSize,
   poolName,
+  randomEncryption,
 }:
 {
   "ESP" = {
@@ -38,7 +39,7 @@
     size = swapSize;
     content = {
       type = "swap";
-      randomEncryption = true;
+      inherit randomEncryption;
     };
   };
 }