flake.nix: Deduplicate vmConfig, vmWithBootloaderConfig

1 files changed, 4 insertions, 22 deletions

diff --git a/flake.nix b/flake.nix
index 1e20fcd40eb..d1ec53f5931 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,24 +22,6 @@
           import ./nixos/lib/eval-config.nix (args // {
             modules =
               let
-                vmConfig = (import ./nixos/lib/eval-config.nix
-                  (args // {
-                    modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ];
-                  })).config;
-
-                vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix
-                  (args // {
-                    modules = modules ++ [
-                      ./nixos/modules/virtualisation/qemu-vm.nix
-                      { virtualisation.useBootLoader = true; }
-                      ({ config, ... }: {
-                        virtualisation.useEFIBoot =
-                          config.boot.loader.systemd-boot.enable ||
-                          config.boot.loader.efi.canTouchEfiVariables;
-                      })
-                    ];
-                  })).config;
-
                 moduleDeclarationFile =
                   let
                     # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't
@@ -59,16 +41,16 @@
 
               in
               map addModuleDeclarationFile modules ++ [
-                {
+                ({ config, ... }: {
                   system.nixos.versionSuffix =
                     ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
                   system.nixos.revision = final.mkIf (self ? rev) self.rev;
 
                   system.build = {
-                    vm = vmConfig.system.build.vm;
-                    vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
+                    vm = config.virtualisation.vmVariant.system.build.vm;
+                    vmWithBootLoader = config.virtualisation.vmVariantWithBootLoader.system.build.vm;
                   };
-                }
+                })
               ];
           });
       });