simplify configs

- use POWERLEVEL9K_ICON_PADDING instead of
  POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION to customize padding after
  icons
- remove reliance on UTF-8 locale when the config is being sourced
This commit is contained in:
romkatv 2020-03-13 10:34:50 +01:00
commit e4e165f6d7
8 changed files with 41 additions and 238 deletions

View file

@ -7497,7 +7497,7 @@ _p9k_must_init() {
[[ $sig == $_p9k__param_sig ]] && return 1
_p9k_deinit
fi
_p9k__param_pat=$'v73\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1'
_p9k__param_pat=$'v74\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1'
_p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1'
_p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1'
_p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays\1'

View file

@ -1776,13 +1776,8 @@ function generate_config() {
else
sub MODE $POWERLEVEL9K_MODE
if (( cap_narrow_icons )); then
sub VISUAL_IDENTIFIER_EXPANSION "'\${P9K_VISUAL_IDENTIFIER// }'"
if [[ $style == lean_8colors ]]; then
sub OS_ICON_CONTENT_EXPANSION "'\${P9K_CONTENT// }'"
else
sub OS_ICON_CONTENT_EXPANSION "'%B\${P9K_CONTENT// }'"
fi
if (( ! cap_narrow_icons )); then
sub ICON_PADDING moderate
fi
if [[ $POWERLEVEL9K_MODE == compatible ]]; then