nixosProfiles: extract pveGuestHwSupport from pveGuest

for installers with increased pveGuest support (e.g. qemu-guest-agent)

nix/nixosProfiles/default.nix

@@ -7,4 +7,5 @@ in
   blade = importProfile ./blade.nix;
   common = importProfile ./common.nix;
   pveGuest = importProfile ./pveGuest.nix;
+  pveGuestHwSupport.nix = importProfile ./pveGuestHwSupport.nix;
 }

nix/nixosProfiles/pveGuest.nix

@@ -1,81 +1,27 @@
-# makes for nice-behaving pve-guests with:
+# makes for nice-behaving pve-guests
-# - qemu-guest-agent & drivers
+# extends pveGuestSupport by adding:
 # - EFI booting
-# - support for serial output (but graphic output should still work the same)
+# ONLY for installed systems
-{
+{ lib, ... }:
-  lib,
-  modulesPath,
-  pkgs,
-  ...
-}:
-let
-  # Based on https://unix.stackexchange.com/questions/16578/resizable-serial-console-window
-  resize = pkgs.writeShellScriptBin "resize" ''
-    export PATH="${lib.getBin pkgs.coreutils}/bin"
-    if [ ! -t 0 ]; then
-      # not a interactive...
-      exit 0
-    fi
-    TTY="$(tty)"
-    if [[ "$TTY" != /dev/ttyS* ]] && [[ "$TTY" != /dev/ttyAMA* ]] && [[ "$TTY" != /dev/ttySIF* ]]; then
-      # probably not a known serial console, we could make this check more
-      # precise by using `setserial` but this would require some additional
-      # dependency
-      exit 0
-    fi
-    old=$(stty -g)
-    stty raw -echo min 0 time 5
-
-    printf '\0337\033[r\033[999;999H\033[6n\0338' > /dev/tty
-    IFS='[;R' read -r _ rows cols _ < /dev/tty
-
-    stty "$old"
-    stty cols "$cols" rows "$rows"
-  '';
-in
 {
 
   imports = [
-    # from nixpkgs
-    "${modulesPath}/profiles/qemu-guest.nix"
     # from here
     ./common.nix
+    ./pveGuestHwSupport.nix
   ];
 
   config = {
 
-    boot = {
+    # configure for EFI only
-
+    boot.loader = {
-      # TODO probably until https://github.com/NixOS/nixpkgs/issues/340086
+      efi.canTouchEfiVariables = true;
-      initrd.availableKernelModules = lib.singleton "virtio_iommu";
+      grub.enable = lib.mkDefault false;
-
+      grub.efiSupport = true; # in case grub is preferred for some reason
-      kernelParams = [
+      systemd-boot.enable = lib.mkDefault true;
-        # show kernel log on serial
-        "console=ttyS0,115200"
-        # but use virtual tty as /dev/console (last entry)
-        "console=tty0"
-      ];
-
-      # configure for EFI only
-      loader = {
-        efi.canTouchEfiVariables = true;
-        grub.enable = lib.mkDefault false;
-        grub.efiSupport = true; # in case grub is preferred for some reason
-        systemd-boot.enable = lib.mkDefault true;
-      };
 
     };
 
-    environment.systemPackages = [ resize ];
-
-    services = {
-      qemuGuest.enable = true;
-    };
-
-    systemd.services."serial-getty@".environment.TERM = "xterm-256color";
-
-    time.hardwareClockInLocalTime = false; # just to make sure
-
   };
 
 }

nix/nixosProfiles/pveGuestHwSupport.nix

@@ -0,0 +1,71 @@
+# makes for nice-behaving pve-guests:
+# - qemu-guest-agent & drivers
+# - support for serial output (but graphic output should still work the same)
+# works for installers as well (does NOT include common.nix)
+{
+  lib,
+  modulesPath,
+  pkgs,
+  ...
+}:
+let
+  # Based on https://unix.stackexchange.com/questions/16578/resizable-serial-console-window
+  resize = pkgs.writeShellScriptBin "resize" ''
+    export PATH="${lib.getBin pkgs.coreutils}/bin"
+    if [ ! -t 0 ]; then
+      # not a interactive...
+      exit 0
+    fi
+    TTY="$(tty)"
+    if [[ "$TTY" != /dev/ttyS* ]] && [[ "$TTY" != /dev/ttyAMA* ]] && [[ "$TTY" != /dev/ttySIF* ]]; then
+      # probably not a known serial console, we could make this check more
+      # precise by using `setserial` but this would require some additional
+      # dependency
+      exit 0
+    fi
+    old=$(stty -g)
+    stty raw -echo min 0 time 5
+
+    printf '\0337\033[r\033[999;999H\033[6n\0338' > /dev/tty
+    IFS='[;R' read -r _ rows cols _ < /dev/tty
+
+    stty "$old"
+    stty cols "$cols" rows "$rows"
+  '';
+in
+{
+
+  imports = [
+    # from nixpkgs
+    "${modulesPath}/profiles/qemu-guest.nix"
+  ];
+
+  config = {
+
+    boot = {
+
+      # TODO probably until https://github.com/NixOS/nixpkgs/issues/340086
+      initrd.availableKernelModules = lib.singleton "virtio_iommu";
+
+      kernelParams = [
+        # show kernel log on serial
+        "console=ttyS0,115200"
+        # but use virtual tty as /dev/console (last entry)
+        "console=tty0"
+      ];
+
+    };
+
+    environment.systemPackages = [ resize ];
+
+    services = {
+      qemuGuest.enable = true;
+    };
+
+    systemd.services."serial-getty@".environment.TERM = "xterm-256color";
+
+    time.hardwareClockInLocalTime = false; # just to make sure
+
+  };
+
+}