diff --git a/dotfiles/lib/zsh/term_support.sh b/dotfiles/lib/zsh/term_support.sh
index b00e44d5..740c154d 100644
--- a/dotfiles/lib/zsh/term_support.sh
+++ b/dotfiles/lib/zsh/term_support.sh
@@ -26,6 +26,11 @@ function omz_termsupport_precmd {
 function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
+  case "$1" in
+    (tmux[[:space:]]##(a|attach|attach-session)(|[[:space:]]*))
+      return
+      ;;
+  esac
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
   title "$CMD" "%100>...>${2:gs/%/%%}%<<"
 }
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index 315de2df..479a318b 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -1,3 +1,8 @@
 # Create a new Codex session from the current pane path and switch to it.
 # Prefix + C starts a new session without prompting for a name.
 bind-key C new-session -c '#{pane_current_path}' 'codex --dangerously-bypass-approvals-and-sandbox'
+
+set -g status-right '#($HOME/dotfiles/dotfiles/lib/functions/multiplexer_host_label 2>/dev/null || multiplexer_host_label 2>/dev/null || hostname -s) #{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,}"#{=21:pane_title}" %H:%M %d-%b-%y'
+set -g status-right-length 150
+set -g set-titles on
+set -g set-titles-string '#{?#{==:#{session_name},#{window_name}},#{session_name},#{session_name}:#{window_name}}#{?pane_title, - #{pane_title},}'
diff --git a/nixos/desktop.nix b/nixos/desktop.nix
index c07a1780..df6b9316 100644
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -102,6 +102,7 @@
           force = true;
           text = ''
             confirm-close-surface = false
+            shell-integration-features = cursor,no-sudo,no-title,no-ssh-env,no-ssh-terminfo,path
           '';
         };
       }