diff --git a/zshrc b/zshrc
index c075127..6b790a9 100644
--- a/zshrc
+++ b/zshrc
@@ -9,9 +9,9 @@ PATH="$HOME/bin:$PATH"
 if [[ "$OSTYPE" == darwin* ]]; then
   PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
   MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"
-  export NVM_DIR="/Users/atomaka/.nvm"
+  NVM_DIR="$(brew --prefix nvm)"
 else
-  export NVM_DIR="/home/atomaka/.nvm"
+  NVM_DIR="/home/atomaka/.nvm"
 fi
 
 # add path to newer bins on cse servers (github/rmblair)
@@ -69,4 +69,6 @@ if test -d "$HOME/.rbenv/bin" ; then
   eval "$(rbenv init -)"
 fi
 
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
+if test -f "$NVM_DIR/nvm.sh"; then
+  source "$NVM_DIR/nvm.sh"
+fi