get rid of virtual variant again

In unstable this has now the same size as the noninteractive one.

build-images.sh

@@ -31,7 +31,6 @@ main() {
   trap 'rm -rf -- "$tmp"' EXIT
   (
     build_kexec_installer "$tag" "$arch" "$tmp" ""
-    build_kexec_installer "$tag" "$arch" "$tmp" "-virtual-noninteractive"
     build_kexec_installer "$tag" "$arch" "$tmp" "-noninteractive"
     build_netboot_image "$tag" "$arch" "$tmp"
   ) | readarray -t assets

flake.nix

@@ -32,20 +32,10 @@
         { system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; }
         self.nixosModules.noninteractive 
       ];
-
-      kexec-installer-nixos-unstable-virtual-noninteractive = kexec-installer nixos-unstable [ 
-        { system.kexec-installer.name = "nixos-kexec-installer-virtual-noninteractive"; }
-        self.nixosModules.noninteractive self.nixosModules.virtual 
-      ];
-      kexec-installer-nixos-2211-virtual-noninteractive = kexec-installer nixos-2211 [ 
-        { system.kexec-installer.name = "nixos-kexec-installer-virtual-noninteractive"; }
-        self.nixosModules.noninteractive self.nixosModules.virtual 
-      ];
     });
     nixosModules = {
       kexec-installer = ./nix/kexec-installer/module.nix;
       noninteractive = ./nix/noninteractive.nix;
-      virtual = ./nix/virtual.nix;
     };
     checks.x86_64-linux = let
       pkgs = nixos-unstable.legacyPackages.x86_64-linux;

nix/kexec-installer/test.nix

@@ -21,7 +21,7 @@ in makeTest' {
         (modulesPath + "/profiles/minimal.nix")
       ];
 
-      virtualisation.memorySize = 2 * 1024 + 767;
+      virtualisation.memorySize = 2048;
       virtualisation.diskSize = 4 * 1024;
       virtualisation.useBootLoader = true;
       virtualisation.useEFIBoot = true;
@@ -68,6 +68,7 @@ in makeTest' {
       environment.systemPackages = [ pkgs.hello ];
       imports = [
         ./module.nix
+        ../noninteractive.nix
       ];
     };
 

nix/noninteractive.nix

@@ -26,4 +26,7 @@
     kernelModules = [ "zfs" ];
     extraModulePackages = [ config.boot.kernelPackages.zfs ];
   };
+
+  # we can drop this after 23.05 has been released, which has this set by default
+  hardware.enableRedistributableFirmware = lib.mkForce false;
 }

nix/virtual.nix

@@ -1,5 +0,0 @@
-# This module optimizes for deployments to virtualized hosts.
-
-{ lib, ... }: {
-  hardware.enableRedistributableFirmware = lib.mkForce false;
-}