diff --git a/modules/nixos/desktop/services/default.nix b/modules/nixos/desktop/services/default.nix
index 27679c3..e3e39db 100644
--- a/modules/nixos/desktop/services/default.nix
+++ b/modules/nixos/desktop/services/default.nix
@@ -11,24 +11,9 @@ in
 {
   options.desktop.services = {
     spotifyd.enable = mkEnableOption "";
-    sunshine.enable = mkEnableOption "";
-    steam.enable = mkEnableOption "";
   };
 
   config = mkMerge [
-    (mkIf cfg.sunshine.enable {
-      services.sunshine = {
-        enable = true;
-        capSysAdmin = true;
-        openFirewall = true;
-        settings = {
-          sunshine_name = config.hostname;
-          origin_web_ui_allowed = "wan";
-        };
-        applications = { };
-      };
-      home-manager.sharedModules = singleton { persistDirs = singleton ".config/sunshine"; };
-    })
     (mkIf cfg.spotifyd.enable {
       networking.firewall.allowedTCPPorts = [ 5353 ];
       networking.firewall.allowedUDPPorts = [ 5353 ];
diff --git a/modules/nixos/desktop/services/sunshine/default.nix b/modules/nixos/desktop/services/sunshine/default.nix
new file mode 100644
index 0000000..000131a
--- /dev/null
+++ b/modules/nixos/desktop/services/sunshine/default.nix
@@ -0,0 +1,23 @@
+{ config, lib, ... }:
+let
+  inherit (lib) singleton mkIf mkEnableOption;
+  cfg = config.desktop.services.sunshine;
+in
+{
+  options.desktop.services.sunshine = {
+    enable = mkEnableOption "";
+  };
+  config = mkIf cfg.enable {
+    services.sunshine = {
+      enable = true;
+      capSysAdmin = true;
+      openFirewall = true;
+      settings = {
+        sunshine_name = config.hostname;
+        origin_web_ui_allowed = "wan";
+      };
+      applications = { };
+    };
+    home-manager.sharedModules = singleton { persistDirs = singleton ".config/sunshine"; };
+  };
+}