diff --git a/bashrc b/bashrc index 166572a..153145c 100644 --- a/bashrc +++ b/bashrc @@ -153,5 +153,12 @@ if [ -d "$HOME"/.bashrc.d ] ; then unset -v config fi if [ -f ${HOME}/.bashrc.d/local/${HOSTNAME}.bash ] ; then + echo "Loading ${HOME}/.bashrc.d/local/${HOSTNAME}.bash" source ${HOME}/.bashrc.d/local/${HOSTNAME}.bash fi + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" diff --git a/bashrc.d/nvm.bash b/bashrc.d/nvm.bash deleted file mode 100644 index acc6ed5..0000000 --- a/bashrc.d/nvm.bash +++ /dev/null @@ -1,3 +0,0 @@ -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion