Merge master

[rbdr/dotfiles] / tmux.conf

diff --git a/tmux.conf b/tmux.conf
index 60cbfc9b6cc2eb65d48e814bd56bee835c0abff8..feba8feb1ccb98c104691d3cb90f0bd6aa791ef8 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -14,13 +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
+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
@@ -39,7 +41,3 @@ 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 /usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf
\ No newline at end of file