From 6f203a662da1567c91134f831eb2eddaff8e52df Mon Sep 17 00:00:00 2001 From: Martin Toman Date: Wed, 26 Feb 2020 20:04:25 +0100 Subject: [PATCH] Add flag for showing VIRTUALENV name --- internal/p10k.zsh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 369beb99..70a2b4e2 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -3866,11 +3866,14 @@ instant_prompt_vi_mode() { prompt_virtualenv() { local msg='' if (( _POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION )) && _p9k_python_version; then - msg="${_p9k__ret//\%/%%} " + msg="${_p9k__ret//\%/%%}" + fi + if (( _POWERLEVEL9K_VIRTUALENV_SHOW_ENV_NAME )); then + local v=${VIRTUAL_ENV:t} + (( _POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES[(I)$v] )) && v=${VIRTUAL_ENV:h:t} + [ -z "$msg" ] || msg+=" " + msg+="$_POWERLEVEL9K_VIRTUALENV_LEFT_DELIMITER${v//\%/%%}$_POWERLEVEL9K_VIRTUALENV_RIGHT_DELIMITER" fi - local v=${VIRTUAL_ENV:t} - (( _POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES[(I)$v] )) && v=${VIRTUAL_ENV:h:t} - msg+="$_POWERLEVEL9K_VIRTUALENV_LEFT_DELIMITER${v//\%/%%}$_POWERLEVEL9K_VIRTUALENV_RIGHT_DELIMITER" _p9k_prompt_segment "$0" "blue" "$_p9k_color1" 'PYTHON_ICON' 0 '' "$msg" } @@ -6658,6 +6661,7 @@ _p9k_init_params() { # OVERWRITE mode is shown as INSERT unless POWERLEVEL9K_VI_OVERWRITE_MODE_STRING is explicitly set. _p9k_declare -e POWERLEVEL9K_VI_OVERWRITE_MODE_STRING _p9k_declare -b POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION 1 + _p9k_declare -b POWERLEVEL9K_VIRTUALENV_SHOW_ENV_NAME 1 _p9k_declare -e POWERLEVEL9K_VIRTUALENV_LEFT_DELIMITER "(" _p9k_declare -e POWERLEVEL9K_VIRTUALENV_RIGHT_DELIMITER ")" _p9k_declare -a POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES -- virtualenv venv .venv