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:2fbf2e9afa3c831e607af139833d05597e95c70a
Branches Tags
xinb:master
...
compare: xinb:1254ef659a0358e9b2c242b101a08659c4411ca8
Branches Tags
xinb:master

6 Commits
2fbf2e9afa ... 1254ef659a

Author SHA1 Message Date
John Pocock 1254ef659a
Merge ba7a5e68e6 into 7a3695aadf 2025-01-13 09:19:29 +01:00
Michele Bologna 7a3695aadf
fix(grc): add linuxbrew path (#12903) 2025-01-12 14:25:00 +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
2 changed files with 14 additions and 0 deletions
Show Stats Expand all files Collapse all files

1
plugins/grc/grc.plugin.zsh
View File

@ -5,6 +5,7 @@ files=(
/etc/grc.zsh # default
/usr/local/etc/grc.zsh # homebrew darwin-x64
/opt/homebrew/etc/grc.zsh # homebrew darwin-arm64
/home/linuxbrew/.linuxbrew/etc/grc.zsh # linuxbrew
/usr/share/grc/grc.zsh # Gentoo Linux (app-misc/grc)
)

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