update merge r115:HEAD changes

[home-base.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index a9fee9e1c1a38d50c7d6255d5bb79305217e6853..c2d1b0919936d91f5fdbc9cfc081b2641be3cc76 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -7,19 +7,30 @@ if [ "$PS1" ]; then
 
     # don't put duplicate lines in the history. See bash(1) for more options
     export HISTCONTROL=ignoredups
-    export EDITOR="/usr/bin/jed"
-    
+    if [ -x ~/bin/sane_editor ]; then
+       EDITOR=~/bin/sane_editor;
+    elif [ -x /usr/bin/jed ]; then
+       EDITOR="/usr/bin/jed";
+    elif [ -x /usr/bin/vi ]; then
+       EDITOR="/usr/bin/vi";
+    fi;
+
+    if [ -n "$EDITOR" ]; then
+       export EDITOR;
+    fi;
     # bts debian options
+
     export DEBEMAIL="don@debian.org"
 
     # enable color support of ls and also add handy aliases
     eval `dircolors -b`
     alias ls='ls --color=auto'
     alias gr='gimp-remote-2.2'
-    alias emc='gnuclient'
+    alias emc='sane_editor'
 
     # set a fancy prompt
-    PS1='\u@\h:\w\$ '
+    PS1="\[\033[0;36m\]\h \t \w$\[\033[0m\] "
+    # \[\033[1;36m\][\w]\n\[\033[0;36m\][\h|\t]$ \[\033[0m\]
 
     # If this is an xterm set the title to user@host:dir
     #case $TERM in
@@ -32,13 +43,21 @@ if [ "$PS1" ]; then
 
     # enable programmable completion features (you don't need to enable
     # this, if it's already enabled in /etc/bash.bashrc).
-    #if [ -f /etc/bash_completion ]; then
-    #  . /etc/bash_completion
-    #fi
+    if [ -f /etc/bash_completion ]; then
+      . /etc/bash_completion;
+    fi;
     
     alias aumix2='aumix -d /dev/mixer1 -I'
     export LANG="en_US.UTF-8"
     export PATH="~/bin:$PATH"
+    if [ ! -e ~/tmp ]; then
+       mkdir ~/tmp;
+    fi;
+    export TMPDIR="$(echo ~/tmp)";
+
+    for a in tda tdd tde; do
+       alias "s${a}"="STODO_NO_COMMIT=1 $a"
+    done;
 
     TODO_OPTIONS="--timeout --summary"