diff --git a/files/ys-simple.zsh-theme b/files/ys-simple.zsh-theme index 433ccb2..790eb6e 100644 --- a/files/ys-simple.zsh-theme +++ b/files/ys-simple.zsh-theme @@ -19,13 +19,6 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX" ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY" ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN" -# SVN info -local svn_info='$(svn_prompt_info)' -ZSH_THEME_SVN_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}svn${YS_VCS_PROMPT_PREFIX2}" -ZSH_THEME_SVN_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX" -ZSH_THEME_SVN_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY" -ZSH_THEME_SVN_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN" - # HG info local hg_info='$(ys_hg_prompt_info)' ys_hg_prompt_info() { @@ -44,17 +37,20 @@ ys_hg_prompt_info() { 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%})" +# Conda +local conda_info='$(conda_prompt_info)' +YS_THEME_CONDA_PROMPT_PREFIX=" %{$fg[yellow]%}" +YS_THEME_CONDA_PROMPT_SUFFIX=" %{$reset_color%}%" +conda_prompt_info() { + CONDA_DEFAULT_ENV_NAME="" + if [ -n "$CONDA_DEFAULT_ENV" ]; then + CONDA_DEFAULT_ENV_NAME="($CONDA_DEFAULT_ENV)" + fi + echo -n "${YS_THEME_CONDA_PROMPT_PREFIX}${CONDA_DEFAULT_ENV_NAME:t}${YS_THEME_CONDA_PROMPT_SUFFIX}" +} + # Prompt format: # # PRIVILEGES USER @ MACHINE in DIRECTORY on git:BRANCH STATE [TIME] C:LAST_EXIT_CODE @@ -87,8 +83,9 @@ PROMPT=" %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\ ${hg_info}\ ${git_info}\ -${svn_info}\ -${venv_info}\ \ -[%*] $exit_code +[%*]\ +${conda_info}\ + \ +$exit_code %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"