zsh: cleanup color formatting

This might be problematic for older zsh version which do not support
%F{..} nor %f.
This commit is contained in:
Thomas Preisner 2017-05-03 19:21:50 +02:00
parent 65d6fbad18
commit e09da88655
2 changed files with 17 additions and 29 deletions

View file

@ -1,17 +1,5 @@
autoload colors; colors autoload colors; colors
# The variables are wrapped in \%\{\%\}. This should be the case for every
# variable that does not contain space.
for COLOR in RED GREEN YELLOW BLUE MAGENTA CYAN BLACK WHITE; do
eval PR_$COLOR='%{$fg_no_bold[${(L)COLOR}]%}'
eval PR_BOLD_$COLOR='%{$fg_bold[${(L)COLOR}]%}'
done
eval RESET='$reset_color'
export PR_RED PR_GREEN PR_YELLOW PR_BLUE PR_WHITE PR_BLACK
export PR_BOLD_RED PR_BOLD_GREEN PR_BOLD_YELLOW PR_BOLD_BLUE
export PR_BOLD_WHITE PR_BOLD_BLACK
# Clear LSCOLORS # Clear LSCOLORS
unset LSCOLORS unset LSCOLORS

View file

@ -45,26 +45,26 @@ function setprompt {
### ###
# Finally, the prompt. # Finally, the prompt.
PROMPT='$PR_CYAN$PR_ULCORNER$PR_BLUE$PR_HBAR(\ PROMPT='%F{cyan}$PR_ULCORNER%F{blue}$PR_HBAR(\
$PR_MAGENTA%$PR_PWDLEN<...<%~%<<$\ %F{magenta}%$PR_PWDLEN<...<%~%<<\
PR_BLUE)$PR_HBAR$PR_CYAN$PR_HBAR${(e)PR_FILLBAR}$PR_BLUE$PR_HBAR(\ %F{blue})$PR_HBAR%F{cyan}$PR_HBAR${(e)PR_FILLBAR}%F{blue}$PR_HBAR(\
$PR_GREEN%n@%m$PR_BLUE\ %F{green}%n@%m%F{blue}\
$PR_BLUE)$PR_HBAR$PR_CYAN$PR_URCORNER\ %F{blue})$PR_HBAR%F{cyan}$PR_URCORNER\
$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\ %F{cyan}$PR_LLCORNER%F{blue}$PR_HBAR(\
$PR_YELLOW%D{%H:%M}\ %F{yellow}%D{%H:%M}\
$PR_BLUE)$PR_HBAR$PR_CYAN$PR_HBAR\ %F{blue})$PR_HBAR%F{cyan}$PR_HBAR\
$PR_RESET ' %f '
RPROMPT='$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR(\ RPROMPT='%F{cyan}$PR_HBAR%F{blue}$PR_HBAR(\
$PR_YELLOW$(show_battery)\ %F{yellow}$(show_battery)\
$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER\ %F{blue})$PR_HBAR%F{cyan}$PR_LRCORNER\
$PR_RESET' %f'
PS2='$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR(\ PS2='%F{cyan}$PR_HBAR%F{blue}$PR_HBAR(\
$PR_LIGHT_GREEN%_ %F{green}%_
$PR_BLUE)$PR_HBAR$PR_CYAN$PR_HBAR\ %F{blue})$PR_HBAR%F{cyan}$PR_HBAR\
$PR_RESET ' %f '
} }
setprompt setprompt