diff --git a/zshenv b/zshenv
deleted file mode 100644
index c36716a..0000000
--- a/zshenv
+++ /dev/null
@@ -1,33 +0,0 @@
-########################
-# Source Things
-########################
-
-# dircolors
-[ -s ~/.dircolors ] && . ~/.dircolors
-
-# extend path
-export PATH=$HOME/local/bin:$PATH
-
-# nvm
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && nvm use > /dev/null
-
-# Base16 Shell
-BASE16_SCHEME="solarized"
-BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
-[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
-
-########################
-# Dist related settings
-########################
-DIST=$(lsb_release -si)
-case DIST in
-    Arch )
-        ;;
-esac
-
-########################
-# Aliases
-########################
-alias g=git
-rl () { $(npm bin)/$* }
diff --git a/zshrc b/zshrc
index c8fcddf..7dfec8f 100644
--- a/zshrc
+++ b/zshrc
@@ -16,6 +16,39 @@ if ! zgen saved; then
     zgen save
 fi
 
+# dircolors
+[ -s ~/.dircolors ] && . ~/.dircolors
+
+# extend path
+export PATH="$HOME/local/bin:$PATH"
+
+# nvm
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
+# use node version specified in ~/.nvmrc as default
+nvm use > /dev/null
+
+# Base16 Shell
+BASE16_SCHEME="solarized"
+BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
+[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
+
+########################
+# Dist related settings
+########################
+DIST=$(lsb_release -si)
+case DIST in
+    Arch )
+        ;;
+esac
+
+########################
+# Aliases
+########################
+alias g=git
+rl () { $(npm bin)/$* }
+
+
 # keybindings
 
 bindkey '^r' history-incremental-search-backward