diff --git a/zsh/0_path.zsh b/zsh/0_path.zsh
index 050e67a..8cc84c5 100644
--- a/zsh/0_path.zsh
+++ b/zsh/0_path.zsh
@@ -10,5 +10,8 @@ pathAppend() {
 # Remove duplicate entries from PATH:
 PATH=$(echo "$PATH" | awk -v RS=':' -v ORS=":" '!a[$1]++{if (NR > 1) printf ORS; printf $a[$1]}')
 
-pathAppend "$HOME/.yadr/bin"
 pathAppend "$HOME/.yadr/bin/yadr"
+pathAppend "$HOME/.rvm/bin:$HOME/.local/bin:$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin"
+if [[ `uname` == "Darwin" ]]; then
+  pathAppend "/usr/local/opt/libpq/bin"
+fi
diff --git a/zsh/local.zsh b/zsh/local.zsh
index 2c6f6db..86a18b1 100644
--- a/zsh/local.zsh
+++ b/zsh/local.zsh
@@ -13,11 +13,6 @@ export PATH=$PATH:$HOME/Android/sdk/platform-tools:$HOME/Android/sdk/tools/
 #### Qiniu
 QINIU_ACCESS_KEY=l6Rf0LgQDgpSwjdXr_MgsCynhsofRM7W2dwvIOXO
 
-#### nvm
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && nvm use $NVM_VERSION
-export PATH="$PATH:$HOME/.nvm/versions/node/$NVM_VERSION/bin"
-
 #### Java
 export JAVA_HOME=/usr/lib/jvm/java-7-oracle
 if [ "$(uname)" = "Darwin" ]; then