diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix
index 0b8f04c4..e34fce84 100644
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -84,16 +84,6 @@
   users.groups.media = {};
 
   services = {
-    tailscale = {
-      enable = true;
-    };
-    sunshine = {
-      enable = true;
-      openFirewall = true;
-      capSysAdmin = true;
-      # applications = {};
-    };
-    mullvad-vpn.enable = true;
     resolved = {
       enable = true;
       dnssec = "true";
@@ -106,19 +96,6 @@
     udisks2.enable = true;
     gnome.gnome-keyring.enable = true;
 
-    # greetd = let
-    #   tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
-    #   hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
-    # in {
-    #   enable = true;
-    #   settings = {
-    #     default_session = {
-    #       command = "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}";
-    #       user = "greeter";
-    #     };
-    #   };
-    # };
-
     # Configure keymap in X11
     xserver.xkb = {
       layout = "us";
diff --git a/nixos/ryu/services/default.nix b/nixos/ryu/services/default.nix
index 8f754e53..0136ea3f 100644
--- a/nixos/ryu/services/default.nix
+++ b/nixos/ryu/services/default.nix
@@ -1,7 +1,12 @@
 {...}: {
   imports = [
     ./samba.nix
+    ./sunshine.nix
   ];
-  # services = {
-  # };
+  services = {
+    tailscale = {
+      enable = true;
+    };
+    mullvad-vpn.enable = true;
+  };
 }
diff --git a/nixos/ryu/services/sunshine.nix b/nixos/ryu/services/sunshine.nix
new file mode 100644
index 00000000..cd3a7693
--- /dev/null
+++ b/nixos/ryu/services/sunshine.nix
@@ -0,0 +1,8 @@
+{...}: {
+  services.sunshine = {
+    enable = true;
+    openFirewall = true;
+    capSysAdmin = true;
+    # applications = {};
+  };
+}