From 4ad5da9956a9ebe80aa7e839fb6e6a63d8fc5e57 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Thu, 11 Jul 2024 15:17:06 +0200
Subject: [PATCH] nvidia better

---
 flake.nix                 | 27 +++++++++++++++++++++++++--
 home-modules/nvidia.nix   | 34 ++++++++++++++++++++++++++++++++++
 home.nix                  |  2 ++
 system-modules/nvidia.nix |  3 ---
 4 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 home-modules/nvidia.nix

diff --git a/flake.nix b/flake.nix
index af87a56..636a4df 100755
--- a/flake.nix
+++ b/flake.nix
@@ -71,9 +71,32 @@
       };
       allowed = {
         unfree-packages = [
-          "spotify"
-          "cudatoolkit-12.2.2"
+          "cudatoolkit"
+          "cuda-merged"
+          "cuda_cuobjdump"
+          "cuda_gdb"
+          "cuda_nvcc"
+          "cuda_nvdisasm"
+          "cuda_nvprune"
+          "cuda_cccl"
+          "cuda_cudart"
+          "cuda_cupti"
+          "cuda_cuxxfilt"
+          "cuda_nvml_dev"
+          "cuda_nvrtc"
+          "cuda_nvtx"
+          "cuda_profiler_api"
+          "cuda_sanitizer_api"
+          "libcublas"
+          "libcufft"
+          "libcurand"
+          "libcusolver"
+          "libnvjitlink"
+          "libcusparse"
+          "libnpp"
+
           "discord"
+          "spotify"
           "obsidian"
           "zoom-us"
           "zoom"
diff --git a/home-modules/nvidia.nix b/home-modules/nvidia.nix
new file mode 100644
index 0000000..4ff4538
--- /dev/null
+++ b/home-modules/nvidia.nix
@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      nvtopPackages.full
+    ];
+    sessionVariables = {
+      NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland
+      WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia.
+
+      XDG_CURRENT_DESKTOP = "Hyprland";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP = "Hyprland";
+
+      GBM_BACKEND = "nvidia-drm";
+      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+      LIBVA_DRIVER_NAME = "nvidia";
+      __GL_GSYNC_ALLOWED = "1";
+      __GL_VRR_ALLOWED = "0"; 
+      WLR_DRM_NO_ATOMIC = "1";
+
+      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+      QT_QPA_PLATFORM = "wayland";
+      QT_QPA_PLATFORMTHEME = "qt5ct";
+
+      GDK_SCALE = "2";
+
+      ELECTRON_OZONE_PLATFORM_HINT = "auto";
+
+      NVD_BACKEND = "direct";
+    };
+  };
+}
diff --git a/home.nix b/home.nix
index 75999be..3d317cd 100755
--- a/home.nix
+++ b/home.nix
@@ -1,7 +1,9 @@
 { config, pkgs, pkgs-unstable, lib, system, inputs, host, user, rice, allowed, secrets, ... }:
 {
   imports = [
+
     ./home-modules/vscode.nix
+    ./home-modules/nvidia.nix
     # ./home-modules/firefox.nix
     ./home-modules/discord.nix
     ./home-modules/matrix.nix
diff --git a/system-modules/nvidia.nix b/system-modules/nvidia.nix
index d5e122f..c498b92 100755
--- a/system-modules/nvidia.nix
+++ b/system-modules/nvidia.nix
@@ -1,11 +1,8 @@
 { config, pkgs, pkgs-unstable, lib, nvidia, ... }:
-let
-in
 {
   config = lib.mkIf nvidia.enable {
     environment.systemPackages = with pkgs; [
       lshw
-      nvtop
       glxinfo
       (pkgs.writeShellScriptBin "nvidia-offload" ''
         export __NV_PRIME_RENDER_OFFLOAD=1