From 49945f07ccfc3dcd36ccb66a5ae37569c80e40e9 Mon Sep 17 00:00:00 2001 From: ners Date: Thu, 12 May 2022 09:32:43 +0200 Subject: [PATCH 1/3] installation-cd: add more guest tools to graphical installation base --- .../installer/cd-dvd/installation-cd-graphical-base.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 0e4feba2282..9017eab358f 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -35,8 +35,13 @@ with lib; # Enable sound in graphical iso's. hardware.pulseaudio.enable = true; - # Spice guest additions + # VM guest additions to improve host-guest interaction services.spice-vdagentd.enable = true; + services.qemuGuest.enable = true; + virtualisation.virtualbox.guest.enable = true; + virtualisation.vmware.guest.enable = true; + virtualisation.hypervGuest.enable = true; + services.xe-guest-utilities.enable = true; # Enable plymouth boot.plymouth.enable = true; From 3458d4cf89e2f789197c7e3dbf2e3fd0f052ba1b Mon Sep 17 00:00:00 2001 From: ners Date: Mon, 16 May 2022 12:34:55 +0200 Subject: [PATCH 2/3] installation-cd: remove broken virtualbox module --- .../cd-dvd/installation-cd-graphical-base.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 9017eab358f..5bf06cb3d17 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -36,12 +36,14 @@ with lib; hardware.pulseaudio.enable = true; # VM guest additions to improve host-guest interaction - services.spice-vdagentd.enable = true; - services.qemuGuest.enable = true; - virtualisation.virtualbox.guest.enable = true; - virtualisation.vmware.guest.enable = true; - virtualisation.hypervGuest.enable = true; - services.xe-guest-utilities.enable = true; + services.spice-vdagentd.enable = mkDefault true; + services.qemuGuest.enable = mkDefault true; + virtualisation.vmware.guest.enable = mkDefault true; + virtualisation.hypervGuest.enable = mkDefault true; + services.xe-guest-utilities.enable = mkDefault true; + # The VirtualBox guest additions rely on an out-of-tree kernel module + # which lags behind kernel releases, potentially causing broken builds. + virtualisation.virtualbox.guest.enable = mkDefault false; # Enable plymouth boot.plymouth.enable = true; From fb4fc93a3eacab755184924ae7bbb3d1e28e5575 Mon Sep 17 00:00:00 2001 From: ners Date: Tue, 17 May 2022 10:36:59 +0200 Subject: [PATCH 3/3] Remove mkDefault --- .../cd-dvd/installation-cd-graphical-base.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 5bf06cb3d17..8c7bac6f6cc 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -36,14 +36,14 @@ with lib; hardware.pulseaudio.enable = true; # VM guest additions to improve host-guest interaction - services.spice-vdagentd.enable = mkDefault true; - services.qemuGuest.enable = mkDefault true; - virtualisation.vmware.guest.enable = mkDefault true; - virtualisation.hypervGuest.enable = mkDefault true; - services.xe-guest-utilities.enable = mkDefault true; + services.spice-vdagentd.enable = true; + services.qemuGuest.enable = true; + virtualisation.vmware.guest.enable = true; + virtualisation.hypervGuest.enable = true; + services.xe-guest-utilities.enable = true; # The VirtualBox guest additions rely on an out-of-tree kernel module # which lags behind kernel releases, potentially causing broken builds. - virtualisation.virtualbox.guest.enable = mkDefault false; + virtualisation.virtualbox.guest.enable = false; # Enable plymouth boot.plymouth.enable = true;