From eb364fb8d6e9ee8b405ba5e1f046afd4c1dc2f9e Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sun, 2 Jun 2024 18:27:40 +0200 Subject: [PATCH] Disable superfluous vaapi packages --- system/nixinator/hardware-configuration.nix | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix index 79aa02ee..a5f8fe0c 100644 --- a/system/nixinator/hardware-configuration.nix +++ b/system/nixinator/hardware-configuration.nix @@ -45,7 +45,7 @@ swapDevices = lib.mkForce [ # { # device = "/var/swap"; - # # size = 1024 * 16 * 2; # twice the RAM for hibernation + # # size = 1024 * 32 * 2; # twice the RAM for hibernation # size = 1024 * 8; # Without hibernation 4.0 GB to 0.5 x RAM # } ]; @@ -75,7 +75,7 @@ nvidia = { modesetting.enable = true; # Not officially supported by NVidia but needed for wayland open = false; # TODO: Build failure on 2024-18-01 - nvidiaSettings = true; + nvidiaSettings = false; # Those are for x-server }; # video.hidpi.enable = lib.mkDefault true; # No longer has any effect @@ -91,21 +91,21 @@ # amdvlk # RADV (mesa) and AMDVLK (amd) can be used simultaneously # VAAPI/VDPAU: https://nixos.wiki/wiki/Accelerated_Video_Playback - vaapiVdpau # Taken from wiki - libvdpau-va-gl # Taken from wiki - libvdpau # NOTE: Don't know if needed/where it belongs... - libva # NOTE: Don't know if needed/where it belongs... + vaapiVdpau # Taken from wiki, this is also part of nixos-hardware/common/gpu/nvidia - nvidia-vaapi-driver + # libvdpau-va-gl # Taken from wiki, but for Intel? + # libvdpau # NOTE: Don't know if needed/where it belongs... + # libva # NOTE: Don't know if needed/where it belongs... + + # nvidia-vaapi-driver # Wild guess ]; }; - sane.enable = true; # Scanning - - xpadneo.enable = true; # Xbox Controller + # sane.enable = true; # Scanning + # xpadneo.enable = true; # Xbox Controller }; - environment.variables.AMD_VULKAN_ICD = "RADV"; # Choose mesa driver by default + # environment.variables.AMD_VULKAN_ICD = "RADV"; # Choose mesa driver by default powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; }