diff --git a/hosts/12kingdoms_shoukei/default.nix b/hosts/12kingdoms_shoukei/default.nix index b4b3efcb..e1c27b45 100644 --- a/hosts/12kingdoms_shoukei/default.nix +++ b/hosts/12kingdoms_shoukei/default.nix @@ -19,6 +19,9 @@ ./impermanence.nix ]; + boot.kernelModules = ["kvm-amd" "kvm-intel"]; + boot.extraModprobeConfig = "options kvm_amd nested=1"; # for amd cpu + networking = { hostName = "shoukei"; # Define your hostname. # configures the network interface(include wireless) via `nmcli` & `nmtui` diff --git a/hosts/idols_ai/hardware-configuration.nix b/hosts/idols_ai/hardware-configuration.nix index bdf7d362..26b6aaec 100644 --- a/hosts/idols_ai/hardware-configuration.nix +++ b/hosts/idols_ai/hardware-configuration.nix @@ -23,7 +23,8 @@ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; + boot.kernelModules = ["kvm-intel"]; # kvm virtualization support + boot.extraModprobeConfig = "options kvm_intel nested=1"; # for intel cpu boot.kernelParams = ["nvidia.NVreg_PreserveVideoMemoryAllocations=1"]; boot.extraModulePackages = []; # clear /tmp on boot to get a stateless /tmp directory. diff --git a/hosts/idols_aquamarine/default.nix b/hosts/idols_aquamarine/default.nix index 4b0d00cd..a61d003d 100644 --- a/hosts/idols_aquamarine/default.nix +++ b/hosts/idols_aquamarine/default.nix @@ -19,6 +19,9 @@ "cifs" # mount windows share ]; + boot.kernelModules = ["kvm-amd" "kvm-intel"]; + boot.extraModprobeConfig = "options kvm_amd nested=1"; # for amd cpu + networking = { hostName = "aquamarine"; # Define your hostname. wireless.enable = false; # Enables wireless support via wpa_supplicant. diff --git a/hosts/idols_kana/default.nix b/hosts/idols_kana/default.nix index 22947f9d..cf217ddf 100644 --- a/hosts/idols_kana/default.nix +++ b/hosts/idols_kana/default.nix @@ -19,6 +19,9 @@ "cifs" # mount windows share ]; + boot.kernelModules = ["kvm-amd" "kvm-intel"]; + boot.extraModprobeConfig = "options kvm_amd nested=1"; # for amd cpu + networking = { hostName = "kana"; # Define your hostname. wireless.enable = false; # Enables wireless support via wpa_supplicant. diff --git a/hosts/idols_ruby/default.nix b/hosts/idols_ruby/default.nix index 9e330b47..336d633c 100644 --- a/hosts/idols_ruby/default.nix +++ b/hosts/idols_ruby/default.nix @@ -19,6 +19,9 @@ "cifs" # mount windows share ]; + boot.kernelModules = ["kvm-amd" "kvm-intel"]; + boot.extraModprobeConfig = "options kvm_amd nested=1"; # for amd cpu + networking = { hostName = "ruby"; # Define your hostname. wireless.enable = false; # Enables wireless support via wpa_supplicant. diff --git a/modules/nixos/desktop/virtualisation.nix b/modules/nixos/desktop/virtualisation.nix index bb96b60f..ab1d033c 100644 --- a/modules/nixos/desktop/virtualisation.nix +++ b/modules/nixos/desktop/virtualisation.nix @@ -5,10 +5,18 @@ # ################################################################################### - boot.kernelModules = ["kvm-amd" "kvm-intel" "vfio-pci"]; # Enable nested virsualization, required by security containers and nested vm. - boot.extraModprobeConfig = "options kvm_intel nested=1"; # for intel cpu + # This should be set per host in /hosts, not here. + # + ## For AMD CPU, add "kvm-amd" to kernelModules. + # boot.kernelModules = ["kvm-amd" "kvm-intel"]; # boot.extraModprobeConfig = "options kvm_amd nested=1"; # for amd cpu + # + ## For Intel CPU, add "kvm-intel" to kernelModules. + # boot.kernelModules = ["kvm-intel"]; + # boot.extraModprobeConfig = "options kvm_intel nested=1"; # for intel cpu + + boot.kernelModules = ["vfio-pci"]; virtualisation = { libvirtd = {