From d0275370bd8c3d21f6c7b9781814c0cee5fd7a4a Mon Sep 17 00:00:00 2001 From: Jeonguk Choi Date: Fri, 11 Feb 2022 23:40:26 +0900 Subject: [PATCH] fix(conda): eliminate overlapping while using pyenv and `virtualenv` plugin --- plugins/conda/conda.plugin.zsh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/conda/conda.plugin.zsh b/plugins/conda/conda.plugin.zsh index 4b272893a..3e6e779bb 100644 --- a/plugins/conda/conda.plugin.zsh +++ b/plugins/conda/conda.plugin.zsh @@ -1,7 +1,12 @@ function conda_prompt_info(){ - [[ -n ${CONDA_DEFAULT_ENV} ]] || return - echo "${ZSH_THEME_CONDA_PREFIX=[}${CONDA_DEFAULT_ENV:t:gs/%/%%}${ZSH_THEME_CONDA_SUFFIX=]}" + if command -v pyenv &>/dev/null && [[ $plugins == *"virtualenv"* ]]; then + return + else + [[ -n ${CONDA_DEFAULT_ENV} ]] || return + echo "${ZSH_THEME_CONDA_PREFIX=[}${CONDA_DEFAULT_ENV:t:gs/%/%%}${ZSH_THEME_CONDA_SUFFIX=]}" + fi } # disables display (${CONDA_DEFAULT_ENV}) export CONDA_CHANGEPS1=false +