Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-09-29 06:26:06 +02:00
Code Issues Releases Wiki Activity

fix(agnoster): respect conda changeps1 and escape env name (#14042)

Browse Source 
Co-authored-by: John Pocock <john_pocock@me.com>
This commit is contained in:
Robby Russell
2026-09-10 13:49:39 +02:00
committed by GitHub
co-authored by John Pocock
parent 9bb15d681a
commit e6561f578f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/agnoster.zsh-theme
+5 -2
View File
@@ -314,8 +314,11 @@ prompt_dir() {
# Virtualenv: current working virtualenv # Virtualenv: current working virtualenv
prompt_virtualenv() { prompt_virtualenv() {
if [ -n "$CONDA_DEFAULT_ENV" ]; then # Skip the conda segment when conda is already showing the environment itself,
prompt_segment magenta $CURRENT_FG "🐍 $CONDA_DEFAULT_ENV" # i.e. when changeps1 is left on. This mirrors how VIRTUAL_ENV_DISABLE_PROMPT
# is handled below, and stops the name appearing twice in the prompt.
if [[ -n "$CONDA_DEFAULT_ENV" && -z "$CONDA_PROMPT_MODIFIER" ]]; then
prompt_segment magenta $CURRENT_FG "🐍 ${CONDA_DEFAULT_ENV:t:gs/%/%%}"
fi fi
if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
prompt_segment "$AGNOSTER_VENV_BG" "$AGNOSTER_VENV_FG" "(${VIRTUAL_ENV:t:gs/%/%%})" prompt_segment "$AGNOSTER_VENV_BG" "$AGNOSTER_VENV_FG" "(${VIRTUAL_ENV:t:gs/%/%%})"