diff --git a/system/gamescope.nix b/system/gamescope.nix
index 79ae35ac..9c94e064 100644
--- a/system/gamescope.nix
+++ b/system/gamescope.nix
@@ -1,18 +1,34 @@
-{ config, lib, pkgs, user, ... }:
-
-{
-  imports = [ ./desktop.nix ./steam.nix ];
-  programs.steam.gamescopeSession.enable = true;
-  services.greetd.settings = rec {
-    default_session.command = ''
-      gamescope\
-        --nested-refresh 60\
-        --scaler auto --filter fsr --fsr-sharpness 10\
-        --hide-cursor-delay 5 --steam -- steam -gamepadui
-    '';
-    initial_session = {
-      inherit user;
-      inherit (default_session) command;
+{ pkgs, user, ... }: {
+  imports = [ ./default.nix ./steam.nix ];
+  environment.systemPackages = with pkgs; [ mesa ];
+  sound.enable = true;
+  hardware = {
+    pulseaudio.enable = false;
+    bluetooth.enable = true;
+  };
+  services = {
+    accounts-daemon.enable = true;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+    greetd = {
+      enable = true;
+      settings = rec {
+        default_session.command = ''
+          gamescope\
+            --nested-refresh 60\
+            --scaler auto --filter fsr --fsr-sharpness 10\
+            --hide-cursor-delay 5 --steam -- steam -gamepadui
+        '';
+        initial_session = {
+          inherit user;
+          inherit (default_session) command;
+        };
+      };
     };
   };
+  programs.steam.gamescopeSession.enable = true;
 }
diff --git a/system/steam.nix b/system/steam.nix
index 74af8876..8a861b2a 100644
--- a/system/steam.nix
+++ b/system/steam.nix
@@ -12,7 +12,6 @@
     steam = {
       enable = true;
       remotePlay.openFirewall = true;
-      gamescopeSession.enable = true;
     };
   };
 }