diff --git a/nixos/kevin-pc/configuration.nix b/nixos/kevin-pc/configuration.nix
index c1ea243..89f573e 100644
--- a/nixos/kevin-pc/configuration.nix
+++ b/nixos/kevin-pc/configuration.nix
@@ -12,6 +12,8 @@
       ../modules/firewall/syncthing.nix
       ../modules/firewall/wireguard.nix
       ../modules/yubikey.nix
+      ../modules/gaming/steam.nix
+      ../modules/gaming/helpers.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -61,15 +63,8 @@
 
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest;
 
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
-
   networking.hostName = "kevin-pc";
   networking.hostId   = "5dbf8235";
 
   system.stateVersion = "23.05"; # No touchy. Locks defaults.
-
 }
diff --git a/nixos/modules/gaming/helpers.nix b/nixos/modules/gaming/helpers.nix
new file mode 100644
index 0000000..4126d7e
--- /dev/null
+++ b/nixos/modules/gaming/helpers.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}:
+{
+    environment.systemPackages = with pkgs; [
+        mangohud
+    ];
+    programs.gamemode.enable = true;
+}
\ No newline at end of file
diff --git a/nixos/modules/gaming/steam.nix b/nixos/modules/gaming/steam.nix
new file mode 100644
index 0000000..69d305c
--- /dev/null
+++ b/nixos/modules/gaming/steam.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}:
+{
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+  };
+}
\ No newline at end of file