X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bashrc;h=9413671004c9a1aa828f881871507dfc42e58853;hb=f44c6b83383cd22f50fddadca3a4b0effaa12ed0;hp=0b54b4b9fd82dac083fbd56cda4ce409740e8296;hpb=5375af6b6fef42d55b9198ea97d49bbad5df848a;p=max%2Fdotfiles.git diff --git a/bash/.bashrc b/bash/.bashrc index 0b54b4b..9413671 100644 --- 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) @@ -100,7 +92,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 @@ -120,3 +112,14 @@ function __prompt_command() 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)