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

diff --git a/.bashrc b/.bashrc
index 778a65d..f7bcae4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,4 +1,5 @@
 # ~/.bashrc: executed by bash(1) for non-login shells.
+cat /dev/null > ~/.bash_history
 
 # If not running interactively, don't do anything
 case $- in
@@ -78,9 +79,14 @@ fi
 PATH="/usr/local/bin:$PATH"
 export PATH
 
+# Run a machine-specific bashrc (if it exists).
+if [ -f $HOME/.bashrc_local ]; then
+	source $HOME/.bashrc_local
+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
 
@@ -127,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