merge w/ barkley's version

1 files changed, 7 insertions, 2 deletions

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 0bd880e..9111d2b 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -37,6 +37,11 @@ if [[ -d ~/nlp_scripts ]]; then
   export PATH=~/nlp_scripts:$PATH
 fi
 
+which R &>/dev/null
+if [[ $? == 0 ]]; then
+  export R_LIBS_USER=$HOME/.R
+fi
+
 export EDITOR='vim -p'
 
 export LC_ALL=en_US.UTF-8
@@ -102,7 +107,7 @@ in_google_cloud () {
 
 # possible colors: black, white, green, cyan, red, yellow, magenta
 case `hostname` in
-  bogues*|curry*|iverson*|jordan*|ming*|nowitzki*|oneal*|robinson*)
+  bryant|barkley|bogues*|curry*|durant*|iverson*|jordan*|ming*|nowitzki*|oneal*|robinson*)
     HOSTCOLOR_BG=magenta
     HOSTCOLOR_FG=black
   ;;
@@ -168,7 +173,7 @@ case `hostname` in
     umask u=rwx,g=rwx,o=rx
     alias tmux="tmux -f ~/.tmux.`hostname`.conf"
   ;;
-  bogues|curry|iverson|nowitzki|oneal|ming|*.uberspace.de)
+  bryant|barkley|bogues|curry|durant|iverson|nowitzki|oneal|ming|*.uberspace.de)
     PATH=/usr/lib/colorgcc/bin:$PATH
   ;;
 esac