1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-10-16 11:40:46 +00:00

Compare commits

...

6 commits

Author SHA1 Message Date
John Pocock
2d1a53150d
Merge ba7a5e68e6 into f11cc8fea1 2024-09-23 09:13:08 +02:00
dependabot[bot]
f11cc8fea1
chore(deps): bump idna in /.github/workflows/dependencies (#12688)
Bumps [idna](https://github.com/kjd/idna) from 3.9 to 3.10.
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](https://github.com/kjd/idna/compare/v3.9...v3.10)

---
updated-dependencies:
- dependency-name: idna
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-22 16:20:33 +02:00
John Pocock
ba7a5e68e6
Update themes/agnoster.zsh-theme
Use basename when setting prompt segment text for the conda environment to avoid overly long promps when using an environment created outside the default location.

Co-Authored-By: Avraham Shukron <avraham.shukron@gmail.com>
2020-03-22 10:47:29 +00:00
John Pocock
a6465f839f
Update themes/agnoster.zsh-theme
Change conda prompt format to "conda:$conda_env"

Co-Authored-By: Avraham Shukron <avrahamshukron@users.noreply.github.com>
2020-03-05 20:41:43 +00:00
John Pocock
2422635513
Update themes/agnoster.zsh-theme
Change conda execution to env variable to improve performance.

Co-Authored-By: Avraham Shukron <avrahamshukron@users.noreply.github.com>
2020-03-05 20:39:13 +00:00
John Pocock
e501f8aace Added current working anaconda env to agnoster prompt 2018-08-17 00:54:59 +01:00
2 changed files with 14 additions and 1 deletions

View file

@ -1,6 +1,6 @@
certifi==2024.8.30
charset-normalizer==3.3.2
idna==3.9
idna==3.10
PyYAML==6.0.2
requests==2.32.3
semver==3.0.2

View file

@ -227,6 +227,18 @@ prompt_virtualenv() {
fi
}
# Anaconda: current working conda env
# To replace the conda modification of PS1 do `conda config --set changeps1 False`
# or add 'changeps1: False' to your .condarc file.
prompt_conda() {
local conda_env="$CONDA_DEFAULT_ENV"
if [[ -n $conda_env ]]; then
if [[ -z $CONDA_PROMPT_MODIFIER ]]; then
prompt_segment blue black "conda:$(basename $conda_env)"
fi
fi
}
# Status:
# - was there an error
# - am I root
@ -258,6 +270,7 @@ prompt_aws() {
build_prompt() {
RETVAL=$?
prompt_status
prompt_conda
prompt_virtualenv
prompt_aws
prompt_context