diff --git a/.context.json b/.context.json index 01e81eb..4f5023b 100644 --- a/.context.json +++ b/.context.json @@ -99,6 +99,7 @@ "Z2_BG": 61, "Z3_BG": 63, "Z4_BG": 38, + "Z5_BG": 37, "Z1_FG": 255, "Z2_FG": 255, "PATH_FG": 152, @@ -109,6 +110,7 @@ "Z2_BG": 70, "Z3_BG": 72, "Z4_BG": 121, + "Z5_BG": 120, "Z1_FG": 255, "Z2_FG": 22, "PATH_FG": 28, @@ -119,6 +121,7 @@ "Z2_BG": 142, "Z3_BG": 143, "Z4_BG": 214, + "Z5_BG": 208, "Z1_FG": 255, "Z2_FG": 0, "PATH_FG": 0, @@ -129,6 +132,7 @@ "Z2_BG": 95, "Z3_BG": 97, "Z4_BG": 166, + "Z5_BG": 136, "Z1_FG": 255, "Z2_FG": 255, "PATH_FG": 223, diff --git a/contest-styles.json b/contest-styles.json index db0d7de..20522a9 100644 --- a/contest-styles.json +++ b/contest-styles.json @@ -230,10 +230,10 @@ } ], "seasonal_palettes": { - "winter": { "Z1_BG": 59, "Z2_BG": 61, "Z3_BG": 63, "Z4_BG": 38, "Z1_FG": 255, "Z2_FG": 255, "PATH_FG": 152, "FRAME": 60 }, - "spring": { "Z1_BG": 68, "Z2_BG": 70, "Z3_BG": 72, "Z4_BG": 121, "Z1_FG": 255, "Z2_FG": 22, "PATH_FG": 28, "FRAME": 65 }, - "summer": { "Z1_BG": 141, "Z2_BG": 142, "Z3_BG": 143, "Z4_BG": 214, "Z1_FG": 255, "Z2_FG": 0, "PATH_FG": 0, "FRAME": 130 }, - "autumn": { "Z1_BG": 93, "Z2_BG": 95, "Z3_BG": 97, "Z4_BG": 166, "Z1_FG": 255, "Z2_FG": 255, "PATH_FG": 223, "FRAME": 95 } + "winter": { "Z1_BG": 59, "Z2_BG": 61, "Z3_BG": 63, "Z4_BG": 38, "Z5_BG": 37, "Z1_FG": 255, "Z2_FG": 255, "PATH_FG": 152, "FRAME": 60 }, + "spring": { "Z1_BG": 68, "Z2_BG": 70, "Z3_BG": 72, "Z4_BG": 121, "Z5_BG": 120, "Z1_FG": 255, "Z2_FG": 22, "PATH_FG": 28, "FRAME": 65 }, + "summer": { "Z1_BG": 141, "Z2_BG": 142, "Z3_BG": 143, "Z4_BG": 214, "Z5_BG": 208, "Z1_FG": 255, "Z2_FG": 0, "PATH_FG": 0, "FRAME": 130 }, + "autumn": { "Z1_BG": 93, "Z2_BG": 95, "Z3_BG": 97, "Z4_BG": 166, "Z5_BG": 136, "Z1_FG": 255, "Z2_FG": 255, "PATH_FG": 223, "FRAME": 95 } }, "notes": [ "Palette values are 256-color codes.", diff --git a/dotfiles/ps1/ps1.sh b/dotfiles/ps1/ps1.sh index 0681437..b283281 100644 --- a/dotfiles/ps1/ps1.sh +++ b/dotfiles/ps1/ps1.sh @@ -386,8 +386,8 @@ _ps1_set_prompt() { local RST="\[\e[0m\]" # Seasonal palettes (Z1 is darker than Z2) - local Z1_BG Z1_FG Z2_BG Z2_FG Z3_BG Z4_BG PATH_FG FRAME - local Z1_BG_CODE Z2_BG_CODE Z3_BG_CODE Z4_BG_CODE + local Z1_BG Z1_FG Z2_BG Z2_FG Z3_BG Z4_BG Z5_BG PATH_FG FRAME + local Z1_BG_CODE Z2_BG_CODE Z3_BG_CODE Z4_BG_CODE Z5_BG_CODE if [[ "$__PS1_STYLE_PACK" == "contest" ]]; then Z1_BG_CODE=24 Z2_BG_CODE=31 @@ -468,8 +468,10 @@ _ps1_set_prompt() { Z2_FG="\[\e[38;5;255m\]" Z3_BG_CODE="${Z2_BG_CODE}" Z4_BG_CODE="${Z2_BG_CODE}" + Z5_BG_CODE="${Z2_BG_CODE}" Z3_BG="\[\e[48;5;${Z3_BG_CODE}m\]" Z4_BG="\[\e[48;5;${Z4_BG_CODE}m\]" + Z5_BG="\[\e[48;5;${Z5_BG_CODE}m\]" PATH_FG="\[\e[38;5;51m\]" FRAME="\[\e[38;5;23m\]" ;; @@ -481,12 +483,14 @@ _ps1_set_prompt() { Z2_BG_CODE=70 Z3_BG_CODE=72 Z4_BG_CODE=121 + Z5_BG_CODE=120 Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]" Z1_FG="\[\e[38;5;255m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]" Z2_FG="\[\e[38;5;22m\]" Z3_BG="\[\e[48;5;${Z3_BG_CODE}m\]" Z4_BG="\[\e[48;5;${Z4_BG_CODE}m\]" + Z5_BG="\[\e[48;5;${Z5_BG_CODE}m\]" PATH_FG="\[\e[38;5;28m\]" FRAME="\[\e[38;5;65m\]" ;; @@ -495,12 +499,14 @@ _ps1_set_prompt() { Z2_BG_CODE=142 Z3_BG_CODE=143 Z4_BG_CODE=214 + Z5_BG_CODE=208 Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]" Z1_FG="\[\e[38;5;255m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]" Z2_FG="\[\e[38;5;0m\]" Z3_BG="\[\e[48;5;${Z3_BG_CODE}m\]" Z4_BG="\[\e[48;5;${Z4_BG_CODE}m\]" + Z5_BG="\[\e[48;5;${Z5_BG_CODE}m\]" PATH_FG="\[\e[38;5;0m\]" FRAME="\[\e[38;5;130m\]" ;; @@ -509,12 +515,14 @@ _ps1_set_prompt() { Z2_BG_CODE=95 Z3_BG_CODE=97 Z4_BG_CODE=166 + Z5_BG_CODE=136 Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]" Z1_FG="\[\e[38;5;255m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]" Z2_FG="\[\e[38;5;255m\]" Z3_BG="\[\e[48;5;${Z3_BG_CODE}m\]" Z4_BG="\[\e[48;5;${Z4_BG_CODE}m\]" + Z5_BG="\[\e[48;5;${Z5_BG_CODE}m\]" PATH_FG="\[\e[38;5;223m\]" FRAME="\[\e[38;5;95m\]" ;; @@ -524,12 +532,14 @@ _ps1_set_prompt() { Z2_BG_CODE=61 Z3_BG_CODE=63 Z4_BG_CODE=38 + Z5_BG_CODE=37 Z1_BG="\[\e[48;5;${Z1_BG_CODE}m\]" Z1_FG="\[\e[38;5;255m\]" Z2_BG="\[\e[48;5;${Z2_BG_CODE}m\]" Z2_FG="\[\e[38;5;255m\]" Z3_BG="\[\e[48;5;${Z3_BG_CODE}m\]" Z4_BG="\[\e[48;5;${Z4_BG_CODE}m\]" + Z5_BG="\[\e[48;5;${Z5_BG_CODE}m\]" PATH_FG="\[\e[38;5;152m\]" FRAME="\[\e[38;5;60m\]" ;; @@ -706,15 +716,16 @@ ${H_Z2_BG}${H_Z2_FG} ${HOST_PART}${PATH_SEP}${H_PATH_FG}${PATH_PART}${END_PAD}${ A_RIGHT="" A_SEP="" A_LEFT_FG="\[\e[38;5;${Z1_BG_CODE}m\]" - A_RIGHT_FG="\[\e[38;5;${Z4_BG_CODE:-$Z2_BG_CODE}m\]" + A_RIGHT_FG="\[\e[38;5;${Z5_BG_CODE:-$Z2_BG_CODE}m\]" fi if [[ "$__PS1_STYLE_PACK" == "standard" && "$__PS1_USE_NF" -eq 1 ]]; then local SEP12="\[\e[38;5;${Z2_BG_CODE}m\]\[\e[48;5;${Z1_BG_CODE}m\]${A_SEP}${RST}" local SEP23="\[\e[38;5;${Z3_BG_CODE}m\]\[\e[48;5;${Z2_BG_CODE}m\]${A_SEP}${RST}" local SEP34="\[\e[38;5;${Z4_BG_CODE}m\]\[\e[48;5;${Z3_BG_CODE}m\]${A_SEP}${RST}" + local SEP45="\[\e[38;5;${Z5_BG_CODE}m\]\[\e[48;5;${Z4_BG_CODE}m\]${A_SEP}${RST}" PS1="\ ${PREFIX}${FRAME}╭─${RST}\ -${A_LEFT_FG}${A_LEFT}${RST}${Z1_BG}${Z1_FG} \\d ${RST}${SEP12}${Z2_BG}${Z1_FG} \\A ${RST}${SEP23}${Z3_BG}${Z1_FG} \\u ${RST}${SEP34}${Z4_BG}${Z2_FG} ${HOST_PART}${PATH_SEP}${PATH_FG}${PATH_PART}${END_PAD}${RST}${A_RIGHT_FG}${A_RIGHT}${RST}\ +${A_LEFT_FG}${A_LEFT}${RST}${Z1_BG}${Z1_FG} \\d ${RST}${SEP12}${Z2_BG}${Z1_FG} \\A ${RST}${SEP23}${Z3_BG}${Z1_FG} \\u ${RST}${SEP34}${Z4_BG}${Z2_FG} ${L_HOST} ${RST}${SEP45}${Z5_BG}${PATH_FG} ${__PS1_PATH}${END_PAD}${RST}${A_RIGHT_FG}${A_RIGHT}${RST}\ \n${FRAME}╰── ${RST}${prompt_sym} ${__PS1_SYM}${git_tail}" else PS1="\