X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.bashrc;h=b0df65be71a2732bc0bf3cde0649a893dae3f7d0;hb=2cc8f76073ee3f0ce10a45cfec2214929296d683;hp=6226e6d755894b5da832e86aded18a2db1d3d60f;hpb=01e609d08dbd1c3b8fd46bad893bdaa88c499f0f;p=cmccabe-etc

diff --git a/.bashrc b/.bashrc
index 6226e6d..b0df65b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -23,17 +23,22 @@ xlock2() {
 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 grep='grep --color=tty -d skip'
-	alias mplayer2="mplayer -fs \
--vo gl2 \
--dr -noslices -xineramascreen 1"
+        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 gl:yuv=2:noati-hack:rectangle=0:noaspect \
+-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}"