X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=.bashrc;h=f7bcae44ef0343583abde11e143aa7877de01f1c;hb=f8e297f33588e48ff2e58de9ddaa6299616405df;hp=68849f7030d61b0bcadf7ddb557208f4f9879dcd;hpb=d64ef6d7b1f1a048ce0d36b39c0a56249b53b43b;p=dotfiles

diff --git a/.bashrc b/.bashrc
index 68849f7..f7bcae4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -86,7 +86,7 @@ fi
 
 # Automatically open screen.
 # The if statement prevents it from recursing (since screen opens bash).
-if [ $TERM != screen ]; then
+if [ $TERM != screen ] && [ $TERM != screen.xterm-256color ] ; then
 	screen
 fi
 
@@ -133,3 +133,7 @@ set -o vi
 
 # pip should only run if there is a virtualenv currently activated
 export PIP_REQUIRE_VIRTUALENV=true
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"  # This loads nvm
+[ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion