Merge branch 'master' of github.com:maxf130/dotfiles

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

diff --git a/bash/.bashrc b/bash/.bashrc
index 0b54b4b9fd82dac083fbd56cda4ce409740e8296..ab339cb917876f414e0e28e714f6dbf0853d8439 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -53,22 +53,14 @@ 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)
 
@@ -79,6 +71,8 @@ function __prompt_command()
   EXIT="$?"
   PS1=""
 
+  PS1+=$PS1_PREPEND
+
   if [ $EXIT -eq 0 ]; then PS1+="\[$GREEN\][\!]\[$RESET\] "; else PS1+="\[$RED\][\!]\[$RESET\] "; fi
 
   # if logged in via ssh shows the ip of the client
@@ -100,7 +94,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
@@ -116,7 +110,19 @@ function __prompt_command()
     PS1+="\[$Color_On\][$branch]\[$RESET\] "
   fi
 
+  PS1+=$PS1_APPEND
   # 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)