Merge branch 'master' of git.friedersdorff.com:max/dotfiles

[max/dotfiles.git] / bash / .bashrc

diff --git a/bash/.bashrc b/bash/.bashrc
index 0b54b4b9fd82dac083fbd56cda4ce409740e8296..3bf2436ee46d77555c31ebec35e180fc0e19c76c 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -53,25 +53,23 @@ if ! shopt -oq posix; then
   fi
 fi
 
-BASE03=$(tput setaf 8)
-BASE02=$(tput setaf 0)
-BASE01=$(tput setaf 10)
-BASE00=$(tput setaf 11)
-BASE0=$(tput setaf 12)
-BASE1=$(tput setaf 14)
-BASE2=$(tput setaf 7)
-BASE3=$(tput setaf 15)
-YELLOW=$(tput setaf 3)
-ORANGE=$(tput setaf 9)
+BLACK=$(tput setaf 0)
 RED=$(tput setaf 1)
-MAGENTA=$(tput setaf 5)
-VIOLET=$(tput setaf 13)
+GREEN=$(tput setaf 2)
+YELLOW=$(tput setaf 3)
 BLUE=$(tput setaf 4)
+MAGENTA=$(tput setaf 5)
 CYAN=$(tput setaf 6)
-GREEN=$(tput setaf 2)
+GRAY=$(tput setaf 7)
 BOLD=$(tput bold)
 RESET=$(tput sgr0)
 
+function __virtualenv_prompt() {
+  if [ -n "$VIRTUAL_ENV" ]; then
+    echo "(${VIRTUAL_ENV##*/}) "
+  fi
+}
+
 # set up command prompt
 function __prompt_command()
 {
@@ -79,20 +77,6 @@ function __prompt_command()
   EXIT="$?"
   PS1=""
 
-  if [ $EXIT -eq 0 ]; then PS1+="\[$GREEN\][\!]\[$RESET\] "; else PS1+="\[$RED\][\!]\[$RESET\] "; fi
-
-  # if logged in via ssh shows the ip of the client
-  if [ -n "$SSH_CLIENT" ]; then 
-    IP=${SSH_CLIENT%% *}
-    PS1+="\[$YELLOW\]("$IP")\[$RESET\]"; 
-  fi
-
-  # debian chroot stuff (take it or leave it)
-  PS1+="${debian_chroot:+($debian_chroot)}"
-
-  # basic information (user@host:path)
-  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\] "
-
   # check if inside git repo
   local git_status="`git status -unormal 2>&1`"    
   if ! [[ "$git_status" =~ Not\ a\ git\ repo ]]; then
@@ -100,7 +84,7 @@ function __prompt_command()
     if [[ "$git_status" =~ nothing\ to\ commit ]]; then
       local Color_On=$GREEN
     elif [[ "$git_status" =~ nothing\ added\ to\ commit\ but\ untracked\ files\ present ]]; then
-      local Color_On=$PURPLE
+      local Color_On=$CYAN
     else
       local Color_On=$RED
     fi
@@ -113,10 +97,32 @@ function __prompt_command()
     fi
 
     # add the result to prompt
-    PS1+="\[$Color_On\][$branch]\[$RESET\] "
+    PS1+="\n\[$Color_On\][$branch]\[$RESET\]\n"
+  fi
+
+
+  PS1+="$(__virtualenv_prompt)"
+
+  if [ $EXIT -eq 0 ]; then PS1+="\[$GREEN\][\!]\[$RESET\] "; else PS1+="\[$RED\][\!]\[$RESET\] "; fi
+
+  # if logged in via ssh shows the ip of the client
+  if [ -n "$SSH_CLIENT" ]; then 
+    IP=${SSH_CLIENT%% *}
+    PS1+="\[$YELLOW\]("$IP")\[$RESET\]"; 
   fi
 
+  # debian chroot stuff (take it or leave it)
+  PS1+="${debian_chroot:+($debian_chroot)}"
+
+  # basic information (user@host:path)
+  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\] "
+
+  
   # prompt $ or # for root
   PS1+="\$ "
 }
 PROMPT_COMMAND=__prompt_command
+
+
+GPG_TTY=$(tty)
+export GPG_TTY