Merge remote-tracking branch 'origin/master'

[rbdr/dotfiles] / tmux.conf

diff --git a/tmux.conf b/tmux.conf
index 968a1d8ba3bc24070aea8f9b36c78f6b2752e5dc..d88c80f0124f6f0011f16c1a0b8ae3e4ca8ebc72 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,6 +1,5 @@
 #Integrate Mouse Scrolling
-# setw -g mode-mouse on
-# set-option -g mouse-select-pane on
+# setw -g mouse on
 
 #Increase the scrollback
 set -g history-limit 5000
@@ -24,7 +23,8 @@ bind - split-window -v
 # set -g status-right-length 70
 
 # Powerline
-source ~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf
+run-shell "powerline-daemon -q"
+source /Users/benbeltran/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf
 
 # Better powerline highlighting.
 set-window-option -g window-status-activity-attr bold,blink,underscore
@@ -41,4 +41,5 @@ bind -r h run-shell 'tmux select-pane -L'
 bind -r l run-shell 'tmux select-pane -R'
 
 # Set color mode.
-set -g default-terminal "screen-256color"
+set -g default-terminal "xterm-256color"
+set-option -ga terminal-overrides ",xterm-256color:Tc"