X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bashrc;h=a90c1772bfcd263c3f4303cc074baaab312d58b3;hb=464e1c4b109bd05a933ec3a7e55e8ba59da7d30f;hp=9fccbbb481bab06fd00174a28bdb1fc62a8157a8;hpb=d67cb7a54710bb17a2009b3fe4c69371f2f73b25;p=max%2Fdotfiles.git

diff --git a/bash/.bashrc b/bash/.bashrc
index 9fccbbb..a90c177 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -53,28 +53,23 @@ if ! shopt -oq posix; then
   fi
 fi
 
-
-# Some simple note taking functions
-n() {
-  $EDITOR ~/notes/"$*".md
-}
-
-nls() {
-  ls -cR ~/notes/ | grep "$*"
+BLACK=$(tput setaf 0)
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+YELLOW=$(tput setaf 3)
+BLUE=$(tput setaf 4)
+MAGENTA=$(tput setaf 5)
+CYAN=$(tput setaf 6)
+GRAY=$(tput setaf 7)
+BOLD=$(tput bold)
+RESET=$(tput sgr0)
+
+function __virtualenv_prompt() {
+  if [ -n "$VIRTUAL_ENV" ]; then
+    echo "(${VIRTUAL_ENV##*/}) "
+  fi
 }
 
-
-Green=$(tput setaf 64)
-Red=$(tput setaf 160)
-Yellow=$(tput setaf 136)
-Purple=$(tput setaf 61)
-BGreen=$Green$(tput bold)
-BRed=$Red$(tput bold)
-BYellow=$Yellow$(tput bold)
-BPurple=$Purple$(tput bold)
-
-Color_Off=$(tput sgr0)
-
 # set up command prompt
 function __prompt_command()
 {
@@ -82,30 +77,16 @@ function __prompt_command()
   EXIT="$?"
   PS1=""
 
-  if [ $EXIT -eq 0 ]; then PS1+="\[$Green\][\!]\[$Color_Off\] "; else PS1+="\[$Red\][\!]\[$Color_Off\] "; fi
-
-  # if logged in via ssh shows the ip of the client
-  if [ -n "$SSH_CLIENT" ]; then 
-    IP=${SSH_CLIENT%% *}
-    PS1+="\[$Yellow\]("$IP")\[$Color_Off\]"; 
-  fi
-
-  # debian chroot stuff (take it or leave it)
-  PS1+="${debian_chroot:+($debian_chroot)}"
-
-  # basic information (user@host:path)
-  PS1+="\[$BRed\]\u\[$Color_Off\]@\[$BRed\]\h\[$Color_Off\]:\[$BPurple\]\w\[$Color_Off\] "
-
   # check if inside git repo
   local git_status="`git status -unormal 2>&1`"    
   if ! [[ "$git_status" =~ Not\ a\ git\ repo ]]; then
     # parse the porcelain output of git status
     if [[ "$git_status" =~ nothing\ to\ commit ]]; then
-      local Color_On=$Green
+      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
+      local Color_On=$RED
     fi
 
     if [[ "$git_status" =~ On\ branch\ ([^[:space:]]+) ]]; then
@@ -116,10 +97,39 @@ function __prompt_command()
     fi
 
     # add the result to prompt
-    PS1+="\[$Color_On\][$branch]\[$Color_Off\] "
+    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
+fi
+
+
+# Set GPG TTY
+export GPG_TTY=$(tty)