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

bashrc

@@ -386,6 +386,7 @@ open_file(){
         open "$@"
     elif islinux
     then
+        touch "$@"
         if null type pcmanfm; then
             LC_MESSAGES= pcmanfm "$@"
         else
@@ -499,7 +500,7 @@ winln(){
 
 __my_battery_status(){
     local dir=/sys/class/power_supply/BAT0
-    if test -d $dir
+    if test -d $dir && test -r $dir/status && test -r $dir/charge_full && test -r $dir/charge_now
     then
         local st=$(cat $dir/status)
         local full=$(cat $dir/charge_full)

tmux.conf

@@ -23,6 +23,6 @@ set -g status-bg green
 set -g status-fg white
 if "test `hostname` = arch-aspireone" "set -g status-bg blue"
 if "test `hostname` = darwin-mba.local" "set -g status-bg yellow; set -g status-fg black"
-if "test `hostname` = newkiwi" "set -g status-bg magenta"
+if "test `hostname` = newkiwi" "set -g status-bg magenta; set -g status-fg white"
 
 if "test -f /opt/local/bin/reattach-to-user-namespace" "set-option -g default-command '/opt/local/bin/reattach-to-user-namespace bash'"