X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bashrc;h=dd39849bfcb7f7a6d98dcbc9def4ebbd20a6f0fd;hb=d23bda261ed2f98974d5e9b1539d24e73bdd6a7a;hp=9413671004c9a1aa828f881871507dfc42e58853;hpb=6064692c3e68554e4aa791befac2bf8b496e4aee;p=max%2Fdotfiles.git

diff --git a/bash/.bashrc b/bash/.bashrc
index 9413671..dd39849 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -64,6 +64,12 @@ 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()
 {
@@ -71,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
@@ -105,21 +97,40 @@ 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
 
-
-if [ -f "${HOME}/.gpg-agent-info" ]; then
-  . "${HOME}/.gpg-agent-info"
-  export GPG_AGENT_INFO
-  export SSH_AUTH_SOCK
+if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
+  gpg-connect-agent /bye >/dev/null 2>&1
 fi
 
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
+fi
 
-# Set GPG TTY
-export GPG_TTY=$(tty)
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null