X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.bashrc;h=2d47f331bc508e340cb924934fa6307952c3e402;hp=b0dbc2c3d61054025b37f77c3d736a295a7ee386;hb=2c59040eb0d3a190c4ccebcda07d5891401649e9;hpb=0778e647d173c9653ed443d5df189e7da06d1772

diff --git a/.bashrc b/.bashrc
index b0dbc2c..2d47f33 100644
--- a/.bashrc
+++ b/.bashrc
@@ -20,7 +20,15 @@ if [ "$PS1" ]; then
     fi;
     # bts debian options
 
+    if [ -e bin/faf ]; then
+	complete -F _command faf
+    fi;
+
     export DEBEMAIL="don@debian.org"
+    export DEBHOME="$(eval 'echo' '~/projects/debian')"
+
+    export GTK_IM_MODULE=xim
+    export QT_IM_MODULE=xim
 
     # enable color support of ls and also add handy aliases
     eval `dircolors -b`
@@ -42,12 +50,15 @@ if [ "$PS1" ]; then
     # if it's a remote, SSH_CONNECTION will be set
     # set variable identifying the chroot you work in (used in the prompt below)
     
-    if [ -n "$SSH_CONNECTION" ]; then
+    # disable terminal bell
+    bind 'set bell-style none'
+
+    if [ -n "$SSH_CONNECTION" -o -n "$SSH_CLIENT" ]; then
 	# figure out what color to use
 	COLOR=$(hostname|md5sum|perl -ne 'if (/^([a-f\d]{8})/) {
-              my $num = unpack(q(L),pack(q(h*),$1));
+              my $num = unpack(q(L),pack(q(H*),$1));
               my @col = map {(qq(0;${_}m),qq(1;${_}m))} 31..37;
-              my $col = $col[$num%$#col];
+              my $col = $col[$num % @col];
               if ($col eq q(0;36m)) {
                  $col = q(1;30m);
               }
@@ -99,7 +110,8 @@ if [ "$PS1" ]; then
     fi;
 
     # set up ssh-agent
-    if which ssh-agent >/dev/null && [ -d ~/.ssh ]; then
+    if which ssh-agent >/dev/null && [ -d ~/.ssh ] &&  \
+	[ -z "$SSH_CONNECTION" ] &&  [ -z "$SSH_CLIENT" ]; then 
 #	for 
 	if [ -e ~/.ssh/ssh_agent_info ] && \
 	    [ -n "$(awk -F '[=;]' '/^SSH_AGENT_PID/{print $2}' ~/.ssh/ssh_agent_info)" ] && \
@@ -121,35 +133,54 @@ if [ "$PS1" ]; then
 	LANG=C
     fi;
     export LANG
-    export PATH="~/bin:$PATH"
+    
+    # If we're running on liszt, include /var/list/.bin in the path
+    if [ "$(hostname)" == "liszt" ] && [ -d /var/list/.bin ]; then
+	PATH="/var/list/.bin:$PATH"
+    fi;
+    export PATH="$(getent passwd $(id -u)|awk -F: '{print $6}')/bin:$PATH"
+    
     if [ ! -e ~/tmp ]; then
 	mkdir ~/tmp;
     fi;
     export TMPDIR="$(echo ~/tmp)";
 
-    if [ -n "$(which devtodo)" ]; then
-	for a in tda tdd tde; do
-	    alias "s${a}"="STODO_NO_COMMIT=1 $a"
-	done;
-
-	TODO_OPTIONS="--timeout --summary"
+#     if [ -n "$(which devtodo)" ]; then
+# 	for a in tda tdd tde; do
+# 	    alias "s${a}"="STODO_NO_COMMIT=1 $a"
+# 	done;
+# 
+# 	TODO_OPTIONS="--timeout --summary"
 
 	cd ()
 	{
-            builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+	    # use pushd instead of cd
+	    if [ -z "$1" ] || [ "$1" == "-" ]; then
+		builtin cd "$@"; # && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+	    else
+		builtin pushd "$@" >/dev/null; # && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+	    fi;
 	}
 
-	pushd ()
-	{
-            builtin pushd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
-	}
-	
-	popd ()
-	{
-            builtin popd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
-	}              
+	# various livetv streams
+	alias "watch_cspan"="rtmpdump -v -r rtmp://cp82346.live.edgefcs.net:1935/live -y CSPAN1@14845 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN/ | mplayer -xy 3 -"
+	alias "watch_cspan2"="rtmpdump -v -r rtmp://cp82347.live.edgefcs.net:1935/live -y CSPAN2@14846 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN2/ | mplayer -xy 3 -"
+	alias "watch_cspan3"="rtmpdump -v -r rtmp://cp82348.live.edgefcs.net:1935/live -y CSPAN3@14847 -W http://www.c-span.org/cspanVideoHD.swf -p http://www.c-span.org/Live-Video/C-SPAN3/ | mplayer -xy 3-"
+	alias "watch_cnn"="rtmpdump -v -r rtmp://cp44679.live.edgefcs.net/live -y cnn_stream1_low@2785 -a live -W http://i.cdn.turner.com/cnn/.element/apps/CNNLive/2.1.5.7/assets/swfs/LivePlayer.swf -p http://www.cnn.com/video/flashLive/live.html?stream=1 | mplayer -xy 2 -"
+	alias "watch_bloomberg"="rtmpt://cp87869.live.edgefcs.net:1935/live -a live -y us_300@21006 -W http://cdn.gotraffic.net/v/20110210_153738//flash/BloombergMediaPlayer.swf -p http://www.bloomberg.com/tv/ | mplayer -xy 2 -"
+
+
+# 	pushd ()
+# 	{
+#             builtin pushd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+# 	}
+# 	
+# 	popd ()
+# 	{
+#             builtin popd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS}
+# 	}              
 	
         # Run todo initially upon login
-	devtodo ${TODO_OPTIONS}
-    fi;
+# 	devtodo ${TODO_OPTIONS}
+#     fi;
 fi