updated

template/libs/default.nix

@@ -13,24 +13,8 @@
         type = "disk";
         content = {
           type = "gpt";
-          partitions = {
+          partitions =
-            "esp" = {
+            {
-              size =
-                if efi
-                then "512M"
-                else "1M";
-              type =
-                if efi
-                then "EF00"
-                else "EF02";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = ["umask=0077"];
-              };
-            };
-
               "luks" = {
                 size = "100%";
                 content = {
@@ -89,8 +73,29 @@
                   };
                 };
               };
+            }
+            // (
+              if efi
+              then {
+                "esp" = {
+                  size = "512M";
+                  type = "EF00";
+                  content = {
+                    type = "filesystem";
+                    format = "vfat";
+                    mountpoint = "/boot";
+                    mountOptions = ["umask=0077"];
                   };
                 };
+              }
+              else {
+                "boot" = {
+                  size = "512M";
+                  type = "EF02";
+                };
+              }
+            );
+        };
       };
     };
   };

template/system/disko.nix

@@ -3,4 +3,5 @@ libs.diskSetup {
   device = "/dev/sda";
   ssd = true;
   swapCapacity = "2G";
+  efi = true;
 }