Update, tweak athena

1 files changed, 12 insertions, 12 deletions

diff --git a/host/athena.nix b/host/athena.nix
index 5f2f96d..fc6c4ea 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -17,21 +17,29 @@
     nvidia = {
       open = true;
       package = pkgs.linuxPackages.nvidia_x11;
+      nvidiaSettings = true;
+
       prime = {
-        offload.enable = true;
+        offload = {
+          enable = true;
+          enableOffloadCmd = true;
+        };
 
-        intelBusId  = "PCI:0:2:0";
         nvidiaBusId = "PCI:1:0:0";
+        intelBusId  = "PCI:0:2:0";
       };
+
       powerManagement = {
         enable = true;
-        finegrained = false;
       };
     };
 
     graphics.extraPackages = with pkgs; [
       libva
       intel-media-driver
+      intel-vaapi-driver
+      libva-vdpau-driver
+      libvdpau-va-gl
     ];
 
     nvidia-container-toolkit.enable = true;
@@ -40,17 +48,9 @@
   environment.systemPackages = with pkgs; [
     zenith-nvidia
     virt-manager
-    (writeScriptBin "nvidia-offload" ''
-      export __NV_PRIME_RENDER_OFFLOAD=1
-      export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
-      export __GLX_VENDOR_LIBRARY_NAME=nvidia
-      export __VK_LAYER_NV_optimus=NVIDIA_only
-      exec -a "$0" "$@"
-    '')
 
     nvidia-vaapi-driver
-    intel-media-driver
-    vaapiVdpau
+    libva-vdpau-driver
     libvdpau-va-gl
   ];