xinb
/
ohmyzsh
mirror of https://github.com/ohmyzsh/ohmyzsh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: xinb:7e85465957720fec7f7f163a08cadc0f4895223a
Branches Tags
xinb:master
...
compare: xinb:b756c2033a9890628d035b4c499de0b5a7e022f9
Branches Tags
xinb:master

7 Commits
7e85465957 ... b756c2033a

Author SHA1 Message Date
John Pocock b756c2033a
Merge ba7a5e68e6 into d82669199b 2025-01-01 20:57:51 +01:00
Kalle Ahlström d82669199b
fix(af-magic): add logic for virtualenv separator (#12875) 2024-12-30 10:15:05 +01:00
dependabot[bot] 9c8afcc3ee
chore(deps): bump charset-normalizer in /.github/workflows/dependencies (#12874) 
Bumps [charset-normalizer](https://github.com/jawah/charset_normalizer) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/jawah/charset_normalizer/releases)
- [Changelog](https://github.com/jawah/charset_normalizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jawah/charset_normalizer/compare/3.4.0...3.4.1)

---
updated-dependencies:
- dependency-name: charset-normalizer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-12-29 13:22:49 +01: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
3 changed files with 16 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
.github/workflows/dependencies/requirements.txt vendored
View File

@ -1,5 +1,5 @@
certifi==2024.12.14
charset-normalizer==3.4.0
charset-normalizer==3.4.1
idna==3.10
PyYAML==6.0.2
requests==2.32.3

2
themes/af-magic.zsh-theme
View File

@ -13,6 +13,8 @@ function afmagic_dashes {
# the prompt, account for it when returning the number of dashes
if [[ -n "$python_env" && "$PS1" = *\(${python_env}\)* ]]; then
echo $(( COLUMNS - ${#python_env} - 3 ))
elif [[ -n "$VIRTUAL_ENV_PROMPT" && "$PS1" = *${VIRTUAL_ENV_PROMPT}* ]]; then
echo $(( COLUMNS - ${#VIRTUAL_ENV_PROMPT} ))
else
echo $COLUMNS
fi

13
themes/agnoster.zsh-theme
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