diff --git a/clan.nix b/clan.nix
index f45ab25..7b5c4e2 100644
--- a/clan.nix
+++ b/clan.nix
@@ -20,6 +20,7 @@
       tags = [
         "desktop"
         "spain"
+        "gaming"
       ];
     };
     frues-surface3 = {
diff --git a/machines/frues-pc/configuration.nix b/machines/frues-pc/configuration.nix
index e2d964f..3c08496 100644
--- a/machines/frues-pc/configuration.nix
+++ b/machines/frues-pc/configuration.nix
@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   imports = [
     ./disks.nix
     ../../modules/desktop/hyprland.nix
@@ -19,13 +20,7 @@
     };
   };
 
-  # It is an open-source implementation of Nvidia’s Moonlight game streaming application
-  services.sunshine = {
-    enable = true;
-    autoStart = true;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
+  services.sunshine.autoStart = true;
 
   home-manager.users.pedro.wayland.windowManager.hyprland.settings = {
     monitor = [
diff --git a/modules/desktop/gaming.nix b/modules/desktop/gaming.nix
index 314810c..29e7639 100644
--- a/modules/desktop/gaming.nix
+++ b/modules/desktop/gaming.nix
@@ -1,11 +1,21 @@
-{...}: {
+{ pkgs, lib, ... }:
+{
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = false;
   };
 
+  environment.systemPackages = [ pkgs.gamescope ];
+
   programs.gamemode.enable = true;
 
   services.joycond.enable = true;
+
+  services.sunshine = {
+    enable = true;
+    autoStart = lib.mkDefault false;
+    capSysAdmin = true;
+    openFirewall = true;
+  };
 }