X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bashrc;h=52753fa0c1b42ae34a981c5474b8905051ab8c63;hb=d84c32d37bb387654784300bccdfa3a4a85fded4;hp=3bf2436ee46d77555c31ebec35e180fc0e19c76c;hpb=7751a23cc0426f2e80ed6a7b1b81efd3a8288f8e;p=max%2Fdotfiles.git

diff --git a/bash/.bashrc b/bash/.bashrc
index 3bf2436..52753fa 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -2,12 +2,6 @@
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
 # for examples
 
-# If not running interactively, don't do anything
-case $- in
-  *i*) ;;
-  *) return;;
-esac
-
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
 HISTCONTROL=ignoreboth
@@ -17,30 +11,16 @@ shopt -s histappend
 
 # for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
 HISTSIZE=1000
-HISTFILESIZE=2000
+HISTFILESIZE=20000
 
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-  debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-
-# colored GCC warnings and errors
-export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-
 if [ -f ~/.bash_aliases ]; then
   . ~/.bash_aliases
 fi
 
-eval `dircolors ~/.dir_colors`
 
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
@@ -79,22 +59,20 @@ function __prompt_command()
 
   # check if inside git repo
   local git_status="`git status -unormal 2>&1`"    
-  if ! [[ "$git_status" =~ Not\ a\ git\ repo ]]; then
+  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" =~ nothing\ to\ commit ]]; then
+    if [[ ! $git_status = *[![:space:]]* ]]; then
       local Color_On=$GREEN
-    elif [[ "$git_status" =~ nothing\ added\ to\ commit\ but\ untracked\ files\ present ]]; then
+    elif [[ $git_status =~ ^\?\? ]]; then
       local Color_On=$CYAN
     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
+    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"
@@ -115,7 +93,7 @@ function __prompt_command()
   PS1+="${debian_chroot:+($debian_chroot)}"
 
   # basic information (user@host:path)
-  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\] "
+  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\]\n"
 
   
   # prompt $ or # for root
@@ -123,6 +101,18 @@ function __prompt_command()
 }
 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
 
-GPG_TTY=$(tty)
-export GPG_TTY
+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
+
+export EDITOR="vim"
+export TMPDIR="/tmp/${USER}"
+eval `dircolors ~/.dir_colors`