diff --git a/modules/default.nix b/modules/default.nix
index 5ad4464..922b944 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,6 +1,7 @@
 { system, nixpkgs, pkgs, ide, ... }:
 {
   gaming = import ./gaming { inherit nixpkgs; };
+  nvidia = import ./nvidia { inherit nixpkgs; };
   dnscrypt = import ./dnscrypt;
   wireguard = import ./wireguard;
   packages = import ./packages { inherit pkgs; };
diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix
index c3c825b..d5419f5 100644
--- a/modules/gaming/default.nix
+++ b/modules/gaming/default.nix
@@ -3,26 +3,11 @@
   # Uses unfree shit
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (nixpkgs.lib.getName pkg) [
-      "nvidia-settings"
-      "nvidia-x11"
-      "nvidia-persistenced"
       "steam"
       "steamcmd"
       "steam-original"
       "steam-run"
     ];
-  services.xserver.videoDrivers = [ "nvidia" ];
-
-  hardware.nvidia = {
-    prime = {
-      sync.enable = true;
-      nvidiaBusId = "PCI:1:0:0";
-      intelBusId = "PCI:0:2:0";
-    };
-    modesetting.enable = true;
-    nvidiaSettings = true;
-  };
-
   programs.steam = {
     enable = true;
   };
diff --git a/modules/nvidia/default.nix b/modules/nvidia/default.nix
new file mode 100644
index 0000000..c23826d
--- /dev/null
+++ b/modules/nvidia/default.nix
@@ -0,0 +1,22 @@
+{ nixpkgs, ... }:
+{
+  # Uses unfree shit
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (nixpkgs.lib.getName pkg) [
+      "nvidia-settings"
+      "nvidia-x11"
+      "nvidia-persistenced"
+    ];
+  services.xserver.videoDrivers = [ "nvidia" ];
+
+  hardware.nvidia = {
+    prime = {
+      sync.enable = true;
+      nvidiaBusId = "PCI:1:0:0";
+      intelBusId = "PCI:0:2:0";
+    };
+    modesetting.enable = true;
+    nvidiaSettings = true;
+  };
+}
+
diff --git a/nixos/default.nix b/nixos/default.nix
index a8b1a7c..53270a4 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -5,8 +5,9 @@
       ../hardware-configuration.nix
       ./laptop
       modules.dnscrypt
+      modules.gaming
       # modules.wireguard
-      # modules.gaming
+      # modules.nvidia
       hosts.nixosModule
     ];
   };