summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Failliot <romain.failliot@foolstep.com>2018-02-18 19:27:50 -0500
committerMarc Cornellà <hello@mcornella.com>2021-12-13 10:50:18 +0100
commit137b45672dd182e798f7bd0c580aa9b634657990 (patch)
treebd6c0abbe68e1c0f51313d0afab26a432581b60e
parent24974a135c0bdd4c2d824e4836177ae292f8f56a (diff)
downloadzsh-137b45672dd182e798f7bd0c580aa9b634657990.tar.gz
zsh-137b45672dd182e798f7bd0c580aa9b634657990.tar.bz2
zsh-137b45672dd182e798f7bd0c580aa9b634657990.zip
feat(bira): improve theme and add support for mercurial (#6631)
Added the red dot (instead of the default `*`) if the branch is dirty. The bira theme only supported git, now it supports mercurial as well. It needed ito call `hg_prompt_info` and the `ZSH_THEME_HG_PROMPT_` variables. Closes #6631
-rw-r--r--themes/bira.zsh-theme28
1 files changed, 14 insertions, 14 deletions
diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index cdae68d6c..4a05bf3bb 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -1,32 +1,32 @@
-# ZSH Theme - Preview: https://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+local user_host="%B%(!.%F{red}.%F{green})%n@%m %{$reset_color%}"
+local user_symbol='%(!.#.$)'
+local current_dir="%B%{$fg[blue]%}%~ %{$reset_color%}"
-if [[ $UID -eq 0 ]]; then
- local user_host='%{$terminfo[bold]$fg[red]%}%n@%m %{$reset_color%}'
- local user_symbol='#'
-else
- local user_host='%{$terminfo[bold]$fg[green]%}%n@%m %{$reset_color%}'
- local user_symbol='$'
-fi
-
-local current_dir='%{$terminfo[bold]$fg[blue]%}%~ %{$reset_color%}'
-local git_branch='$(git_prompt_info)'
+local vcs_branch='$(git_prompt_info)$(hg_prompt_info)'
local rvm_ruby='$(ruby_prompt_info)'
local venv_prompt='$(virtualenv_prompt_info)'
ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
-PROMPT="╭─${user_host}${current_dir}${rvm_ruby}${git_branch}${venv_prompt}
+PROMPT="╭─${user_host}${current_dir}${rvm_ruby}${vcs_branch}${venv_prompt}
╰─%B${user_symbol}%b "
RPROMPT="%B${return_code}%b"
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$fg[yellow]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[yellow]%}"
+
+ZSH_THEME_HG_PROMPT_PREFIX="$ZSH_THEME_GIT_PROMPT_PREFIX"
+ZSH_THEME_HG_PROMPT_SUFFIX="$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ZSH_THEME_HG_PROMPT_DIRTY="$ZSH_THEME_GIT_PROMPT_DIRTY"
+ZSH_THEME_HG_PROMPT_CLEAN="$ZSH_THEME_GIT_PROMPT_CLEAN"
ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}‹"
ZSH_THEME_RUBY_PROMPT_SUFFIX="› %{$reset_color%}"
ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX="%{$fg[green]%}‹"
ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="› %{$reset_color%}"
-ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX
-ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX
+ZSH_THEME_VIRTUALENV_PREFIX="$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX"
+ZSH_THEME_VIRTUALENV_SUFFIX="$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX"