X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=bb5e3847ae153aacafa4f093304a6c368c093ec1;hb=9d069b1c50f004648e289b840d7881ee7f988ea0;hp=01909c20cf3ec4bd10747b67b9c9cd7f9f625dd6;hpb=a01678f9ccef4faf0f150d6350ef1ddf6720444a;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index 01909c2..bb5e384 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,21 +5,31 @@ 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
+        until xscreensaver-command -lock; do
+                sleep 1
+        done
+}
+
 case $- in
 *i*)
 	# interactive shell
-	alias ls='ls --color=auto'
+        ls --color /tmp &>/dev/null && alias ls='ls --color=auto'
 	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'
-	alias mplayer2="mplayer -fs \
--vo gl2 \
--dr -noslices -xineramascreen 1"
-	alias mplayer="mplayer -fs \
--vo gl:yuv=2:noati-hack:rectangle=0:noaspect \
--dr -noslices -xineramascreen 1"
+        alias bterm='xterm -fn "-adobe-courier-bold-r-normal--34-240-100-100-m-200-iso8859-1" -geometry 60x30-50-50'
+        alias mplayer="mplayer -fs -ac a52,"
 	export PATH="${PATH}:${HOME}/cmccabe-bin"
 	export EDITOR="/usr/bin/vim"
 	export CSCOPE_EDITOR="${EDITOR}"
@@ -28,3 +38,6 @@ case $- in
 	# non-interactive shell
 	;;
 esac
+
+# Perturb malloc so that we spot bugs quicker!
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))