X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=0f1c4e7909faedcebeb8207110d206b66de5b64d;hb=798aff79d41ca995ea455a6102037340384ef0d2;hp=c71388cdb9937c87c38c367546a19ee8e2d5afe0;hpb=7d7310f4157dd6768ad3120dee41b52f9b03ed3c;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index c71388c..0f1c4e7 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,6 +5,19 @@ if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
+if [ -f ~/.bashrc-local ]; then
+	. ~/.bashrc-local
+fi
+
+xlock2() {
+        ps aux | grep -v grep | grep xscreensaver > /dev/null
+        if [ $? -ne 0 ]; then
+                echo "starting xscreensaver..."
+                xscreensaver &
+        fi
+        xscreensaver-command -lock
+}
+
 case $- in
 *i*)
 	# interactive shell
@@ -12,7 +25,7 @@ case $- in
 	alias mv='mv -i'
 	alias vi='vim'
 	alias wget='wget --user-agent="Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)"'
-	alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
+	alias grep='grep --color=tty -d skip'
 	export PATH="${PATH}:${HOME}/cmccabe-bin"
 	export EDITOR="/usr/bin/vim"
 	export CSCOPE_EDITOR="${EDITOR}"