X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fzsh%2Ffiles%2Fzshrc;h=f02b7e36e59b5ccb84bd3769ec8ee20dac2d75da;hb=675a42561b814004255e1198f3f82783237eb4d8;hp=04852cedeccc0cc0da2949ba6d1c4fe9f903bbd8;hpb=735c5d5e3a1aab82d77d9461157ecff74dde67a0;p=max%2Fsaltfiles.git diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc index 04852ce..f02b7e3 100644 --- a/states/zsh/files/zshrc +++ b/states/zsh/files/zshrc @@ -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