From e855c9b4b9fb11d513b8d8ea48cc278af0be10b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 7 May 2023 21:32:47 +0200
Subject: [PATCH] get rid of virtual variant again

In unstable this has now the same size as the noninteractive one.
---
 build-images.sh              |  1 -
 flake.nix                    | 10 ----------
 nix/kexec-installer/test.nix |  3 ++-
 nix/noninteractive.nix       |  3 +++
 nix/virtual.nix              |  5 -----
 5 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 nix/virtual.nix

diff --git a/build-images.sh b/build-images.sh
index 2f77f52..84ab99a 100755
--- a/build-images.sh
+++ b/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
diff --git a/flake.nix b/flake.nix
index ee07c41..b62f6e0 100644
--- a/flake.nix
+++ b/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;
diff --git a/nix/kexec-installer/test.nix b/nix/kexec-installer/test.nix
index 03f32f3..c73027a 100644
--- a/nix/kexec-installer/test.nix
+++ b/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
       ];
     };
 
diff --git a/nix/noninteractive.nix b/nix/noninteractive.nix
index 7f6b37e..6359e25 100644
--- a/nix/noninteractive.nix
+++ b/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;
 }
diff --git a/nix/virtual.nix b/nix/virtual.nix
deleted file mode 100644
index 7bae4f8..0000000
--- a/nix/virtual.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-# This module optimizes for deployments to virtualized hosts.
-
-{ lib, ... }: {
-  hardware.enableRedistributableFirmware = lib.mkForce false;
-}