Merge branch 'master' of github.com:10sr/dotfiles

bashrc

@@ -74,7 +74,7 @@ type fortune >/dev/null 2>&1 && {
     echo
 }
 uname -a
-echo TERM $TERM connected to $(tty), running $BASH $BASH_VERSION
+echo TERM $TERM $(tput colors) colors connected to $(tty), running $BASH $BASH_VERSION
 echo
 
 ###################################

tmux.conf

@@ -12,8 +12,12 @@ set -g default-terminal screen-256color
 
 #set -g status-left ""
 #set -g status-right "#H | %a, %d %b %Y %T %z #(tmux -V)"
-set -g status-right "#H | #(tmux -V) "
+set -g status-right "#(whoami)@#H | #(tmux -V) "
 set message-bg black
 set message-fg yellow
 
 set -g set-titles on
+
+set status-fg white
+set status-bg green
+if "test `hostname` = newkiwi" "set status-bg blue"