diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index b98045e..a502360 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -24,7 +24,7 @@ [(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/virtualisation/docker.nix)] ++ # Docker + (import ../../modules/desktop/virtualisation) ++ # Docker (import ../../modules/hardware); # Hardware devices boot = { # Boot options diff --git a/hosts/nas/default.nix b/hosts/nas/default.nix index 276d5a3..18bb9cd 100644 --- a/hosts/nas/default.nix +++ b/hosts/nas/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.nix)] ++ # Docker + (import ../../modules/desktop/virtualisation) ++ # Docker (import ../../modules/services/nas) ++ # Server Services (import ../../modules/hardware); # Hardware devices diff --git a/modules/desktop/virtualisation/qemu.nix b/modules/desktop/virtualisation/qemu.nix index 13b03c1..9810a3d 100644 --- a/modules/desktop/virtualisation/qemu.nix +++ b/modules/desktop/virtualisation/qemu.nix @@ -18,9 +18,10 @@ enable = true; # Virtual drivers #qemuPackage = pkgs.qemu_kvm; # Default qemu = { - verbatimConfig = '' - nvram = [ "${pkgs.OVMF}/FV/OVMF.fd:${pkgs.OVMF}/FV/OVMF_VARS.fd" ] - ''; + runAsRoot = false; +# verbatimConfig = '' +# nvram = [ "${pkgs.OVMF}/FV/OVMF.fd:${pkgs.OVMF}/FV/OVMF_VARS.fd" ] +# ''; }; }; spiceUSBRedirection.enable = true; # USB passthrough