Merge master

[rbdr/dotfiles] / tmux.conf

diff --git a/tmux.conf b/tmux.conf
index 968a1d8ba3bc24070aea8f9b36c78f6b2752e5dc..dcf0f26e36e49c047d191294f154761a5a1c3b83 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
@@ -15,16 +14,15 @@ bind | split-window -h
 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
-source ~/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
@@ -41,4 +39,4 @@ 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"