linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-12 21:39:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Detect dependency plugins in candy-kingdom and kiwi themes

Browse source 
Fixes #5029
Fixes #5342
This commit is contained in:
Marc Cornellà 2020-02-11 17:43:59 +01:00
parent 83aa984d1a
commit 05cae34676
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
themes/candy-kingdom.zsh-theme
View file

@ -1,16 +1,14 @@
# neuralsanwich.zsh-theme
if [ "x$OH_MY_ZSH_HG" = "x" ]; then
OH_MY_ZSH_HG="hg"
fi
function hg_prompt_info {
$OH_MY_ZSH_HG prompt --angle-brackets "\
if ! hg prompt 2>/dev/null; then
function hg_prompt_info { }
else
function hg_prompt_info {
hg prompt --angle-brackets "\
< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$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
}
}
fi
function box_name {
[ -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_SUFFIX="%{$reset_color%})"
local return_status="%{$fg[red]%}%(?..✘)%{$reset_color%}"
RPROMPT='${return_status}$(battery_time_remaining) $(battery_pct_prompt)%{$reset_color%}'
RPROMPT='%{$fg[red]%}%(?..✘)%{$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

4
themes/kiwi.zsh-theme
View file

@ -1,6 +1,4 @@
#
# Kiwi ZSH Theme
#
(( $+functions[battery_pct_prompt] )) || function 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%}'