X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=b0df65be71a2732bc0bf3cde0649a893dae3f7d0;hb=5a157d48604daa6a1d2c146a3683d5cb1cdd18f8;hp=9abe74b5f5a78bb48ecb5671bf472d1b504f6fbb;hpb=f83925bb8a957c052bc348f0ed69c4927a87c56b;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index 9abe74b..b0df65b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -9,15 +9,36 @@ 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 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}"