X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fzsh%2Ffiles%2Fzshrc;h=f02b7e36e59b5ccb84bd3769ec8ee20dac2d75da;hb=b0880cf00031847d725e33bf83a32d2652b96a0e;hp=69025a9350115d5a17456dde89e034b51829dd42;hpb=7f26a285e5a8de597e31771e661bfe48cd6576f2;p=max%2Fsaltfiles.git

diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 69025a9..f02b7e3 100644
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -8,7 +8,7 @@ zstyle ':completion:*' ignore-parents parent pwd
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
 zstyle ':completion:*' list-suffixes true
-zstyle ':completion:*' max-errors 2
+zstyle ':completion:*' max-errors 1
 zstyle ':completion:*' menu select=1
 zstyle ':completion:*' preserve-prefix '//[^/]##/'
 zstyle ':completion:*' prompt 'Corrections with %e differences:'
@@ -21,8 +21,8 @@ compinit
 # End of lines added by compinstall
 # Lines configured by zsh-newuser-install
 HISTFILE=~/.histfile
-HISTSIZE=20000
-SAVEHIST=20000
+HISTSIZE=100000
+SAVEHIST=100000
 setopt appendhistory autocd extendedglob nomatch
 unsetopt beep notify
 bindkey -v
@@ -32,16 +32,25 @@ 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
@@ -55,3 +64,7 @@ fi
 gpg-connect-agent updatestartuptty /bye > /dev/null
 
 bindkey '^R' history-incremental-search-backward
+
+if [[ -f ~/.shell_aliases ]]; then
+	source ~/.shell_aliases
+fi