Merge branch 'master' of github.com:pks/dotfiles

1 files changed, 6 insertions, 5 deletions

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 7592a2e..0bd880e 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -70,7 +70,7 @@ case $_HOST_TYPE in
 esac
 
 # get a white background in mutt
-COLORFGBG="default;default"
+#COLORFGBG="White;Black"
 
 # #############################################################################
 # terminal
@@ -164,7 +164,7 @@ esac
 # #############################################################################
 
 case `hostname` in
-  2pac|CLuster|node*|gpu*|coltrane|donna|vicious|lemmy)
+  2pac|CLuster|coltrane|donna|vicious|lemmy)
     umask u=rwx,g=rwx,o=rx
     alias tmux="tmux -f ~/.tmux.`hostname`.conf"
   ;;
@@ -260,16 +260,17 @@ diff ()
   if [[ -x $(which colordiff 2>/dev/null) ]]; then
     colordiff "$@"
   else
-    diff "$@"
+    command diff "$@"
   fi
 }
 
 irb ()
 {
-  if [[ -x $(which pry 2>/dev/null) ]]; then
+  which pry &>/dev/null
+  if [[ $? -eq 0 ]]; then
     pry "$@"
   else
-    irb "$@"
+    command irb "$@"
   fi
 }