Browse Source

[#23] Rename keymap indicator zstyles

master
Sorin Ionescu 13 years ago
parent
commit
d5a94dda74
  1. 8
      modules/editor/init.zsh
  2. 6
      modules/prompt/functions/prompt_sorin_setup

8
modules/editor/init.zsh

@ -13,10 +13,10 @@ fi
# The default styles. # The default styles.
# Indicator to notify of vi insert mode. # Indicator to notify of vi insert mode.
zstyle ':omz:prompt:vi' insert '>>>' zstyle ':omz:module:editor:keymap' primary '>>>'
# Indicator to notify of vi command mode. # Indicator to notify of vi command mode.
zstyle ':omz:prompt:vi' command '<<<' zstyle ':omz:module:editor:keymap' alternate '<<<'
# Indicator to notify of generating completion. # Indicator to notify of generating completion.
zstyle ':omz:module:editor' completing '...' zstyle ':omz:module:editor' completing '...'
@ -72,9 +72,9 @@ done
# Displays the current vi mode. # Displays the current vi mode.
function zle-line-init zle-line-finish zle-keymap-select { function zle-line-init zle-line-finish zle-keymap-select {
if [[ "$KEYMAP" == 'vicmd' ]]; then if [[ "$KEYMAP" == 'vicmd' ]]; then
zstyle -s ':omz:prompt:vi' command 'vi_prompt_info' zstyle -s ':omz:module:editor:keymap' alternate 'editor_keymap_info'
else else
zstyle -s ':omz:prompt:vi' insert 'vi_prompt_info' zstyle -s ':omz:module:editor:keymap' primary 'editor_keymap_info'
fi fi
zle reset-prompt zle reset-prompt
zle -R zle -R

6
modules/prompt/functions/prompt_sorin_setup

@ -26,8 +26,8 @@ function prompt_sorin_setup {
add-zsh-hook precmd prompt_sorin_precmd add-zsh-hook precmd prompt_sorin_precmd
zstyle ':omz:module:editor' completing '%B%F{red}...%f%b' zstyle ':omz:module:editor' completing '%B%F{red}...%f%b'
zstyle ':omz:prompt:vi' insert '' zstyle ':omz:module:editor:keymap' primary ''
zstyle ':omz:prompt:vi' command ' %F{yellow}❮%f%B%F{red}❮%f%b%F{red}❮%f' zstyle ':omz:module:editor:keymap' alternate ' %F{yellow}❮%f%B%F{red}❮%f%b%F{red}❮%f'
zstyle ':omz:module:git:prompt' action ':%%B%F{yellow}%s%f%%b' zstyle ':omz:module:git:prompt' action ':%%B%F{yellow}%s%f%%b'
zstyle ':omz:module:git:prompt' added ' %%B%F{green}✚%f%%b' zstyle ':omz:module:git:prompt' added ' %%B%F{green}✚%f%%b'
zstyle ':omz:module:git:prompt' ahead ' %%B%F{yellow}⬆%f%%b' zstyle ':omz:module:git:prompt' ahead ' %%B%F{yellow}⬆%f%%b'
@ -45,7 +45,7 @@ function prompt_sorin_setup {
zstyle ':omz:module:git:prompt' rprompt '%A%B%S%a%d%m%r%U%u' zstyle ':omz:module:git:prompt' rprompt '%A%B%S%a%d%m%r%U%u'
PROMPT='%F{cyan}%1~%f${(e)git_prompt_info} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) ' PROMPT='%F{cyan}%1~%f${(e)git_prompt_info} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) '
RPROMPT='${vi_prompt_info}%(?:: %F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_rprompt_info}' RPROMPT='${editor_keymap_info}%(?:: %F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_rprompt_info}'
SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? ' SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
} }

Loading…
Cancel
Save