aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Boot] Always add cmdline parameters even if boot config is disabled

Browse source 
Fix boot.loader.grub.device if cfg.efi is false
This commit is contained in:
Antoine Viallon 2022-05-09 00:08:45 +02:00
parent 3a399de728
commit 09e949be39
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
boot.nix
View file

@ -89,7 +89,9 @@ in
}; };
}; };
config = mkIf cfg.enable { config = {
boot.kernelParams = toCmdlineList cfg.cmdline;
} // (mkIf cfg.enable {
hardware.enableAllFirmware = allowUnfree; hardware.enableAllFirmware = allowUnfree;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
@ -106,12 +108,12 @@ in
}; };
aviallon.boot.useGrub = mkIf (!cfg.efi) (mkForce true);
boot = { boot = {
initrd.kernelModules = [ ]; initrd.kernelModules = [ ];
initrd.availableKernelModules = [ "ehci_pci" ]; initrd.availableKernelModules = [ "ehci_pci" ];
kernelParams = toCmdlineList cfg.cmdline;
kernelPatches = concatLists [ kernelPatches = concatLists [
(optional cfg.x32abi.enable customKernelPatches.enableX32ABI) (optional cfg.x32abi.enable customKernelPatches.enableX32ABI)
]; ];
@ -119,10 +121,10 @@ in
(optional cfg.kvdo.enable pkgs.kvdo) (optional cfg.kvdo.enable pkgs.kvdo)
]; ];
loader.grub.enable = cfg.useGrub || (!cfg.efi); loader.grub.enable = cfg.useGrub;
loader.grub = { loader.grub = {
version = 2; version = 2;
device = (if cfg.efi then "nodev" else null); device = mkIf cfg.efi "nodev";
efiSupport = cfg.efi; efiSupport = cfg.efi;
configurationLimit = cfg.configurationLimit; configurationLimit = cfg.configurationLimit;
}; };
@ -141,5 +143,5 @@ in
efi.canTouchEfiVariables = mkDefault true; efi.canTouchEfiVariables = mkDefault true;
}; };
}; };
}; });
} }