X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=.bashrc;h=0f28a57714def8eb78a88281000df6f4b310ac3d;hb=807ebd8e94c5673a640689520b11b4d4e35498f4;hp=0e28220df35a63a6fca449520625cc02c4d4b53c;hpb=4633d588c8303097bc00459f860d176ad5b921a6;p=dotfiles

diff --git a/.bashrc b/.bashrc
index 0e28220..0f28a57 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'.
@@ -18,12 +21,21 @@ shopt -s histappend
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+shopt -s globstar
+
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
 # 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`"
@@ -114,9 +126,9 @@ on_prompt() {
     fi
 }
 
+# Set vi keybindings
+set -o vi
+
 # Call on_prompt() every time the command prompt executes
 PROMPT_COMMAND=on_prompt
 
-export NVM_DIR="/Users/david/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
-