Updated to use git_super_status instead of the git_prompt_info call

This commit is contained in:
Orien Vandenbergh 2024-05-20 12:33:37 -04:00
parent 274ff67f8a
commit 907d3fa377
2 changed files with 32 additions and 28 deletions

View File

@ -1,5 +1,9 @@
# qi3ber2
A dark, multiline theme for zsh
Tagged with `with_rprompt` for the version with git status information in the RPROMPT region.
Versions newer than the above tag, require the use of the OMZ `git-prompt` plugin where I'm now using their rprompt data in my primary prompt git info status
### Screenshot
![Sample Image](web/example.png)

View File

@ -46,6 +46,9 @@ function {
lr="┘"
vl="│"
ZSH_THEME_GIT_PROMPT_PREFIX=""
ZSH_THEME_GIT_PROMPT_SUFFIX=" $vl"
if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
lc="%{%F{166}%}"
uc="%{%F{33}%}"
@ -55,41 +58,38 @@ function {
nc="%{%f%}"
ec="%{%F{red}%}"
ZSH_THEME_GIT_PROMPT_PREFIX=""
ZSH_THEME_GIT_PROMPT_SUFFIX=" $lc$vl$nc"
# ZSH_THEME_GIT_PROMPT_BEHIND=" %{$fg[red]%}ᐁ"
# ZSH_THEME_GIT_PROMPT_AHEAD=" %{$fg[yellow]%}ᐃ"
# ZSH_THEME_GIT_PROMPT_DIVERGED=" %{$fg[red]%}↔"
# ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
# ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
# ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
# ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
# ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
# ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
ZSH_THEME_GIT_PROMPT_BEHIND=" %{$fg[red]%}ᐁ"
ZSH_THEME_GIT_PROMPT_AHEAD=" %{$fg[yellow]%}ᐃ"
ZSH_THEME_GIT_PROMPT_DIVERGED=" %{$fg[red]%}↔"
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
RPROMPT='$(vi_mode_prompt_info)$(git_prompt_status)%{$reset_color%}'
# RPROMPT='$(vi_mode_prompt_info)$(git_prompt_status)%{$reset_color%}'
RPROMPT='$(vi_mode_prompt_info)%{$reset_color%}'
else
ZSH_THEME_GIT_PROMPT_PREFIX=""
ZSH_THEME_GIT_PROMPT_SUFFIX=" $vl"
# ZSH_THEME_GIT_PROMPT_BEHIND=" ᐁ"
# ZSH_THEME_GIT_PROMPT_AHEAD=" ᐃ"
# ZSH_THEME_GIT_PROMPT_DIVERGED=" ↔"
# ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
# ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
# ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
# ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
# ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
# ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
ZSH_THEME_GIT_PROMPT_BEHIND=" ᐁ"
ZSH_THEME_GIT_PROMPT_AHEAD=" ᐃ"
ZSH_THEME_GIT_PROMPT_DIVERGED=" ↔"
ZSH_THEME_GIT_PROMPT_ADDED=" ✚"
ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹"
ZSH_THEME_GIT_PROMPT_DELETED=" ✖"
ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭"
RPROMPT='$(vi_mode_prompt_info)$(git_prompt_status)'
# RPROMPT='$(vi_mode_prompt_info)$(git_prompt_status)'
RPROMPT='$(vi_mode_prompt_info)'
fi
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}❖%{$fg[default]%}"
ZSH_THEME_GIT_PROMPT_CLEAN=""
# ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}❖%{$fg[default]%}"
# ZSH_THEME_GIT_PROMPT_CLEAN=""
local return_status="%(?. .$ec%3<<000%?$bc)"
PROMPT="$lc$ul$ml$nc $hc%m$nc:$bc%y$ec♥$bc"'$(load_average)'" $lc$mr$ml$nc $pc"'$(_fishy_collapsed_wd)'"$nc $lc$vl$nc "'$(git_prompt_info)''$(_qi3ber2_venv)'$'\n'"$lc$ll$ml$nc $bc%D{%m/%d %H:%M} %! ${return_status} $lc$vl$nc %(!.#.$) "
PROMPT="$lc$ul$ml$nc $hc%m$nc:$bc%y$ec♥$bc"'$(load_average)'" $lc$mr$ml$nc $pc"'$(_fishy_collapsed_wd)'"$nc $lc$vl$nc "'$(git_super_status)''$(_qi3ber2_venv)'$'\n'"$lc$ll$ml$nc $bc%D{%m/%d %H:%M} %! ${return_status} $lc$vl$nc %(!.#.$) "
PS2=$' %_${lc}>${nc} '
}