X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=.bashrc;h=578ecf2d12a10b5d9cf963bd7c6205fc553e75bd;hb=9f4e46b5d14eb8a540c7228078c54ab2fd836dc8;hp=a783a60fe2bf65f48e07645b16b3d7d89308d6a9;hpb=36dddc0eb9737760334cebf205ec5c3c3ae82b06;p=dotfiles

diff --git a/.bashrc b/.bashrc
index a783a60..578ecf2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -78,6 +78,11 @@ 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
@@ -119,11 +124,11 @@ on_prompt() {
   fi
 }
 
-# Set vi keybindings
-set -o vi
-
 # Call on_prompt() every time the command prompt executes
 PROMPT_COMMAND=on_prompt
 
+# Set vi keybindings
+set -o vi
+
 # pip should only run if there is a virtualenv currently activated
 export PIP_REQUIRE_VIRTUALENV=true