diff --git a/.chezmoitemplates/zshrc_darwin.tmpl b/.chezmoitemplates/zshrc_darwin.tmpl
index 841dcd0..ee9fe11 100644
--- a/.chezmoitemplates/zshrc_darwin.tmpl
+++ b/.chezmoitemplates/zshrc_darwin.tmpl
@@ -238,6 +238,4 @@ export EDITOR=vim
 
 source <(/opt/homebrew/bin/starship init zsh --print-full-init)
 
-if [ -x "$(command -v tmux)" ] && [ -z "${TMUX}" ] && [ -n "${WEZTERM_CONFIG_DIR}" ]; then
-    exec tmux new-session -A -s ${USER} >/dev/null 2>&1
-fi
+[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
diff --git a/.chezmoitemplates/zshrc_linux.tmpl b/.chezmoitemplates/zshrc_linux.tmpl
index 332473b..5c98403 100644
--- a/.chezmoitemplates/zshrc_linux.tmpl
+++ b/.chezmoitemplates/zshrc_linux.tmpl
@@ -238,6 +238,4 @@ eval "$(starship init zsh)"
 
 test -e "$HOME/.shellfishrc" && source "$HOME/.shellfishrc"
 
-if [ -x "$(command -v tmux)" ] && [ -n "${DISPLAY}" ] && [ -z "${TMUX}" ] && [ -n "${WEZTERM_UNIX_SOCKET}" ]; then
-    exec tmux new-session -A -s ${USER} >/dev/null 2>&1
-fi
+[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"