From e8e225ea89f4d017a58e05d34ce7c716b6a85753 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Mon, 24 Mar 2025 01:33:31 -0400
Subject: [PATCH] Generalize nouveau specialization

---
 hosts/tower/boot/default.nix                    | 6 ------
 modules/system/devices/video/nvidia/default.nix | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hosts/tower/boot/default.nix b/hosts/tower/boot/default.nix
index 548cded6..d0a135c9 100644
--- a/hosts/tower/boot/default.nix
+++ b/hosts/tower/boot/default.nix
@@ -34,10 +34,4 @@ in {
     boot.kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:2504,10de:228e" ];
     environment.sessionVariables.WLR_RENDERER = lib.mkForce "gles2";
   };
-
-  # Use Nouveau
-  specialisation.nouveau.configuration.config = {
-    system.nvidia.enable = lib.mkForce false;
-    environment.sessionVariables.NIXOS_OZONE_WL = lib.mkForce "";
-  };
 }
diff --git a/modules/system/devices/video/nvidia/default.nix b/modules/system/devices/video/nvidia/default.nix
index a1e99b85..99615dd6 100644
--- a/modules/system/devices/video/nvidia/default.nix
+++ b/modules/system/devices/video/nvidia/default.nix
@@ -15,5 +15,10 @@
     boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
 
     nixpkgs.allowUnfreePackages = [ "nvidia-x11" ];
+
+    specialisation.nouveau.configuration.config = {
+      system.nvidia.enable = lib.mkForce false;
+      environment.sessionVariables.NIXOS_OZONE_WL = lib.mkForce "";
+    };
   };
 }