X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=.bashrc;h=f0ab9cf8ded172a05960b50a31026ef230b07cea;hb=71706a3fff1263af76aea550ede6992e7a85200c;hp=68d85a6797c8a167469f2574edd5f168d0db3d36;hpb=3a0b4540254742384f7ac29ea30127755f4cd5a5;p=dotfiles

diff --git a/.bashrc b/.bashrc
index 68d85a6..f0ab9cf 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,7 +1,10 @@
 # ~/.bashrc: executed by bash(1) for non-login shells.
 
 # If not running interactively, don't do anything
-[ -z "$PS1" ] && return
+case $- in
+    *i*) ;;
+      *) return;;
+esac
 
 # don't put duplicate lines in the history. See bash(1) for more options
 # don't overwrite GNU Midnight Commander's setting of `ignorespace'.
@@ -24,6 +27,11 @@ shopt -s checkwinsize
 # set the prompt
 PS1='\w\$ '
 
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     eval "`dircolors -b`"
@@ -55,6 +63,19 @@ if [ -d $HOME/bin ]; then
 	export PATH
 fi
 
+# Put $HOME/.cabal/bin on the path. Installing cabal doesn't
+# automatically put installed packages on the path.
+if [ -d $HOME/.cabal/bin ]; then
+    PATH="$HOME/.cabal/bin:$PATH"
+    export PATH
+fi
+
+# Put /usr/local/bin (where homebrew installs stuff) before /usr/bin on the
+# path. This means that if a program exists at both locations, calls to that
+# program will use the homebrew version rather than the system version.
+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
@@ -73,3 +94,37 @@ fi
 if [ $TERM != screen ]; then
 	screen
 fi
+
+# Gets a directory named .env if it exists in the currend directory or any of its parents
+get_env() {
+    if [ -d "$1/.env" ] ; then
+        echo "$1/.env"
+    else
+        if [ -d "$1/.." ] ; then
+            get_env "$1/.."
+        fi
+    fi
+}
+
+on_prompt() {
+    # Load a virtualenv environment if it exists in a file named .env
+    env_folder=$(get_env $(pwd))
+
+    if [ -d "$env_folder" ] ; then
+        if [[ $VIRTUAL_ENV != $env_folder ]] ; then
+            echo "Activating env '$env_folder'"
+            source "$env_folder/bin/activate"
+        fi
+    else
+        if [ -d "$VIRTUAL_ENV" ] ; then
+            deactivate
+        fi
+    fi
+}
+
+# Set vi keybindings
+set -o vi
+
+# Call on_prompt() every time the command prompt executes
+PROMPT_COMMAND=on_prompt
+