diff --git a/modules/nixos/steam/default.nix b/modules/nixos/steam/default.nix
index 3d66a87..ce09dc5 100644
--- a/modules/nixos/steam/default.nix
+++ b/modules/nixos/steam/default.nix
@@ -39,6 +39,30 @@
       vkbasalt
       gamescope
     ];
+
+    hardware.uinput.enable = true;
+    users.users.andreas.extraGroups = [ "input" ];
+    
+    programs.gamescope.enable = true;
+    programs.steam.gamescopeSession = {
+      enable = true;
+      args = [
+        "-w" "1920"
+        "-h" "1080"
+        "-r" "172"
+        "-e" # Enable steam integration
+        "--steam"
+        "--prefer-vk-device 8086:e20b" # lspci -nn | grep VGA
+      ];
+      env = {
+        WLR_RENDERER = "vulkan";
+        DXVK_HDR = "0 ";
+        ENABLE_GAMESCOPE_WSI = "0";
+        WINE_FULLSCREEN_FSR = "1";
+        SDL_VIDEODRIVER = "wayland,x11"; # Games allegedly prefer X11
+      };
+    };
+    
     programs.steam = {
       enable = true;
       package = pkgs.steam.override {
@@ -46,49 +70,13 @@
           gamemode
         ];
         extraEnv = {
-          SDL_VIDEODRIVER = "wayland";
+          # SDL_VIDEODRIVER = "wayland,x11";
+          SDL_VIDEODRIVER = "x11";
         };
       };
       remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
       dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
       localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
-
-    #   gamescopeSession = {
-    #     enable = true;
-    #     env = {
-    #       WLR_RENDERER = "vulkan";
-    #       DXVK_HDR = "0 ";
-    #       ENABLE_GAMESCOPE_WSI = "0";
-    #       WINE_FULLSCREEN_FSR = "1";
-    #       # Games allegedly prefer X11
-    #       SDL_VIDEODRIVER = "x11";
-    #     };
-    #     args = [
-    #       "--xwayland-count 1"
-    #       "--expose-wayland"
-
-    #       "-e" # Enable steam integration
-    #       "--steam"
-
-    #       # "--adaptive-sync"
-    #       # "--hdr-enabled"
-    #       # "--hdr-itm-enable"
-
-    #       # External monitor
-    #       "--prefer-output DP-3"
-    #       "--output-width 1920"
-    #       "--output-height 1080"
-    #       "-r 172"
-
-    #       # Laptop display
-    #       # "--prefer-output eDP-1"
-    #       # "--output-width 2560"
-    #       # "--output-height 1600"
-    #       # "-r 120"
-          
-    #       # "--prefer-vk-device 10de:1b81" # lspci -nn | grep VGA
-    #     ];
-    #   };
     };
   };
 }
\ No newline at end of file
diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix
index 967099d..ba96178 100644
--- a/systems/x86_64-linux/drivebystation-nix/default.nix
+++ b/systems/x86_64-linux/drivebystation-nix/default.nix
@@ -104,16 +104,7 @@ in
       ];
       # Or disable the firewall altogether.
       # networking.firewall.enable = false;
-      programs.gamescope.enable = true;
-      programs.steam.gamescopeSession = {
-        enable = true;
-        args = [
-          "-w" "1920"
-          "-h" "1080"
-          "-r" "172"
 
-        ];
-      };
 
       # Install firefox.
       programs.firefox.enable = true;