diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-02-12 18:07:38 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-02-12 18:07:38 -0700 |
| commit | 93a2003db7738e2255a4589ef2073df1be34fe02 (patch) | |
| tree | c2f6b378ffae6d4f433acf2a1931d1cc1f3f0574 /themes | |
| parent | 891ef3d57b6d5e38e10c0894c3d956416adc95e2 (diff) | |
| parent | a6df94d2c677c6d28c5ee339975b7a56a2f67e21 (diff) | |
| download | zsh-93a2003db7738e2255a4589ef2073df1be34fe02.tar.gz zsh-93a2003db7738e2255a4589ef2073df1be34fe02.tar.bz2 zsh-93a2003db7738e2255a4589ef2073df1be34fe02.zip | |
Merge branch 'master' of https://github.com/ohmyzsh/ohmyzsh
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/af-magic.zsh-theme | 4 | ||||
| -rw-r--r-- | themes/candy-kingdom.zsh-theme | 24 | ||||
| -rw-r--r-- | themes/kiwi.zsh-theme | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme index d185fa1ab..30e997f8c 100644 --- a/themes/af-magic.zsh-theme +++ b/themes/af-magic.zsh-theme @@ -21,9 +21,9 @@ eval my_orange='$FG[214]' # right prompt if type "virtualenv_prompt_info" > /dev/null then - RPROMPT='$FG[078]$(virtualenv_prompt_info)%{$reset_color%} $my_gray%n@%m%{$reset_color%}%' + RPROMPT="${RPROMPT}"'$FG[078]$(virtualenv_prompt_info)%{$reset_color%} $my_gray%n@%m%{$reset_color%}%' else - RPROMPT='$my_gray%n@%m%{$reset_color%}%' + RPROMPT="${RPROMPT}"'$my_gray%n@%m%{$reset_color%}%' fi # git settings diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme index 30ce785c0..ad03cc320 100644 --- a/themes/candy-kingdom.zsh-theme +++ b/themes/candy-kingdom.zsh-theme @@ -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 diff --git a/themes/kiwi.zsh-theme b/themes/kiwi.zsh-theme index f93de2b75..94f0ffcbf 100644 --- a/themes/kiwi.zsh-theme +++ b/themes/kiwi.zsh-theme @@ -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%}' |