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

diff --git a/tmux.conf b/tmux.conf
index d88c80f0124f6f0011f16c1a0b8ae3e4ca8ebc72..38a7da1455a5646924244cba763c6259e8b7b19d 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,5 +1,5 @@
-#Integrate Mouse Scrolling
-# setw -g mouse on
+# Allow use of buffer
+set-option -g default-command "reattach-to-user-namespace -l zsh"
 
 #Increase the scrollback
 set -g history-limit 5000
@@ -22,10 +22,6 @@ bind - split-window -v
 # set -g status-right '#[fg=black]#[bg=white]#(uptime)'
 # set -g status-right-length 70
 
-# 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
 
@@ -43,3 +39,7 @@ bind -r l run-shell 'tmux select-pane -R'
 # Set color mode.
 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