From 15106e1a18250c585d0889a09d20dcba50b4f0fc Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Thu, 24 Oct 2024 17:03:02 -0400
Subject: [PATCH] GPU: fix collision with Intel drivers

---
 modules/apps/gaming.nix      | 20 ++++++++++----------
 modules/system/gpu/intel.nix |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix
index d810cf9..b2e804c 100644
--- a/modules/apps/gaming.nix
+++ b/modules/apps/gaming.nix
@@ -43,16 +43,16 @@ in
       ACTION=="add", ATTRS{id/vendor}==${vendorID}, ATTRS{id/product}==${productID}, RUN+="${pkgs.bash}/bin/bash -c 'echo 0x03 ${vendorID} ${productID} > /sys/bus/hid/drivers/xpadneo/new_id && echo 0x05 ${vendorID} ${productID} > /sys/bus/hid/drivers/xpadneo/new_id'"
     '';
     /*
-    services.udev.packages = [
-      (pkgs.writeTextFile {
-        name = "victrix-pro-bfg.rules";
-        executable = true;
-        destination = "/etc/udev/rules.d/70-victrix-pro-bfg.rules";
-        text = ''
-          	ACTION=="add", ATTRS{id/vendor}==${vendorID}, ATTRS{id/product}==${productID}, RUN+="${pkgs.bash}/bin/bash -c 'echo 0x03 ${vendorID} ${productID} > /sys/bus/hid/drivers/xpadneo/new_id && echo 0x05 ${vendorID} ${productID} > /sys/bus/hid/drivers/xpadneo/new_id'"
-        '';
-      })
-    ];
+      services.udev.packages = [
+        (pkgs.writeTextFile {
+          name = "victrix-pro-bfg.rules";
+          executable = true;
+          destination = "/etc/udev/rules.d/70-victrix-pro-bfg.rules";
+          text = ''
+            	ACTION=="add", ATTRS{id/vendor}==${vendorID}, ATTRS{id/product}==${productID}, RUN+="${pkgs.bash}/bin/bash -c 'echo 0x03 ${vendorID} ${productID} > /sys/bus/hid/drivers/xpadneo/new_id && echo 0x05 ${vendorID} ${productID} > /sys/bus/hid/drivers/xpadneo/new_id'"
+          '';
+        })
+      ];
     */
 
     # Add script to restart xpadneo in case of issues
diff --git a/modules/system/gpu/intel.nix b/modules/system/gpu/intel.nix
index 48b5f2c..0f78ef8 100644
--- a/modules/system/gpu/intel.nix
+++ b/modules/system/gpu/intel.nix
@@ -20,13 +20,13 @@ in
 
     hardware.graphics = {
       enable = true;
-      extraPackages = [
-        pkgs.intel-media-driver
-        pkgs.unstable.vpl-gpu-rt
+      extraPackages = with pkgs; [
+        intel-media-driver
+        onevpl-intel-gpu
       ];
       extraPackages32 = with pkgs.driversi686Linux; [
         intel-media-driver
-        pkgs.unstable.vpl-gpu-rt
+        onevpl-intel-gpu
       ];
     };
   };