This commit is contained in:
mjallen18
2026-01-09 10:43:45 -06:00
parent 82dffdf505
commit 5f5972f10f
2 changed files with 37 additions and 26 deletions

View File

@@ -121,6 +121,19 @@ in
content = { content = {
type = "gpt"; type = "gpt";
partitions = { partitions = {
firmware = lib.mkIf cfg.firmware.enableFirmware {
priority = 1;
type = "0700";
name = "${config.${namespace}.network.hostName}-FIRMWARE";
start = "1M";
end = "1G";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot/firmware";
mountOptions = [ "umask=0077" ];
};
};
ESP = { ESP = {
priority = if cfg.enableFirmware then 2 else 1; priority = if cfg.enableFirmware then 2 else 1;
type = "EF00"; type = "EF00";
@@ -143,28 +156,28 @@ in
}; };
}; };
}; };
firmware = lib.mkIf cfg.firmware.enableFirmware { # firmware = lib.mkIf cfg.firmware.enableFirmware {
device = cfg.firmware.firmwareDisk; # device = cfg.firmware.firmwareDisk;
type = "disk"; # type = "disk";
imageSize = "1G"; # imageSize = "1G";
content = { # content = {
type = "table"; # type = "table";
format = "msdos"; # format = "msdos";
partitions = [ # partitions = [
{ # {
name = "${config.${namespace}.network.hostName}-FIRMWARE"; # name = "${config.${namespace}.network.hostName}-FIRMWARE";
start = "1M"; # start = "1M";
end = "1G"; # end = "1G";
content = { # content = {
type = "filesystem"; # type = "filesystem";
format = "vfat"; # format = "vfat";
mountpoint = "/boot/firmware"; # mountpoint = "/boot/firmware";
mountOptions = [ "umask=0077" ]; # mountOptions = [ "umask=0077" ];
}; # };
} # }
]; # ];
}; # };
}; # };
}; };
# configure Bcachefs # configure Bcachefs

View File

@@ -33,11 +33,9 @@
}; };
specialisation = { specialisation = {
"linux-rpi".configuration = { "linux-latest".configuration = {
boot = { boot = {
kernelPackages = lib.mkOverride 90 pkgs.linuxPackages_latest; kernelPackages = lib.mkOverride 90 pkgs.linuxPackages_pi5-16k;
# supportedFilesystems = lib.mkForce [ ];
}; };
}; };
}; };