X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=6e3606e5f1730ec3190f80192e47e4b96d07d8b0;hb=d760fcfb6375a0b42337f8f7586bf4bedb4e1214;hp=b477840ce9a51a65e29fc87dff1188068ca38bf5;hpb=13cbe300354de36fe9721e4171d294b346887209;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index b477840..6e3606e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,6 +5,21 @@ 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
@@ -12,8 +27,21 @@ 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'
+        alias bterm='xterm -fn "-adobe-courier-bold-r-normal--34-240-100-100-m-200-iso8859-1"'
+	#alias mplayer3="mplayer -fs \
+#-vo gl2 \
+#-dr -noslices -xineramascreen 1 \
+#-ao jack,port=4444,estimate,noautostart"
+	alias mplayer="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"
 	export PATH="${PATH}:${HOME}/cmccabe-bin"
+	export EDITOR="/usr/bin/vim"
+	export CSCOPE_EDITOR="${EDITOR}"
 	;;
 *)
 	# non-interactive shell