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

diff --git a/bash/.bashrc b/bash/.bashrc
index 9fccbbb..d9e59b2 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,7 +24,11 @@ HISTFILESIZE=2000
 shopt -s checkwinsize
 
 # make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+if [ -x /usr/bin/lesspipe ]; then 
+  export LESSOPEN="|lesspipe %s"
+elif [ -x /usr/bin/lesspipe.sh ]; then 
+  export LESSOPEN="|lesspipe %s"
+fi
 
 # set variable identifying the chroot you work in (used in the prompt below)
 if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
@@ -53,28 +57,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,44 +81,58 @@ function __prompt_command()
   EXIT="$?"
   PS1=""
 
-  if [ $EXIT -eq 0 ]; then PS1+="\[$Green\][\!]\[$Color_Off\] "; else PS1+="\[$Red\][\!]\[$Color_Off\] "; fi
+  # check if inside git repo
+  local git_status="`git status -unormal 2>&1`"    
+  if git rev-parse --git-dir > /dev/null 2>&1; then
+    git_status=$(git status --porcelain)
+    # parse the porcelain output of git status
+    if [[ ! $git_status = *[![:space:]]* ]]; then
+      local Color_On=$GREEN
+    elif [[ $git_status =~ ^\?\? ]]; then
+      local Color_On=$CYAN
+    else
+      local Color_On=$RED
+    fi
+
+    branch=$(git symbolic-ref -q HEAD)
+    branch=${branch##refs/heads/}
+    branch=${branch:-HEAD}
+
+    # add the result to prompt
+    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")\[$Color_Off\]"; 
+    PS1+="\[$YELLOW\]("$IP")\[$RESET\]"; 
   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
-    elif [[ "$git_status" =~ nothing\ added\ to\ commit\ but\ untracked\ files\ present ]]; then
-      local Color_On=$Purple
-    else
-      local Color_On=$Red
-    fi
-
-    if [[ "$git_status" =~ On\ branch\ ([^[:space:]]+) ]]; then
-      branch=${BASH_REMATCH[1]}
-    else
-      # Detached HEAD. (branch=HEAD is a faster alternative.)
-      branch="(`git describe --all --contains --abbrev=4 HEAD 2> /dev/null || echo HEAD`)"
-    fi
-
-    # add the result to prompt
-    PS1+="\[$Color_On\][$branch]\[$Color_Off\] "
-  fi
+  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\]\n"
 
+  
   # prompt $ or # for root
   PS1+="\$ "
 }
 PROMPT_COMMAND=__prompt_command
+
+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=$(gpgconf --list-dirs agent-ssh-socket)
+fi
+
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null