From bf7b41c0ec70f2f6e62a4a5ba856d438e0114ba4 Mon Sep 17 00:00:00 2001
From: cnst <adamhilmersson@gmail.com>
Date: Sun, 22 Sep 2024 00:13:07 +0200
Subject: [PATCH] nvidia fixes 3

---
 hosts/toothpc/default.nix                           | 6 ------
 system/modules/hardware/graphics/nvidia/default.nix | 8 +-------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/hosts/toothpc/default.nix b/hosts/toothpc/default.nix
index f3f6c910..e9345046 100644
--- a/hosts/toothpc/default.nix
+++ b/hosts/toothpc/default.nix
@@ -37,16 +37,10 @@ in {
 
   boot = {
     blacklistedKernelModules = [
-      "ucsi_ccg"
-      "i2c_nvidia_gpu"
     ];
     consoleLogLevel = 3;
     kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
     kernelParams = [
-      "quiet"
-      "splash"
-      "nvidia_drm.fbdev=1"
-      "nvidia-drm.modeset=1"
     ];
   };
 
diff --git a/system/modules/hardware/graphics/nvidia/default.nix b/system/modules/hardware/graphics/nvidia/default.nix
index 7233343e..e5a36aee 100644
--- a/system/modules/hardware/graphics/nvidia/default.nix
+++ b/system/modules/hardware/graphics/nvidia/default.nix
@@ -4,23 +4,17 @@
   lib,
   ...
 }: let
-  vulkanDriverFiles = [
-    "${config.hardware.nvidia.package}/share/vulkan/icd.d/nvidia_icd.x86_64.json"
-    "${config.hardware.nvidia.package.lib32}/share/vulkan/icd.d/nvidia_icd.i686.json"
-  ];
   nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
     export __NV_PRIME_RENDER_OFFLOAD=1
     export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
-    export __GL_VRR_ALLOWED=1
     export __GLX_VENDOR_LIBRARY_NAME=nvidia
     export __VK_LAYER_NV_optimus=NVIDIA_only
-    export VK_DRIVER_FILES="${builtins.concatStringsSep ":" vulkanDriverFiles}"
     exec "$@"
   '';
-
   inherit (lib) types mkIf mkEnableOption mkOption;
   cfg = config.modules.hardware.graphics.nvidia;
 in {
+  environment.systemPackages = [nvidia-offload];
   options = {
     modules.hardware.graphics.nvidia = {
       enable = mkEnableOption "Enables NVidia graphics";