diff --git a/fuji/default.nix b/fuji/default.nix
index 0491ddf..549fffd 100644
--- a/fuji/default.nix
+++ b/fuji/default.nix
@@ -1,30 +1,7 @@
 {lib, ...}: {
+  # imports = [./nvidia.nix];
+
   services.xserver.videoDrivers = ["amdgpu"];
 
-  hm.wayland.windowManager.hyprland.settings = {
-    monitor = lib.mkForce ["DP-1,1920x1200@60,0x0,1" "HDMI-A-1,1440x900@60,1920x300,1"];
-  };
-
-  # services.xserver.videoDrivers = ["nvidia"];
-
-  # hardware.opengl = {
-  #   driSupport = true;
-  #   driSupport32Bit = true;
-  # };
-
-  # hardware.nvidia = {
-  #   modesetting.enable = true;
-  #   powerManagement = {
-  #     enable = true;
-  #     finegrained = false;
-  #   };
-  #   open = false;
-  #   nvidiaSettings = true;
-  # };
-
-  # boot.extraModprobeConfig = ''
-  #   options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
-  # '';
-
-  # programs.hyprland.enableNvidiaPatches = true;
+  hm.wayland.windowManager.hyprland.settings.monitor = lib.mkForce ["DP-1,1920x1200@60,0x0,1" "HDMI-A-1,1440x900@60,1920x300,1"];
 }
diff --git a/fuji/nvidia.nix b/fuji/nvidia.nix
new file mode 100644
index 0000000..3db1978
--- /dev/null
+++ b/fuji/nvidia.nix
@@ -0,0 +1,35 @@
+{lib, ...}: {
+  services.xserver.videoDrivers = lib.mkForce ["nvidia"];
+
+  hardware.opengl = {
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement = {
+      enable = true;
+      finegrained = false;
+    };
+    open = false;
+    nvidiaSettings = true;
+  };
+
+  boot.extraModprobeConfig = ''
+    options nvidia NVreg_RegistryDwords="PowerMizerEnable=0x1; PerfLevelSrc=0x2222; PowerMizerLevel=0x3; PowerMizerDefault=0x3; PowerMizerDefaultAC=0x3"
+  '';
+
+  programs.hyprland.enableNvidiaPatches = true;
+
+  hm.wayland.windowManager.hyprland.settings.env = [
+    "LIBVA_DRIVER_NAME,nvidia"
+    "XDG_SESSION_TYPE,wayland"
+    "GBM_BACKEND,nvidia-drm"
+    "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+    "WLR_NO_HARDWARE_CURSORS,1"
+    "__EGL_VENDOR_LIBRARY_FILENAMES,/run/opengl-driver/share/glvnd/egl_vendor.d/10_nvidia.json"
+    "NVD_BACKEND,direct"
+    "MOZ_DISABLE_RDD_SANDBOX,1"
+  ];
+}