virtualization with virt-manager

5 files changed, 22 insertions, 12 deletions

diff --git a/modules/hosts/hp-envy-office/configuration.nix b/modules/hosts/hp-envy-office/configuration.nix
index fdff4f0..9b3e173 100644
--- a/modules/hosts/hp-envy-office/configuration.nix
+++ b/modules/hosts/hp-envy-office/configuration.nix
@@ -1,6 +1,9 @@
 { config, lib, pkgs, ... }: {
 	imports = [ ./hardware-configuration.nix ];
 
+	# Show bootloader for longer since it usually doesn't show
+	boot.loader.timeout = 15;
+
 	# Enable extra software pkgs
 	software.desktop = {
 		chromium.enable = true;
@@ -14,6 +17,9 @@
 		docker.enable = true;
 	};
 
+	# Enable virtualization
+	virtualization.enable = true;
+
 	# Enable network drives
 	nas.enable = true;
 	nas.office.enable = true;
diff --git a/modules/root/normaluser.nix b/modules/root/normaluser.nix
index 88eb338..3bb9adc 100644
--- a/modules/root/normaluser.nix
+++ b/modules/root/normaluser.nix
@@ -9,6 +9,7 @@
 		hashedPasswordFile = config.sops.secrets.hashed-root-password.path;
 		extraGroups = [
 			"i2c"
+			"libvirtd"
 			"nixbld"
 			"video"
 			"wheel"
diff --git a/modules/root/software/default.nix b/modules/root/software/default.nix
index 5f6494d..0a54b63 100644
--- a/modules/root/software/default.nix
+++ b/modules/root/software/default.nix
@@ -8,7 +8,7 @@
 		./overlays.nix
 		./system.nix
 		./utilities.nix
-		./virtualisation.nix
+		./virtualization.nix
 	];
 
 	software.desktop = {
@@ -30,6 +30,6 @@
 		};
 	};
 
-	virtualisation.enable  = lib.mkDefault false;
+	virtualization.enable  = lib.mkDefault false;
 	xserver.awesome.enable = lib.mkDefault true;
 }
diff --git a/modules/root/software/virtualisation.nix b/modules/root/software/virtualisation.nix
deleted file mode 100644
index 4ae15f5..0000000
--- a/modules/root/software/virtualisation.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, config, ... }: {
-	options = {
-		virtualisation.enable = lib.mkEnableOption "enables virtualisation and virt-manager";
-	};
-
-	config = lib.mkIf config.virtualisation.enable {
-		virtualisation.libvirtd.enable = true;
-		programs.virt-manager.enable = config.software.desktop.enable;
-	};
-}
diff --git a/modules/root/software/virtualization.nix b/modules/root/software/virtualization.nix
new file mode 100644
index 0000000..9ac5a80
--- /dev/null
+++ b/modules/root/software/virtualization.nix
@@ -0,0 +1,13 @@
+{ lib, config, ... }: {
+	options = {
+		virtualization.enable = lib.mkEnableOption "enables virtualization and virt-manager";
+	};
+
+	config = lib.mkIf config.virtualization.enable {
+		virtualisation = {
+			libvirtd.enable = true;
+			spiceUSBRedirection.enable = true;
+		};
+		programs.virt-manager.enable = config.software.desktop.enable;
+	};
+}