X-Git-Url: http://git.vanrenterghem.biz/Dotty.git/blobdiff_plain/84c5cbe4f23ccc9c9c1a376972a8cd5479c01b54..74717433c7e0d47c24f1ecf738599c32c9176f92:/bash/.bashrc

diff --git a/bash/.bashrc b/bash/.bashrc
index 84ee2e4..5a379c7 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,32 @@ fi
 export GPG_TTY=$(tty)
 gpg-connect-agent updatestartuptty /bye >/dev/null
 
+[ -n "$DISPLAY" ] && export BROWSER=firefox || export BROWSER=w3m
+
+source /etc/profile.d/nix-daemon.sh
+export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive
+
+# Initialise pyenv
+export PYENV_ROOT="$HOME/.pyenv"
+[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+
+# Append "$1" to $PATH when not already in.
+append_path () {
+    case ":$PATH:" in
+        *:"$1":*)
+            ;;
+        *)
+            PATH="${PATH:+$PATH:}$1"
+    esac
+}
+
+# Append our default paths
+append_path '/home/frederik/scripts'
+
+# Emacs eat shell integration
+[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && \
+  source "$EAT_SHELL_INTEGRATION_DIR/bash"
+
+
+