Merge remote-tracking branch 'origin/master'

tmux.conf

@@ -22,6 +22,7 @@ set -g mode-keys vi
 set -g repeat-time 0
 
 # No left status; right status bar is session name
+set -g status-bg black
 set -g status-left ""
 set -g status-left-bg black
 set -g status-left-fg brightblue

zprofile

@@ -12,7 +12,7 @@ print_heading -l 1 'Initializing login shell'
 list_tmux_sessions()
 {
     tmux_out=`tmux list-sessions 2>/dev/null`
-    [[ -z "$tmux_out" ]] && return
+    [[ -z "$tmux_out" || -n "$TMUX" ]] && return
 
     echo "You have the following active tmux sessions:"
     for session in ${(f)tmux_out}; do