dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/default.nix: Use extendModules

Browse Source
This commit is contained in:
Robert Hensing 2021-12-17 12:41:12 +01:00
parent 8086f8658e
commit 8fd49c116b
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nixos/default.nix
View File

@ -10,25 +10,22 @@ let
}; };
# This is for `nixos-rebuild build-vm'. # This is for `nixos-rebuild build-vm'.
vmConfig = (import ./lib/eval-config.nix { vm = eval.extendModules {
inherit system; modules = [ ./modules/virtualisation/qemu-vm.nix ];
modules = [ configuration ./modules/virtualisation/qemu-vm.nix ]; };
}).config;
# This is for `nixos-rebuild build-vm-with-bootloader'. # This is for `nixos-rebuild build-vm-with-bootloader'.
vmWithBootLoaderConfig = (import ./lib/eval-config.nix { vmWithBootLoader = vm.extendModules {
inherit system; modules = [
modules = ({ config, ... }: {
[ configuration _file = "nixos/default.nix##vmWithBootLoader";
./modules/virtualisation/qemu-vm.nix virtualisation.useBootLoader = true;
{ virtualisation.useBootLoader = true; } virtualisation.useEFIBoot =
({ config, ... }: { config.boot.loader.systemd-boot.enable ||
virtualisation.useEFIBoot = config.boot.loader.efi.canTouchEfiVariables;
config.boot.loader.systemd-boot.enable || })
config.boot.loader.efi.canTouchEfiVariables; ];
}) };
];
}).config;
in in
@ -37,7 +34,7 @@ in
system = eval.config.system.build.toplevel; system = eval.config.system.build.toplevel;
vm = vmConfig.system.build.vm; vm = vm.config.system.build.vm;
vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; vmWithBootLoader = vmWithBootLoader.config.system.build.vm;
} }

2
nixos/lib/eval-config.nix
View File

@ -92,7 +92,7 @@ in withWarnings {
# Merge the option definitions in all modules, forming the full # Merge the option definitions in all modules, forming the full
# system configuration. # system configuration.
inherit (nixosWithUserModules) config options _module type; inherit (nixosWithUserModules) config options _module type extendModules;
inherit extraArgs; inherit extraArgs;