X-Git-Url: https://git.donarmstrong.com/?p=home-base.git;a=blobdiff_plain;f=.bashrc;h=37b7c82c08b43c2860d7594bbee44c2e4b4e39cf;hp=06c0ab08c5248526ce70cc4b692b2ef1956eb1c5;hb=85b635da531bd318eb9e07f2d5122991b036d9f5;hpb=1b8be5ead498e5e443431b46a3fb67b423f30b33

diff --git a/.bashrc b/.bashrc
index 06c0ab0..37b7c82 100644
--- a/.bashrc
+++ b/.bashrc
@@ -25,18 +25,15 @@ if [ "$PS1" ]; then
     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`
     alias ls='ls --color=auto'
-    alias gr='gimp-remote'
-    alias emc='sane_editor'
-
-    alias svn-b="svn-buildpackage --svn-builder 'pdebuild --buildresult ..' --svn-ignore-new"
 
-    # set a fancy prompt
-    #printf '\33]2;%s\007'
-    
     # See if we're in a chroot
     if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
 	debian_chroot=$(cat /etc/debian_chroot)
@@ -46,6 +43,9 @@ 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)
     
+    # 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})/) {
@@ -103,7 +103,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)" ] && \
@@ -130,41 +131,21 @@ if [ "$PS1" ]; then
     if [ "$(hostname)" == "liszt" ] && [ -d /var/list/.bin ]; then
 	PATH="/var/list/.bin:$PATH"
     fi;
-    export PATH="~/bin:$PATH"
+    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"
-
 	cd ()
 	{
 	    # use pushd instead of cd
 	    if [ -z "$1" ] || [ "$1" == "-" ]; then
-		builtin cd "$@" && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+		builtin cd "$@"; # && [ -r .todo ] && devtodo ${TODO_OPTIONS};
 	    else
-		builtin pushd "$@" >/dev/null && [ -r .todo ] && devtodo ${TODO_OPTIONS};
+		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}
-	}              
-	
-        # Run todo initially upon login
-	devtodo ${TODO_OPTIONS}
-    fi;
 fi