Improvements

[max/saltfiles.git] / states / zsh / files / zshrc

diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 77dec342c97500439993cd3b700629962bed507b..ca4c33c013f7411f3d5f033b0fd047efcbc4eeb1 100644 (file)
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -23,7 +23,7 @@ compinit
 HISTFILE=~/.histfile
 HISTSIZE=100000
 SAVEHIST=100000
-setopt appendhistory autocd extendedglob nomatch
+setopt appendhistory autocd extendedglob nomatch extendedhistory
 unsetopt beep notify
 bindkey -v
 # End of lines configured by zsh-newuser-install
@@ -32,30 +32,60 @@ bindkey -v
 NEWLINE=$'\n'
 setopt prompt_subst
 
+
 p="%(?;%F{green};%F{red})[%h]%f "
 p+="%F{red}%B%n%b%f@%F{red}%B%m%b%f"
 p+=":%F{blue}%~%f"
 p+="${NEWLINE}%(!.#.$) "
 
+virtual_env() {
+       if [ -n "${VIRTUAL_ENV+1}" ]; then
+               home_rel_path=$(echo ${VIRTUAL_ENV} | sed "s;^${HOME};~;")
+               echo -n "(${home_rel_path}) "
+       fi
+}
+
 source ~/.git-prompt.sh
 precmd () {
-       __git_ps1 "" "${p}" "${NEWLINE}[%s]${NEWLINE}"
+       __git_ps1 "" "$(virtual_env)${p}" "${NEWLINE}[%s]${NEWLINE}"
 }
 
-if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
-  gpg-connect-agent /bye >/dev/null 2>&1
-fi
-
-unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-fi
-
-
-gpg-connect-agent updatestartuptty /bye > /dev/null
-
 bindkey '^R' history-incremental-search-backward
 
 if [[ -f ~/.shell_aliases ]]; then
        source ~/.shell_aliases
 fi
+
+export WORKON_HOME=~/.virtualenvs
+source /usr/bin/virtualenvwrapper_lazy.sh
+
+chpwd() {
+    src_dir="$(readlink -f ~/src/)/"
+    if [[ $PWD == "$src_dir"* ]]; then
+        if git status &>/dev/null; then
+            venv_name=$(basename $(git rev-parse --show-toplevel))
+            if [[ -n "$VIRTUAL_ENV" ]]; then
+                current_venv_name=$(basename "$VIRTUAL_ENV")
+                if [[ "$current_venv_name" != "$venv_name" ]]; then
+                    deactivate
+                    workon "$venv_name"
+                fi
+            else
+                if workon | grep -q "$venv_name"; then
+                    workon "$venv_name"
+                fi
+            fi
+        else
+            if [[ -n "$VIRTUAL_ENV" ]]; then
+                deactivate
+            fi
+        fi
+    else
+        if [[ -n "$VIRTUAL_ENV" ]]; then
+            deactivate
+        fi
+    fi
+}
+
+export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null