From 4d0f8563ced00695c681ba414ce74a7a1750072b Mon Sep 17 00:00:00 2001
From: cnst <adamhilmersson@gmail.com>
Date: Sun, 18 Aug 2024 21:12:11 +0200
Subject: [PATCH] more nvidia changes

---
 home/users/toothpick/default.nix                    | 3 +--
 hosts/toothpc/default.nix                           | 1 +
 hosts/toothpc/modules.nix                           | 2 +-
 system/modules/hardware/graphics/nvidia/default.nix | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/home/users/toothpick/default.nix b/home/users/toothpick/default.nix
index 3a43e773..8a0211d7 100644
--- a/home/users/toothpick/default.nix
+++ b/home/users/toothpick/default.nix
@@ -13,7 +13,6 @@
     packages = with pkgs; [
       # user specific pkgs
       filezilla
-      egl-wayland
     ];
     sessionVariables = {
       BROWSER = "firefox";
@@ -23,7 +22,7 @@
       STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/toothpick/.steam/root/compatibilitytools.d"; # proton and steam compat
       LIBVA_DRIVER_NAME = "nvidia";
       XDG_SESSION_TYPE = "wayland";
-      # GBM_BACKEND = "nvidia-drm";
+      GBM_BACKEND = "nvidia-drm";
       __GLX_VENDOR_LIBRARY_NAME = "nvidia";
       NVD_BACKEND = "direct";
     };
diff --git a/hosts/toothpc/default.nix b/hosts/toothpc/default.nix
index 58e1660b..79e5f8e7 100644
--- a/hosts/toothpc/default.nix
+++ b/hosts/toothpc/default.nix
@@ -45,6 +45,7 @@ in {
     kernelParams = [
       "quiet"
       "splash"
+      "nvidia-drm.modeset=1"
     ];
   };
 
diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix
index 32a1ff4b..13d9ee83 100644
--- a/hosts/toothpc/modules.nix
+++ b/hosts/toothpc/modules.nix
@@ -20,7 +20,7 @@
         amd.enable = false;
         nvidia = {
           enable = true;
-          package = "stable"; # set to stable or beta depending on preference
+          package = "beta"; # set to stable or beta depending on preference
         };
       };
     };
diff --git a/system/modules/hardware/graphics/nvidia/default.nix b/system/modules/hardware/graphics/nvidia/default.nix
index 73633cb3..dc144709 100644
--- a/system/modules/hardware/graphics/nvidia/default.nix
+++ b/system/modules/hardware/graphics/nvidia/default.nix
@@ -29,6 +29,7 @@ in {
           libvdpau-va-gl
           intel-media-driver
           nvidia-vaapi-driver
+          egl-wayland
         ];
       };
       nvidia = {