mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-25 01:03:41 +01:00
Detect dependency plugins in candy-kingdom and kiwi themes
Fixes #5029 Fixes #5342
This commit is contained in:
parent
83aa984d1a
commit
05cae34676
@ -1,16 +1,14 @@
|
|||||||
# neuralsanwich.zsh-theme
|
if ! hg prompt 2>/dev/null; then
|
||||||
|
function hg_prompt_info { }
|
||||||
if [ "x$OH_MY_ZSH_HG" = "x" ]; then
|
else
|
||||||
OH_MY_ZSH_HG="hg"
|
function hg_prompt_info {
|
||||||
fi
|
hg prompt --angle-brackets "\
|
||||||
|
|
||||||
function hg_prompt_info {
|
|
||||||
$OH_MY_ZSH_HG prompt --angle-brackets "\
|
|
||||||
< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
|
< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
|
||||||
< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
|
< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
|
||||||
%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<
|
%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<
|
||||||
patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
|
patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
|
||||||
}
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
function box_name {
|
function box_name {
|
||||||
[ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
|
[ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
|
||||||
@ -26,5 +24,9 @@ ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[red]%}?"
|
|||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[orange]%}!"
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[orange]%}!"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
|
||||||
|
|
||||||
local return_status="%{$fg[red]%}%(?..✘)%{$reset_color%}"
|
RPROMPT='%{$fg[red]%}%(?..✘)%{$reset_color%}'
|
||||||
RPROMPT='${return_status}$(battery_time_remaining) $(battery_pct_prompt)%{$reset_color%}'
|
|
||||||
|
# Add battery status if the battery plugin is enabled
|
||||||
|
if (( $+functions[battery_pct_prompt] )); then
|
||||||
|
RPROMPT+='$(battery_time_remaining) $(battery_pct_prompt)%{$reset_color%}'
|
||||||
|
fi
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
#
|
(( $+functions[battery_pct_prompt] )) || function battery_pct_prompt { }
|
||||||
# Kiwi ZSH Theme
|
|
||||||
#
|
|
||||||
|
|
||||||
PROMPT='%{$fg_bold[green]%}┌[%{$fg_bold[cyan]%}kiwish-4.2%{$fg_bold[green]%}]-(%{$fg_bold[white]%}%2~%{$fg_bold[green]%})-$(git_prompt_info)$(svn_prompt_info)$(battery_pct_prompt)
|
PROMPT='%{$fg_bold[green]%}┌[%{$fg_bold[cyan]%}kiwish-4.2%{$fg_bold[green]%}]-(%{$fg_bold[white]%}%2~%{$fg_bold[green]%})-$(git_prompt_info)$(svn_prompt_info)$(battery_pct_prompt)
|
||||||
└> % %{$reset_color%}'
|
└> % %{$reset_color%}'
|
||||||
|
Loading…
Reference in New Issue
Block a user