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

[rbdr/dotfiles] / tmux.conf

diff --git a/tmux.conf b/tmux.conf
index d88c80f0124f6f0011f16c1a0b8ae3e4ca8ebc72..feba8feb1ccb98c104691d3cb90f0bd6aa791ef8 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
 
 #Increase the scrollback
 set -g history-limit 5000


@@ -14,17 +14,15 @@ bind | split-window -h
 bind - split-window -v
 
 #Customize the status bars.
 bind - split-window -v
 
 #Customize the status bars.

-# set -g status-bg cyan
-# set -g status-fg white
-# set -g status-left-length 24
-# set -g status-left '#[fg=black]#[bg=white]#H-#S'
-# set-window-option -g window-status-current-bg red
-# 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
+set -g status-bg cyan
+set -g status-fg white
+set -g status-left-length 24
+set -g status-left '#[fg=black]#[bg=white]#H-#S '
+set-window-option -g window-status-current-bg red
+set-window-option -g window-status-current-fg colour232
+set-window-option -g window-status-fg colour231
+set -g status-right ' #[fg=black]#[bg=white]#(short-uptime)'
+set -g status-right-length 70

 
 # Better powerline highlighting.
 set-window-option -g window-status-activity-attr bold,blink,underscore
 
 # Better powerline highlighting.
 set-window-option -g window-status-activity-attr bold,blink,underscore