projects
/
dotfiles
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
globstar wasn't working so remove it
[dotfiles]
/
.bashrc
diff --git
a/.bashrc
b/.bashrc
index
08021f5
..
f0ab9cf
100644
(file)
--- 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
# ~/.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'.
# 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 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`"
# enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
eval "`dircolors -b`"
@@
-55,10
+63,10
@@
if [ -d $HOME/bin ]; then
export PATH
fi
export PATH
fi
-# Put $HOME/
Library/Haskel
l/bin on the path. Installing cabal doesn't
+# Put $HOME/
.caba
l/bin on the path. Installing cabal doesn't
# automatically put installed packages on the path.
# automatically put installed packages on the path.
-if [ -d $HOME/
Library/Haskel
l/bin ]; then
- PATH="$HOME/
Library/Haskel
l/bin:$PATH"
+if [ -d $HOME/
.caba
l/bin ]; then
+ PATH="$HOME/
.caba
l/bin:$PATH"
export PATH
fi
export PATH
fi
@@
-114,5
+122,9
@@
on_prompt() {
fi
}
fi
}
+# Set vi keybindings
+set -o vi
+
# Call on_prompt() every time the command prompt executes
PROMPT_COMMAND=on_prompt
# Call on_prompt() every time the command prompt executes
PROMPT_COMMAND=on_prompt
+