disko upd

modules/nixos/disko/default.nix

@@ -33,7 +33,7 @@ let
 
   # BTRFS root partition configuration
   root = {
-    name = "${cfg.filesystem}-root";
+    name = "${config.${namespace}.network.hostName}-${cfg.filesystem}-root";
     size = "100%";
     content = {
       type = cfg.filesystem;
@@ -60,7 +60,7 @@ let
 
   # Luks root partition configuration
   luksRoot = {
-    name = "cryptroot";
+    name = "${config.${namespace}.network.hostName}-cryptroot";
     size = "100%";
     content = {
       type = "luks";
@@ -121,7 +121,21 @@ in
             content = {
               type = "gpt";
               partitions = {
+                FIRMWARE = lib.mkIf cfg.enableFirmware {
+                  priority = 1;
+                  name = "FIRMWARE";
+                  start = "1M";
+                  end = "1G";
+                  type = "0700";
+                  content = {
+                    type = "filesystem";
+                    format = "vfat";
+                    mountpoint = "/boot/firmware";
+                    mountOptions = [ "umask=0077" ];
+                  };
+                };
                 ESP = {
+                  priority = if cfg.enableFirmware then 2 else 1;
                   type = "EF00";
                   size = "500M";
                   content = {