X-Git-Url: http://git.vanrenterghem.biz/Dotty.git/blobdiff_plain/2ec571aa18cf2c098c9cd55987d41ccd79ca529d..55599c4cd8217334ad2f17b5a7a7a6d629682d13:/bash/.bashrc?ds=sidebyside diff --git a/bash/.bashrc b/bash/.bashrc index 84ee2e4..9fa83b5 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -6,7 +6,12 @@ [[ $- != *i* ]] && return alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' + +git_branch() { + git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' +} + +PS1="[\u@\h \W]\[\033[00;32m\]\$(git_branch)\[\033[00m\]\$ " unset SSH_AGENT_PID if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then @@ -16,3 +21,4 @@ fi export GPG_TTY=$(tty) gpg-connect-agent updatestartuptty /bye >/dev/null +[ -n "$DISPLAY" ] && export BROWSER=firefox || export BROWSER=w3m