diff --git a/systems/ceres/config/graphics.nix b/systems/ceres/config/graphics.nix index bfae8d8..ca5e4c4 100755 --- a/systems/ceres/config/graphics.nix +++ b/systems/ceres/config/graphics.nix @@ -11,8 +11,6 @@ ''; systemPackages = builtins.attrValues { inherit (pkgs) ddcutil; - # Remove CUDA from system packages for now - # inherit (pkgs.cudaPackages) cudatoolkit; }; sessionVariables = { MOZ_DISABLE_RDD_SANDBOX = 1; @@ -26,14 +24,15 @@ ENABLE_HDR_WSI = "1"; }; }; - hardware = { graphics = { enable = true; enable32Bit = true; - extraPackages = builtins.attrValues { inherit (pkgs) nvidia-vaapi-driver vaapiVdpau; }; + extraPackages = builtins.attrValues { + inherit (pkgs) nvidia-vaapi-driver libva-vdpau-driver; + }; extraPackages32 = builtins.attrValues { - inherit (pkgs.pkgsi686Linux) nvidia-vaapi-driver vaapiVdpau; + inherit (pkgs.pkgsi686Linux) nvidia-vaapi-driver libva-vdpau-driver; }; }; nvidia = { @@ -49,13 +48,11 @@ }; }; }; - services = { xserver = { enable = true; videoDrivers = [ "nvidia" ]; }; }; - hardware.nvidia-container-toolkit.enable = lib.mkIf config.virtualisation.docker.enable true; }