Merge remote-tracking branch 'origin/master'

[rbdr/dotfiles] / tmux.conf

diff --git a/tmux.conf b/tmux.conf
index 02772c0c9aa8f991d97fc8273a0abdab60556e99..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
@@ -23,18 +22,12 @@ bind - split-window -v
 # set -g status-right '#[fg=black]#[bg=white]#(uptime)'
 # set -g status-right-length 70
 
-# powerline tmux
-set-option -g status on
-set-option -g status-bg colour12
-set-option -g status-fg colour7
-set-window-option -g window-status-current-bg colour9
-set-option -g status-interval 2
-set-option -g status-utf8 on
-set-option -g status-justify "centre"
-set-option -g status-left-length 60
-set-option -g status-right-length 90
-set-option -g status-left "#(~/.dotfiles/tmux-powerline/status-left.sh)"
-set-option -g status-right "#(~/.dotfiles/tmux-powerline/status-right.sh)"
+# Powerline
+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
 
 #Set Activity monitoring.
 setw -g monitor-activity on
@@ -42,6 +35,11 @@ set -g visual-activity on
 
 # Vi keys in copy mode.
 setw -g mode-keys vi
+bind -r k run-shell 'tmux select-pane -U'
+bind -r j run-shell 'tmux select-pane -D'
+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"