diff --git a/modules/packages.nix b/modules/packages.nix
index 7d70e52..096a3ae 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -26,7 +26,6 @@
     vlc
     onlyoffice-desktopeditors
     nextcloud-client
-    sunshine
     
     # GNOME extensions
     gnomeExtensions.appindicator
diff --git a/modules/services.nix b/modules/services.nix
index e49ba64..73099e5 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -11,4 +11,17 @@
     AllowHybridSleep=no
     AllowSuspendThenHibernate=no
   '';
+
+  services.sunshine = {
+    enable = true;
+    autoStart = true;
+    capSysAdmin = true;
+    openFirewall = true;
+    package = pkgs.sunshine.override {
+      cudaSupport = true;
+    };    
+  };
+
+  # Tailscale
+  services.tailscale.enable = true;
 }