diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-05-29 11:01:03 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-05-29 11:01:03 -0600 |
| commit | a3be2e4084285d7625e63bfe4b951c58143e3c9c (patch) | |
| tree | a018be4daef44a51b91477f38da514867659c7d6 /themes/af-magic.zsh-theme | |
| parent | 191e14cc7f63c4525a0f66d571416faf9e91a185 (diff) | |
| parent | 93cc3964e2d265ab0571298d69d2eed0a65d13f2 (diff) | |
| download | zsh-a3be2e4084285d7625e63bfe4b951c58143e3c9c.tar.gz zsh-a3be2e4084285d7625e63bfe4b951c58143e3c9c.tar.bz2 zsh-a3be2e4084285d7625e63bfe4b951c58143e3c9c.zip | |
Merge branch 'master' of https://github.com/ohmyzsh/ohmyzsh
Diffstat (limited to 'themes/af-magic.zsh-theme')
| -rw-r--r-- | themes/af-magic.zsh-theme | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme index 148991fec..1d2af3458 100644 --- a/themes/af-magic.zsh-theme +++ b/themes/af-magic.zsh-theme @@ -10,9 +10,14 @@ typeset +H my_orange="$FG[214]" # separator dashes size function afmagic_dashes { - [[ -n "${VIRTUAL_ENV-}" && -z "${VIRTUAL_ENV_DISABLE_PROMPT-}" && "$PS1" = \(* ]] \ - && echo $(( COLUMNS - ${#VIRTUAL_ENV} - 3 )) \ - || echo $COLUMNS + local PYTHON_ENV="$VIRTUAL_ENV" + [[ -z "$PYTHON_ENV" ]] && PYTHON_ENV="$CONDA_DEFAULT_ENV" + + if [[ -n "$PYTHON_ENV" && "$PS1" = \(* ]]; then + echo $(( COLUMNS - ${#PYTHON_ENV} - 3 )) + else + echo $COLUMNS + fi } # primary prompt |