Fix cap bleed for holiday and Hawolex

This commit is contained in:
2026-01-24 13:24:50 +00:00
parent 8b5c833a1e
commit fa33ab13f0

View File

@@ -355,67 +355,84 @@ _ps1_set_prompt() {
# Seasonal palettes (Z1 is darker than Z2) # Seasonal palettes (Z1 is darker than Z2)
local Z1_BG Z1_FG Z2_BG Z2_FG PATH_FG FRAME local Z1_BG Z1_FG Z2_BG Z2_FG PATH_FG FRAME
local Z1_BG_CODE Z2_BG_CODE
if [[ "$__PS1_STYLE_PACK" == "contest" ]]; then if [[ "$__PS1_STYLE_PACK" == "contest" ]]; then
Z1_BG="\[\e[48;5;24m\]" Z1_BG_CODE=24
Z2_BG_CODE=31
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;31m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;255m\]" Z2_FG="\[\e[38;5;255m\]"
PATH_FG="\[\e[38;5;51m\]" PATH_FG="\[\e[38;5;51m\]"
FRAME="\[\e[38;5;23m\]" FRAME="\[\e[38;5;23m\]"
elif [[ "$__PS1_STYLE_PACK" == "holiday" ]]; then elif [[ "$__PS1_STYLE_PACK" == "holiday" ]]; then
case "$__PS1_HOLIDAY" in case "$__PS1_HOLIDAY" in
christmas) christmas)
Z1_BG="\[\e[48;5;52m\]" Z1_BG_CODE=52
Z2_BG_CODE=28
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;28m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;255m\]" Z2_FG="\[\e[38;5;255m\]"
PATH_FG="\[\e[38;5;194m\]" PATH_FG="\[\e[38;5;194m\]"
FRAME="\[\e[38;5;88m\]" FRAME="\[\e[38;5;88m\]"
;; ;;
easter) easter)
Z1_BG="\[\e[48;5;186m\]" Z1_BG_CODE=186
Z2_BG_CODE=150
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;16m\]" Z1_FG="\[\e[38;5;16m\]"
Z2_BG="\[\e[48;5;150m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;16m\]" Z2_FG="\[\e[38;5;16m\]"
PATH_FG="\[\e[38;5;94m\]" PATH_FG="\[\e[38;5;94m\]"
FRAME="\[\e[38;5;143m\]" FRAME="\[\e[38;5;143m\]"
;; ;;
halloween) halloween)
Z1_BG="\[\e[48;5;53m\]" Z1_BG_CODE=53
Z2_BG_CODE=166
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;166m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;16m\]" Z2_FG="\[\e[38;5;16m\]"
PATH_FG="\[\e[38;5;16m\]" PATH_FG="\[\e[38;5;16m\]"
FRAME="\[\e[38;5;89m\]" FRAME="\[\e[38;5;89m\]"
;; ;;
valentine) valentine)
Z1_BG="\[\e[48;5;198m\]" Z1_BG_CODE=198
Z2_BG_CODE=205
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;205m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;255m\]" Z2_FG="\[\e[38;5;255m\]"
PATH_FG="\[\e[38;5;224m\]" PATH_FG="\[\e[38;5;224m\]"
FRAME="\[\e[38;5;162m\]" FRAME="\[\e[38;5;162m\]"
;; ;;
thanksgiving) thanksgiving)
Z1_BG="\[\e[48;5;94m\]" Z1_BG_CODE=94
Z2_BG_CODE=136
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;230m\]" Z1_FG="\[\e[38;5;230m\]"
Z2_BG="\[\e[48;5;136m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;231m\]" Z2_FG="\[\e[38;5;231m\]"
PATH_FG="\[\e[38;5;223m\]" PATH_FG="\[\e[38;5;223m\]"
FRAME="\[\e[38;5;130m\]" FRAME="\[\e[38;5;130m\]"
;; ;;
newyear) newyear)
Z1_BG="\[\e[48;5;17m\]" Z1_BG_CODE=17
Z2_BG_CODE=20
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;20m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;255m\]" Z2_FG="\[\e[38;5;255m\]"
PATH_FG="\[\e[38;5;229m\]" PATH_FG="\[\e[38;5;229m\]"
FRAME="\[\e[38;5;19m\]" FRAME="\[\e[38;5;19m\]"
;; ;;
*) *)
Z1_BG="\[\e[48;5;24m\]" Z1_BG_CODE=24
Z2_BG_CODE=31
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;31m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;255m\]" Z2_FG="\[\e[38;5;255m\]"
PATH_FG="\[\e[38;5;51m\]" PATH_FG="\[\e[38;5;51m\]"
FRAME="\[\e[38;5;23m\]" FRAME="\[\e[38;5;23m\]"
@@ -424,34 +441,42 @@ _ps1_set_prompt() {
else else
case "$__PS1_SEASON" in case "$__PS1_SEASON" in
spring) spring)
Z1_BG="\[\e[48;5;71m\]" Z1_BG_CODE=71
Z2_BG_CODE=120
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;120m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;22m\]" Z2_FG="\[\e[38;5;22m\]"
PATH_FG="\[\e[38;5;22m\]" PATH_FG="\[\e[38;5;22m\]"
FRAME="\[\e[38;5;65m\]" FRAME="\[\e[38;5;65m\]"
;; ;;
summer) summer)
Z1_BG="\[\e[48;5;142m\]" Z1_BG_CODE=142
Z2_BG_CODE=214
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;214m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;0m\]" Z2_FG="\[\e[38;5;0m\]"
PATH_FG="\[\e[38;5;232m\]" PATH_FG="\[\e[38;5;232m\]"
FRAME="\[\e[38;5;130m\]" FRAME="\[\e[38;5;130m\]"
;; ;;
autumn) autumn)
Z1_BG="\[\e[48;5;95m\]" Z1_BG_CODE=95
Z2_BG_CODE=173
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;173m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;255m\]" Z2_FG="\[\e[38;5;255m\]"
PATH_FG="\[\e[38;5;223m\]" PATH_FG="\[\e[38;5;223m\]"
FRAME="\[\e[38;5;95m\]" FRAME="\[\e[38;5;95m\]"
;; ;;
*) *)
# winter (default) # winter (default)
Z1_BG="\[\e[48;5;61m\]" Z1_BG_CODE=61
Z2_BG_CODE=37
Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]"
Z1_FG="\[\e[38;5;255m\]" Z1_FG="\[\e[38;5;255m\]"
Z2_BG="\[\e[48;5;37m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]"
Z2_FG="\[\e[38;5;255m\]" Z2_FG="\[\e[38;5;255m\]"
PATH_FG="\[\e[38;5;194m\]" PATH_FG="\[\e[38;5;194m\]"
FRAME="\[\e[38;5;60m\]" FRAME="\[\e[38;5;60m\]"
@@ -574,18 +599,35 @@ ${G_Z2_BG}${G_Z2_FG} ${HOST_PART}${PATH_SEP}${G_PATH_FG}${PATH_PART}${G_END_PAD}
local H_Z2_BG="\[\e[48;5;31m\]" local H_Z2_BG="\[\e[48;5;31m\]"
local H_Z2_FG="\[\e[38;5;255m\]" local H_Z2_FG="\[\e[38;5;255m\]"
local H_PATH_FG="\[\e[38;5;230m\]" local H_PATH_FG="\[\e[38;5;230m\]"
local H_LEFT=""
local H_RIGHT=""
local H_SEP=""
local H_LEFT_FG="\[\e[38;5;54m\]"
local H_RIGHT_FG="\[\e[38;5;31m\]"
PS1="\ PS1="\
${PREFIX}${H_FRAME}╭─${RST}\ ${PREFIX}${H_FRAME}╭─${RST}\
${H_Z1_BG}${H_Z1_FG}${left} ${L1} ${RST}${H_Z1_BG}${H_Z2_BG}${H_Z2_FG}${sep}${RST}\ ${H_LEFT_FG}${H_LEFT}${RST}${H_Z1_BG}${H_Z1_FG} ${L1} ${RST}${H_Z1_BG}${H_Z2_BG}${H_Z2_FG}${H_SEP}${RST}\
${H_Z2_BG}${H_Z2_FG} ${HOST_PART}${PATH_SEP}${H_PATH_FG}${PATH_PART}${END_PAD}${right}${RST}\ ${H_Z2_BG}${H_Z2_FG} ${HOST_PART}${PATH_SEP}${H_PATH_FG}${PATH_PART}${END_PAD}${RST}${H_RIGHT_FG}${H_RIGHT}${RST}\
\n${H_FRAME}╰── ${RST}${prompt_sym} ${__PS1_SYM} " \n${H_FRAME}╰── ${RST}${prompt_sym} ${__PS1_SYM} "
;; ;;
*) *)
# aurora (default) # aurora (default)
local A_LEFT="${left}"
local A_RIGHT="${right}"
local A_SEP="${sep}"
local A_LEFT_FG=""
local A_RIGHT_FG=""
if [[ "$__PS1_STYLE_PACK" == "holiday" ]]; then
A_LEFT=""
A_RIGHT=""
A_SEP=""
A_LEFT_FG="\[\e[38;5;${Z1_BG_CODE}m\]"
A_RIGHT_FG="\[\e[38;5;${Z2_BG_CODE}m\]"
fi
PS1="\ PS1="\
${PREFIX}${FRAME}╭─${RST}\ ${PREFIX}${FRAME}╭─${RST}\
${Z1_BG}${Z1_FG}${left} ${L1} ${RST}${Z1_BG}${Z2_BG}${Z2_FG}${sep}${RST}\ ${A_LEFT_FG}${A_LEFT}${RST}${Z1_BG}${Z1_FG} ${L1} ${RST}${Z1_BG}${Z2_BG}${Z2_FG}${A_SEP}${RST}\
${Z2_BG}${Z2_FG} ${HOST_PART}${PATH_SEP}${PATH_FG}${PATH_PART}${END_PAD}${right}${RST}\ ${Z2_BG}${Z2_FG} ${HOST_PART}${PATH_SEP}${PATH_FG}${PATH_PART}${END_PAD}${RST}${A_RIGHT_FG}${A_RIGHT}${RST}\
\n${FRAME}╰── ${RST}${prompt_sym} ${__PS1_SYM} " \n${FRAME}╰── ${RST}${prompt_sym} ${__PS1_SYM} "
;; ;;
esac esac