virtualisation: restructure kvm module options and enable libvirt by default

hosts/desktop/default.nix

@@ -22,11 +22,10 @@
 {
   imports =                                                         # For now, if applying to other system, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    #[(import ../../modules/desktop/hyprland/default.nix)] ++        # Window Manager
+    [(import ../../modules/desktop/sway/default.nix)] ++         # Window Manager
-    [(import ../../modules/desktop/sway/default.nix)] ++        # Window Manager
+    (import ../../modules/desktop/virtualisation) ++             # libvirt + Docker
-    #[(import ../../modules/editors/nvim/config/default.nix)] ++        # Window Manager
+    [(import ../../modules/desktop/virtualisation/kvm-amd)] ++   # kvm module options
-    (import ../../modules/desktop/virtualisation) ++   # Docker
+    (import ../../modules/hardware);                             # Hardware devices
-    (import ../../modules/hardware);                                # Hardware devices
 
   boot = {                                  # Boot options
     kernelPackages = pkgs.linuxPackages_latest;

hosts/kabtop/default.nix

@@ -23,6 +23,7 @@
   imports =                                                         # For now, if applying to other system, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
     [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/desktop/virtualisation/kvm-amd.nix)] ++  # kvm module options
     (import ../../modules/services/server) ++                       # Server Services
     (import ../../modules/hardware);                                # Hardware devices
 

hosts/laptop/default.nix

@@ -25,6 +25,7 @@
     #[(import ../../modules/desktop/hyprland/default.nix)] ++        # Window Manager
     [(import ../../modules/desktop/sway/default.nix)] ++        # Window Manager
     [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
+    [(import ../../modules/desktop/virtualisation/kvm-intel.nix)] ++   # kvm module options
     (import ../../modules/hardware);                                # Hardware devices
 
   boot = {                                  # Boot options

hosts/nasbackup/default.nix

@@ -22,7 +22,7 @@
 {
   imports =                                                         # For now, if applying to other system, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    (import ../../modules/desktop/virtualisation) ++   # Docker
+    #[(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
     (import ../../modules/services/nasbackup) ++                       # Server Services
     (import ../../modules/hardware);                                # Hardware devices
 

hosts/nasbackup/hardware-configuration.nix

@@ -27,10 +27,12 @@
     NAS-RAID1 = {
       device = "/dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088";
       keyFile = "/root/NASKeyfile";
+      bypassWorkqueues = true;
     };
     NAS-RAID2 = {
       device = "/dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2";
       keyFile = "/root/NASKeyfile";
+      bypassWorkqueues = true;
     };
   };
   boot.kernelModules = [ "kvm-intel" ];

hosts/steamdeck/default.nix

@@ -22,10 +22,11 @@
 {
   imports =                                                         # For now, if applying to other system, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    [(import ../../modules/desktop/steam/default.nix)] ++        # Window Manager
+    [(import ../../modules/desktop/steam/default.nix)] ++            # jovian steam
-    [(import ../../modules/desktop/kde/default.nix)] ++        # Window Manager
+    [(import ../../modules/desktop/kde/default.nix)] ++              # Window Manager
-    [(import ../../modules/desktop/virtualisation/docker.nix)] ++   # Docker
+    (import ../../modules/desktop/virtualisation) ++                 # libvirt + Docker
-    (import ../../modules/hardware);                                # Hardware devices
+    [(import ../../modules/desktop/virtualisation/kvm-amd.nix)] ++   # kvm module options
+    (import ../../modules/hardware);                                 # Hardware devices
 
   boot = {                                  # Boot options
     loader = {                              # EFI Boot
@@ -87,5 +88,5 @@
     tailscale.enable = true;
 
   };
-  security.pam.enableSSHAgentAuth = true;
+  security.pam.sshAgentAuth.enable = true;
 }

modules/desktop/virtualisation/default.nix

@@ -13,5 +13,5 @@
 
 [
   ./docker.nix
-#  ./qemu.nix
+  ./qemu.nix
 ]

modules/desktop/virtualisation/kvm-amd.nix

@@ -0,0 +1,12 @@
+#
+# KVM module options amd
+#
+
+{ config, pkgs, user, ... }:
+
+{                                             # Add libvirtd and kvm to userGroups
+  boot.extraModprobeConfig = ''
+    options kvm_amd nested=0 avic=1 npt=1
+  '';                                         # Needed to run OSX-KVM 
+}
+

modules/desktop/virtualisation/kvm-intel.nix

@@ -0,0 +1,13 @@
+#
+# KVM module options intel 
+#
+
+{ config, pkgs, user, ... }:
+
+{                                             # Add libvirtd and kvm to userGroups
+  boot.extraModprobeConfig = ''
+    options kvm_intel nested=1
+    options kvm_intel emulate_invalid_guest_state=0
+    options kvm ignore_nsrs=1
+  '';                                         # Needed to run OSX-KVM 
+}

modules/desktop/virtualisation/qemu.nix

@@ -5,12 +5,6 @@
 { config, pkgs, user, ... }:
 
 {                                             # Add libvirtd and kvm to userGroups
-  boot.extraModprobeConfig = ''
-    options kvm_intel nested=1
-    options kvm_intel emulate_invalid_guest_state=0
-    options kvm ignore_nsrs=1
-  '';                                         # Needed to run OSX-KVM 
-
   users.groups.libvirtd.members = [ "root" "${user}" ];
 
   virtualisation = {