mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-12 05:49:47 +08:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:67581c53c6458566e174620361e84b364b9034d2
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0
...
compare: mirrors:5d2d35cd1741af19553007fe0cc5324744fc58fa
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0

2 Commits
67581c53c6 ... 5d2d35cd17

Author SHA1 Message Date
Carlo Sala
5d2d35cd17
fix(poetry-env): do not deactivate in a subdir 
Closes #12377
 2024-04-23 16:21:21 +02:00
John Matczak
ee69c14beb
feat(fishy): add color to username (#12369) 2024-04-23 10:54:00 +02:00
2 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
plugins/poetry-env/poetry-env.plugin.zsh
View File

@ -6,7 +6,7 @@ _togglePoetryShell() {
fi fi
# Deactivate the current environment if moving out of a Poetry directory or into a different Poetry directory # Deactivate the current environment if moving out of a Poetry directory or into a different Poetry directory
if [[ $poetry_active -eq 1 ]] && { [[ $in_poetry_dir -eq 0 ]] || [[ "$PWD" != "$poetry_dir"* ]]; }; then if [[ $poetry_active -eq 1 ]] && { [[ $in_poetry_dir -eq 0 ]] && [[ "$PWD" != "$poetry_dir"* ]]; }; then
export poetry_active=0 export poetry_active=0
unset poetry_dir unset poetry_dir
deactivate deactivate

3
themes/fishy.zsh-theme
View File

@ -16,7 +16,8 @@ _fishy_collapsed_wd() {
} }
local user_color='green'; [ $UID -eq 0 ] && user_color='red' local user_color='green'; [ $UID -eq 0 ] && user_color='red'
PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) ' local host_color='white'; [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] && host_color='yellow'
PROMPT='%{$fg[$user_color]%}%n%{$reset_color%}@%{$fg[$host_color]%}%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) '
PROMPT2='%{$fg[red]%}\ %{$reset_color%}' PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}" local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"