add neon support

pull/2553/head
Andrea 11 months ago
parent 307bce24d1
commit 6f4520cc13

@ -75,6 +75,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON '\uE271'$s #  LINUX_ENDEAVOUROS_ICON '\uE271'$s # 
LINUX_ROCKY_ICON '\uE271'$s #  LINUX_ROCKY_ICON '\uE271'$s # 
LINUX_GUIX_ICON '\uE271'$s #  LINUX_GUIX_ICON '\uE271'$s # 
LINUX_NEON_ICON '\uE271'$s # 
SUNOS_ICON '\U1F31E'$q # 🌞 SUNOS_ICON '\U1F31E'$q # 🌞
HOME_ICON '\uE12C'$s #  HOME_ICON '\uE12C'$s # 
HOME_SUB_ICON '\uE18D'$s #  HOME_SUB_ICON '\uE18D'$s # 
@ -231,6 +232,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON '\uF17C'$s #  LINUX_ENDEAVOUROS_ICON '\uF17C'$s # 
LINUX_ROCKY_ICON '\uF17C'$s #  LINUX_ROCKY_ICON '\uF17C'$s # 
LINUX_GUIX_ICON '\uF17C'$s #  LINUX_GUIX_ICON '\uF17C'$s # 
LINUX_NEON_ICON '\uF17C'$s # 
SUNOS_ICON '\uF185 ' #  SUNOS_ICON '\uF185 ' # 
HOME_ICON '\uF015'$s #  HOME_ICON '\uF015'$s # 
HOME_SUB_ICON '\uF07C'$s #  HOME_SUB_ICON '\uF07C'$s # 
@ -388,6 +390,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}" LINUX_ENDEAVOUROS_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
LINUX_ROCKY_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}" LINUX_ROCKY_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
LINUX_GUIX_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}" LINUX_GUIX_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
LINUX_NEON_ICON "${CODEPOINT_OF_AWESOME_LINUX:+\\u$CODEPOINT_OF_AWESOME_LINUX$s}"
SUNOS_ICON "${CODEPOINT_OF_AWESOME_SUN_O:+\\u$CODEPOINT_OF_AWESOME_SUN_O }" SUNOS_ICON "${CODEPOINT_OF_AWESOME_SUN_O:+\\u$CODEPOINT_OF_AWESOME_SUN_O }"
HOME_ICON "${CODEPOINT_OF_AWESOME_HOME:+\\u$CODEPOINT_OF_AWESOME_HOME$s}" HOME_ICON "${CODEPOINT_OF_AWESOME_HOME:+\\u$CODEPOINT_OF_AWESOME_HOME$s}"
HOME_SUB_ICON "${CODEPOINT_OF_AWESOME_FOLDER_OPEN:+\\u$CODEPOINT_OF_AWESOME_FOLDER_OPEN$s}" HOME_SUB_ICON "${CODEPOINT_OF_AWESOME_FOLDER_OPEN:+\\u$CODEPOINT_OF_AWESOME_FOLDER_OPEN$s}"
@ -538,6 +541,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON '\UF322'$s #  LINUX_ENDEAVOUROS_ICON '\UF322'$s # 
LINUX_ROCKY_ICON '\UF32B'$s #  LINUX_ROCKY_ICON '\UF32B'$s # 
LINUX_GUIX_ICON '\UF325'$s #  LINUX_GUIX_ICON '\UF325'$s # 
LINUX_NEON_ICON '\UF331'$s # 
LINUX_ICON '\uF17C' #  LINUX_ICON '\uF17C' # 
SUNOS_ICON '\uF185 ' #  SUNOS_ICON '\uF185 ' # 
HOME_ICON '\uF015'$s #  HOME_ICON '\uF015'$s # 
@ -696,6 +700,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON '\uF17C' #  LINUX_ENDEAVOUROS_ICON '\uF17C' # 
LINUX_ROCKY_ICON '\uF17C' #  LINUX_ROCKY_ICON '\uF17C' # 
LINUX_GUIX_ICON '\uF325'$s #  LINUX_GUIX_ICON '\uF325'$s # 
LINUX_NEON_ICON '\UF331'$s # 
LINUX_ICON '\uF17C' #  LINUX_ICON '\uF17C' # 
SUNOS_ICON '\uF185 ' #  SUNOS_ICON '\uF185 ' # 
HOME_ICON '\uF015'$s #  HOME_ICON '\uF015'$s # 
@ -847,6 +852,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON 'edvos' LINUX_ENDEAVOUROS_ICON 'edvos'
LINUX_ROCKY_ICON 'rocky' LINUX_ROCKY_ICON 'rocky'
LINUX_GUIX_ICON 'guix' LINUX_GUIX_ICON 'guix'
LINUX_NEON_ICON 'neon'
SUNOS_ICON 'sunos' SUNOS_ICON 'sunos'
HOME_ICON '' HOME_ICON ''
HOME_SUB_ICON '' HOME_SUB_ICON ''
@ -999,6 +1005,7 @@ function _p9k_init_icons() {
LINUX_ENDEAVOUROS_ICON 'Edv' LINUX_ENDEAVOUROS_ICON 'Edv'
LINUX_ROCKY_ICON 'Roc' LINUX_ROCKY_ICON 'Roc'
LINUX_GUIX_ICON 'Guix' LINUX_GUIX_ICON 'Guix'
LINUX_NEON_ICON 'Neon'
SUNOS_ICON 'Sun' SUNOS_ICON 'Sun'
HOME_ICON '' HOME_ICON ''
HOME_SUB_ICON '' HOME_SUB_ICON ''

@ -4254,36 +4254,6 @@ function instant_prompt_chezmoi_shell() {
_p9k_prompt_segment prompt_chezmoi_shell blue $_p9k_color1 CHEZMOI_ICON 1 '$CHEZMOI_ICON' '' _p9k_prompt_segment prompt_chezmoi_shell blue $_p9k_color1 CHEZMOI_ICON 1 '$CHEZMOI_ICON' ''
} }
function _p9k_parse_virtualenv_cfg() {
typeset -ga reply=(0)
[[ -f $1 && -r $1 ]] || return
local cfg
cfg=$(<$1) || return
local -a match mbegin mend
[[ $'\n'$cfg$'\n' == (#b)*$'\n'prompt[$' \t']#=[$' \t']#([^$' \t']#)[$' \t']#$'\n'* ]] || return
local res=$match[1]
if [[ $res == (\"*\"|\'*\') ]]; then
# The string is quoted in python style, which isn't the same as quoting in zsh.
# For example, the literal 'foo"\'bar' denotes foo"'bar in python but in zsh
# it is malformed.
#
# We cheat a bit and impelement not exactly correct unquoting. It may produce
# different visual results but won't perform unintended expansions or bleed out
# any escape sequences.
#
# Note that venv performs unusual and obviously unintended expansions on the
# value of `prompt`: single-word expansions are performed twice by `activate`,
# and then again on every prompt if `prompt_subst` is in effect. While in general
# I am OK with being bug-compatible with other software, the bugs in venv are a
# bit too extreme for my comfort. I am going to disable all expansions and
# display the configured prompt literally.
res=${(Vg:e:)${res[2,-2]}}
fi
reply=(1 "$res")
}
################################################################ ################################################################
# Virtualenv: current working virtualenv # Virtualenv: current working virtualenv
# More information on virtualenv (Python): # More information on virtualenv (Python):
@ -4293,21 +4263,11 @@ prompt_virtualenv() {
if (( _POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION )) && _p9k_python_version; then if (( _POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION )) && _p9k_python_version; then
msg="${_p9k__ret//\%/%%} " msg="${_p9k__ret//\%/%%} "
fi fi
local cfg=$VIRTUAL_ENV/pyvenv.cfg local v=${VIRTUAL_ENV:t}
if ! _p9k_cache_stat_get $0 $cfg; then if [[ $VIRTUAL_ENV_PROMPT == '('?*') ' && $VIRTUAL_ENV_PROMPT != "($v) " ]]; then
local -a reply v=$VIRTUAL_ENV_PROMPT[2,-3]
_p9k_parse_virtualenv_cfg $cfg elif [[ $v == $~_POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES ]]; then
_p9k_cache_stat_set "${reply[@]}" v=${VIRTUAL_ENV:h:t}
fi
if (( _p9k__cache_val[1] )); then
local v=$_p9k__cache_val[2]
else
local v=${VIRTUAL_ENV:t}
if [[ $VIRTUAL_ENV_PROMPT == '('?*') ' && $VIRTUAL_ENV_PROMPT != "($v) " ]]; then
v=$VIRTUAL_ENV_PROMPT[2,-3]
elif [[ $v == $~_POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES ]]; then
v=${VIRTUAL_ENV:h:t}
fi
fi fi
msg+="$_POWERLEVEL9K_VIRTUALENV_LEFT_DELIMITER${v//\%/%%}$_POWERLEVEL9K_VIRTUALENV_RIGHT_DELIMITER" msg+="$_POWERLEVEL9K_VIRTUALENV_LEFT_DELIMITER${v//\%/%%}$_POWERLEVEL9K_VIRTUALENV_RIGHT_DELIMITER"
case $_POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV in case $_POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV in
@ -8637,6 +8597,7 @@ function _p9k_init_cacheable() {
endeavouros) _p9k_set_os Linux LINUX_ENDEAVOUROS_ICON;; endeavouros) _p9k_set_os Linux LINUX_ENDEAVOUROS_ICON;;
rocky) _p9k_set_os Linux LINUX_ROCKY_ICON;; rocky) _p9k_set_os Linux LINUX_ROCKY_ICON;;
guix) _p9k_set_os Linux LINUX_GUIX_ICON;; guix) _p9k_set_os Linux LINUX_GUIX_ICON;;
neon) _p9k_set_os Linux LINUX_NEON_ICON;;
*) _p9k_set_os Linux LINUX_ICON;; *) _p9k_set_os Linux LINUX_ICON;;
esac esac
;; ;;
@ -9457,7 +9418,7 @@ if [[ $__p9k_dump_file != $__p9k_instant_prompt_dump_file && -n $__p9k_instant_p
zf_rm -f -- $__p9k_instant_prompt_dump_file{,.zwc} 2>/dev/null zf_rm -f -- $__p9k_instant_prompt_dump_file{,.zwc} 2>/dev/null
fi fi
typeset -g P9K_VERSION=1.19.14 typeset -g P9K_VERSION=1.19.13
unset VSCODE_SHELL_INTEGRATION unset VSCODE_SHELL_INTEGRATION
_p9k_init_ssh _p9k_init_ssh

@ -1158,6 +1158,7 @@ function os_icon_name() {
endeavouros) echo LINUX_ENDEAVOUROS_ICON;; endeavouros) echo LINUX_ENDEAVOUROS_ICON;;
rocky) echo LINUX_ROCKY_ICON;; rocky) echo LINUX_ROCKY_ICON;;
guix) echo LINUX_GUIX_ICON;; guix) echo LINUX_GUIX_ICON;;
neon) echo LINUX_NEON_ICON;;
*) echo LINUX_ICON;; *) echo LINUX_ICON;;
esac esac
;; ;;

Loading…
Cancel
Save