diff --git a/system/shen/configuration.nix b/system/shen/configuration.nix index b4c6682..9b51ee1 100644 --- a/system/shen/configuration.nix +++ b/system/shen/configuration.nix @@ -27,25 +27,33 @@ ''; }; - hardware.opengl = { - enable = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - rocm-opencl-icd - rocm-opencl-runtime - amdvlk - ]; - driSupport = lib.mkDefault true; - driSupport32Bit = lib.mkDefault true; - #extraPackages32 = with pkgs; [ - # driversi686linux.amdvlk - #]; - }; + services.xserver.videoDrivers = [ "nvidia" ]; + hardware = { + opengl = { + enable = true; + extraPackages = with pkgs; [ + intel-media-driver + vaapiIntel + vaapiVdpau + libvdpau-va-gl + # rocm-opencl-icd + # rocm-opencl-runtime + # amdvlk + ]; + driSupport = lib.mkDefault true; + driSupport32Bit = lib.mkDefault true; + #extraPackages32 = with pkgs; [ + # driversi686linux.amdvlk + #]; + }; - environment.variables.AMD_VULKAN_ICD = lib.mkDefault "RADV"; + nvidia = { + package = config.boot.kernelPackages.nvidiaPackages.beta; + modesetting.enable = true; + }; + } + + # environment.variables.AMD_VULKAN_ICD = lib.mkDefault "RADV"; # CADDY services.caddy = {