diff options
author | Tuowen Zhao <ztuowen@gmail.com> | 2021-04-28 18:07:03 -0600 |
---|---|---|
committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-04-28 18:07:03 -0600 |
commit | b21e3c4f28d0d55947285dcebf9f91b580384b09 (patch) | |
tree | 3c4e0d946709ecb180e95610f16a8ae88179fb46 /themes/ys.zsh-theme | |
parent | b6baa00fd2d8e44b5abda20f95461942b615258c (diff) | |
parent | 63a7422d8dd5eb93c849df0ab9e679e6f333818a (diff) | |
download | zsh-b21e3c4f28d0d55947285dcebf9f91b580384b09.tar.gz zsh-b21e3c4f28d0d55947285dcebf9f91b580384b09.tar.bz2 zsh-b21e3c4f28d0d55947285dcebf9f91b580384b09.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'themes/ys.zsh-theme')
-rw-r--r-- | themes/ys.zsh-theme | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme index 89d5355dc..303c898b4 100644 --- a/themes/ys.zsh-theme +++ b/themes/ys.zsh-theme @@ -26,15 +26,26 @@ ys_hg_prompt_info() { if [ -d '.hg' ]; then echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}" echo -n $(hg branch 2>/dev/null) - if [ -n "$(hg status 2>/dev/null)" ]; then - echo -n "$YS_VCS_PROMPT_DIRTY" - else - echo -n "$YS_VCS_PROMPT_CLEAN" + if [[ "$(hg config oh-my-zsh.hide-dirty 2>/dev/null)" != "1" ]]; then + if [ -n "$(hg status 2>/dev/null)" ]; then + echo -n "$YS_VCS_PROMPT_DIRTY" + else + echo -n "$YS_VCS_PROMPT_CLEAN" + fi fi echo -n "$YS_VCS_PROMPT_SUFFIX" fi } +# Virtualenv +local venv_info='$(virtenv_prompt)' +YS_THEME_VIRTUALENV_PROMPT_PREFIX=" %{$fg[green]%}" +YS_THEME_VIRTUALENV_PROMPT_SUFFIX=" %{$reset_color%}%" +virtenv_prompt() { + [[ -n ${VIRTUAL_ENV} ]] || return + echo "${YS_THEME_VIRTUALENV_PROMPT_PREFIX}${VIRTUAL_ENV:t}${YS_THEME_VIRTUALENV_PROMPT_SUFFIX}" +} + local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})" # Prompt format: @@ -55,6 +66,7 @@ PROMPT=" %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\ ${hg_info}\ ${git_info}\ +${venv_info}\ \ %{$fg[white]%}[%*] $exit_code %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}" |