zsh

.zsh/functions.d/s.sh

@@ -19,8 +19,29 @@ s() {
     # Run SSH session
     command ssh "$@"
 
-    # Restore after disconnect
+    # Restore previous tmux window name
-    printf '\033k%s\033\\' "$original_name"
+    tmux rename-window "$original_name"
+  else
+    command ssh "$@"
+  fi
+}
+
+sshr() {
+  if [ -n "$TMUX" ]; then
+    local original_name
+    original_name=$(tmux display-message -p '#W')
+
+    local ssh_host="$1"
+    ssh_host="${ssh_host#*@}"
+    ssh_host="${ssh_host%%:*}"
+    ssh_host="${ssh_host%% *}"
+
+    # Emit title update BEFORE ssh
+    printf '\033k%s\033\\' "${ssh_host%%.*}"
+
+    command ssh "$@"
+
+
   else
     command ssh "$@"
   fi

.zshrc

@@ -2,6 +2,7 @@
 source ~/.env
 
 # Source some private stuff or custom things that are different on my systems.
+# This file is not in the Git repository!
 source ~/.penv
 
 # Do some exports!