Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index df38b8765928f7abfa2ffa6421eeb0e4f6c1f66c..87533149ce195df1df5013eb628945a9ee309004 100644 (file)
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -9,4 +9,7 @@ bind C-a send-prefix
 
 set -g default-terminal "screen-256color"
 
-set -s escape-time 0
\ No newline at end of file
+set -s escape-time 0
+
+run-shell "powerline-daemon -q"
+source "/usr/lib64/python2.7/site-packages/powerline/bindings/tmux/powerline.conf"