diff --git a/deploy.nix b/deploy.nix
--- a/deploy.nix
+++ b/deploy.nix
@@ -47,14 +47,6 @@ path = deploy-rs.lib.aarch64-darwin.activate.darwin self.darwinConfigurations.shiro;
         user = "root";
       };
     };
-    deck = {
-      hostname = "sdeck";
-      profiles.system = {
-        sshUser = "deck";
-        path = deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.deck;
-        user = "deck";
-      };
-    };
     yuge = {
       hostname = "sdeck";
       interactiveSudo = true;
diff --git a/flake.nix b/flake.nix
--- a/flake.nix
+++ b/flake.nix
@@ -335,13 +335,6 @@ user = "servius";
         isServer = false;
         tailscaleIp = "100.80.149.119";
       };
-      deck = mkDevice {
-        name = "SteamDeck";
-        system = "x86_64-linux";
-        user = "deck";
-        hasGui = false; # Don't wan't to run GUI apps on the SteamDeck
-        isServer = true;
-      };
       yuge = mkDevice {
         name = "yuge";
         system = "x86_64-linux";
@@ -437,25 +430,6 @@ import ./darwin {
           inherit devices inputs nixpkgs home-manager overlays nur nix-darwin;
           sops-nix = inputs.sops-nix;
         };
-
-      homeConfigurations = {
-        deck = let
-          pkgs = import inputs.nixpkgs {
-            inherit overlays;
-            system = "x86_64-linux";
-          };
-        in
-          home-manager.lib.homeManagerConfiguration {
-            inherit pkgs;
-            extraSpecialArgs = {
-              inherit inputs;
-            };
-            modules = [
-              {nixpkgs.config.allowUnfree = true;}
-              ./steamdeck
-            ];
-          };
-      };
 
       systemConfigs = import ./system-manager {
         inherit inputs system-manager;
diff --git a/steamdeck/default.nix b/steamdeck/default.nix
deleted file mode 100644
--- a/steamdeck/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ../home/programs/helix.nix
-    ../home/programs/sops.nix
-  ];
-  programs = {
-    home-manager.enable = true;
-    bash = {
-      enable = true;
-    };
-  };
-
-  systemd.user.services = {
-    nextcloudcmd = {
-      Unit = {
-        Description = "Nextcloud Client";
-      };
-      Service = {
-        Type = "oneshot";
-        ExecStart = "${pkgs.nextcloud-client}/bin/nextcloudcmd -n /home/deck/Nextcloud https://cloud.darksailor.dev";
-      };
-    };
-  };
-
-  systemd.user.timers = {
-    nextcloudcmd = {
-      Unit = {
-        Description = "Run Nextcloud Client every 5 minutes";
-      };
-      Timer = {
-        OnCalendar = "*:0/5";
-        Persistent = true;
-      };
-      Install = {
-        WantedBy = ["timers.target"];
-      };
-    };
-  };
-
-  home = {
-    username = "deck";
-    homeDirectory = "/home/deck";
-    packages = with pkgs; [
-      _1password-cli
-      just
-    ];
-    stateVersion = "24.11";
-  };
-}
diff --git a/system-manager/yuge/bash.nix b/system-manager/yuge/bash.nix
new file mode 100644
--- /dev/null
+++ b/system-manager/yuge/bash.nix
@@ -0,0 +1,5 @@
+{...}: {
+  programs.bash = {
+    enable = true;
+  };
+}
diff --git a/system-manager/yuge/configuration.nix b/system-manager/yuge/configuration.nix
--- a/system-manager/yuge/configuration.nix
+++ b/system-manager/yuge/configuration.nix
@@ -1,10 +1,12 @@
 {...}: {
   imports = [
     ./moonlight.nix
+    ./recover.nix
     ./shadps4.nix
     ./sshd.nix
     ./sudo.nix
     ./tailscale.nix
+    ./fish.nix
   ];
 
   system-manager.allowAnyDistro = true;
diff --git a/system-manager/yuge/fish.nix b/system-manager/yuge/fish.nix
new file mode 100644
--- /dev/null
+++ b/system-manager/yuge/fish.nix
@@ -0,0 +1,5 @@
+{...}: {
+  # programs.fish = {
+  #   enable = true;
+  # };
+}
diff --git a/system-manager/yuge/recover.nix b/system-manager/yuge/recover.nix
new file mode 100644
--- /dev/null
+++ b/system-manager/yuge/recover.nix
@@ -0,0 +1,35 @@
+{pkgs, ...}: let
+  nixPath = "/nix/var/nix/profiles/default/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin";
+  recover = pkgs.writeShellApplication {
+    name = "yuge-recover";
+    runtimeInputs = with pkgs; [coreutils systemd];
+    text = ''
+      if [ "$EUID" -ne 0 ]; then
+        exec sudo -- "$0" "$@"
+      fi
+
+      install -d -m 0755 /etc/ssh/sshd_config.d
+      cat > /etc/ssh/sshd_config.d/50-nix-path.conf <<EOF
+      SetEnv PATH=${nixPath}
+      EOF
+      chmod 0644 /etc/ssh/sshd_config.d/50-nix-path.conf
+
+      install -d -m 0755 /etc/sudoers.d
+      cat > /etc/sudoers.d/50-nix-path <<EOF
+      Defaults secure_path="${nixPath}"
+      EOF
+      chmod 0440 /etc/sudoers.d/50-nix-path
+
+      systemctl reload sshd || systemctl restart sshd
+      systemctl start nix-daemon.service || true
+      systemctl start system-manager-path.service || true
+
+      echo "yuge-recover: bootstrap restored. Run 'deploy -s .#yuge' from your dev machine."
+    '';
+  };
+in {
+  environment.etc."yuge-recover" = {
+    source = "${recover}/bin/yuge-recover";
+    mode = "0755";
+  };
+}
diff --git a/system-manager/yuge/tailscale.nix b/system-manager/yuge/tailscale.nix
--- a/system-manager/yuge/tailscale.nix
+++ b/system-manager/yuge/tailscale.nix
@@ -1,10 +1,13 @@
 {pkgs, ...}: {
+  environment.systemPackages = [
+    pkgs.tailscale
+  ];
   systemd.services.tailscaled = {
     description = "Tailscale node agent";
     documentation = ["https://tailscale.com/docs/"];
     wants = ["network-pre.target"];
     after = ["network-pre.target" "NetworkManager.service" "systemd-resolved.service"];
-    wantedBy = ["system-manager.target"];
+    wantedBy = ["multi-user.target"];
 
     serviceConfig = {
       Type = "notify";