Merge branch 'master' of github.com:rbdr/dotfiles

[rbdr/dotfiles] / tmux.conf

diff --git a/tmux.conf b/tmux.conf
index 33db53ad8a3f91468977a4839725643e429b23d1..38a7da1455a5646924244cba763c6259e8b7b19d 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
+# Allow use of buffer
+set-option -g default-command "reattach-to-user-namespace -l zsh"
 
 #Increase the scrollback
 set -g history-limit 5000
@@ -23,9 +22,6 @@ bind - split-window -v
 # set -g status-right '#[fg=black]#[bg=white]#(uptime)'
 # set -g status-right-length 70
 
-# Powerline
-source ~/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
 
@@ -35,6 +31,15 @@ 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"
+
+# Powerline
+run-shell "powerline-daemon -q"
+source /Users/benbeltran/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf