diff --git a/bash/.bashrc b/bash/.bashrc index e8b147c..7aa9a4f 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -8,30 +8,27 @@ alias ls='ls -G' PS1='[\u@\h \W]\$ ' -if [ -x "$(command -v direnv)" ]; -then +if [ -x "$(command -v direnv)" ]; then eval "$(direnv hook bash)" fi alias edit="$(which emacsclient) " -if [ -f /usr/share/nvm/init-nvm.sh ]; -then +if [ -f /usr/share/nvm/init-nvm.sh ]; then source /usr/share/nvm/init-nvm.sh fi -if [ -d "$HOME/.nvm" ]; -then -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 +if [ -d "$HOME/.nvm" ]; then + 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 fi -if [ -f ~/.bashrc.local ]; -then if [ -e "$(which virtualenvwrapper.sh)" ]; then source "$(which virtualenvwrapper.sh)" fi + +if [ -f ~/.bashrc.local ]; then source ~/.bashrc.local fi