diff options
author | Robert Hensing <robert@roberthensing.nl> | 2021-12-17 12:41:12 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2021-12-17 13:17:37 +0100 |
commit | 8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2 (patch) | |
tree | ea08d17fefc88b99f8b5a02d10e018c15e17326a /nixos | |
parent | 8086f8658e1ad806c821519632393535992acc8d (diff) | |
download | nixpkgs-8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2.tar nixpkgs-8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2.tar.gz nixpkgs-8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2.tar.bz2 nixpkgs-8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2.tar.lz nixpkgs-8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2.tar.xz nixpkgs-8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2.tar.zst nixpkgs-8fd49c116bcd256263c7aad8ca5d4b7fa10d4ca2.zip |
nixos/default.nix: Use extendModules
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/default.nix | 35 | ||||
-rw-r--r-- | nixos/lib/eval-config.nix | 2 |
2 files changed, 17 insertions, 20 deletions
diff --git a/nixos/default.nix b/nixos/default.nix index c11872f1441..01605e1d577 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -10,25 +10,22 @@ let }; # This is for `nixos-rebuild build-vm'. - vmConfig = (import ./lib/eval-config.nix { - inherit system; - modules = [ configuration ./modules/virtualisation/qemu-vm.nix ]; - }).config; + vm = eval.extendModules { + modules = [ ./modules/virtualisation/qemu-vm.nix ]; + }; # This is for `nixos-rebuild build-vm-with-bootloader'. - vmWithBootLoaderConfig = (import ./lib/eval-config.nix { - inherit system; - modules = - [ configuration - ./modules/virtualisation/qemu-vm.nix - { virtualisation.useBootLoader = true; } - ({ config, ... }: { - virtualisation.useEFIBoot = - config.boot.loader.systemd-boot.enable || - config.boot.loader.efi.canTouchEfiVariables; - }) - ]; - }).config; + vmWithBootLoader = vm.extendModules { + modules = [ + ({ config, ... }: { + _file = "nixos/default.nix##vmWithBootLoader"; + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = + config.boot.loader.systemd-boot.enable || + config.boot.loader.efi.canTouchEfiVariables; + }) + ]; + }; in @@ -37,7 +34,7 @@ in 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; } diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 62d09b8173b..89fb93ba70a 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -92,7 +92,7 @@ in withWarnings { # Merge the option definitions in all modules, forming the full # system configuration. - inherit (nixosWithUserModules) config options _module type; + inherit (nixosWithUserModules) config options _module type extendModules; inherit extraArgs; |