diff --git a/.context.json b/.context.json index e872b1b..c1f1f09 100644 --- a/.context.json +++ b/.context.json @@ -197,13 +197,6 @@ "layout": "two-line, segmented gradient", "preview": "[date time user] @host - /path" }, - { - "id": "demo", - "name": "Demo", - "description": "Cycles through all styles each prompt.", - "layout": "two-line, auto-rotate", - "preview": "(auto-rotate)" - }, { "id": "radar", "name": "Radar", @@ -255,7 +248,7 @@ } ], "config": { - "env": "PS1_STYLE=aurora|neon|forge|circuit|mono|git|hawolex|hawolexv2|radar|synthwave|noir|topo|glitch|arcticfire|acidlime|demo; PS1_STYLE_PACK=standard|contest|holiday|custom; PS1_CONTEST_LAYOUT=day-time-user|user-time|time-user|day-time; PS1_HOLIDAY=christmas|easter|halloween|valentine|thanksgiving|newyear; PS1_GIT=0|1", + "env": "PS1_STYLE=aurora|neon|forge|circuit|mono|git|hawolex|hawolexv2|radar|synthwave|noir|topo|glitch|arcticfire|acidlime; PS1_STYLE_PACK=standard|contest|holiday|custom; PS1_CONTEST_LAYOUT=day-time-user|user-time|time-user|day-time; PS1_HOLIDAY=christmas|easter|halloween|valentine|thanksgiving|newyear; PS1_GIT=0|1", "config_file_keys": [ "PS1_STYLE", "PS1_STYLE_PACK", diff --git a/README.md b/README.md index 7e50ada..0c97fb4 100644 --- a/README.md +++ b/README.md @@ -181,8 +181,6 @@ Seven extra styles, built to be loud and expressive: - AcidLime: black + electric green Custom styles add a small context badge when relevant (`ssh`, `ctr`, `git`). - -Demo mode (screenshots): choose "Demo" to auto-cycle through all themes on each prompt. --- @@ -361,16 +359,46 @@ If you see squares or missing glyphs, your terminal is likely using a non-Nerd f --- -## 📸 Seasonal Previews +## 📸 Theme Gallery -Placeholders for the four seasonal prompts (screenshots will be added here): +Seasonal (Aurora): -- Winter: `images/season-winter.png` (placeholder) -- Spring: `images/season-spring.png` (placeholder) -- Summer: `images/season-summer.png` (placeholder) -- Autumn: `images/season-autumn.png` (placeholder) +![Winter](images/themes/season-winter.png) +![Spring](images/themes/season-spring.png) +![Summer](images/themes/season-summer.png) +![Autumn](images/themes/season-autumn.png) -Current combined palette reference: +Contest pack: + +![Aurora (contest)](images/themes/aurora.png) +![Neon](images/themes/neon.png) +![Forge](images/themes/forge.png) +![Circuit](images/themes/circuit.png) +![Mono](images/themes/mono.png) +![Git](images/themes/git.png) +![Hawolex](images/themes/hawolex.png) +![HawolexV2](images/themes/hawolexv2.png) + +Holidays pack: + +![Christmas](images/themes/christmas.png) +![Easter](images/themes/easter.png) +![Halloween](images/themes/halloween.png) +![Valentine](images/themes/valentine.png) +![Thanksgiving](images/themes/thanksgiving.png) +![NewYear](images/themes/newyear.png) + +Custom pack: + +![Radar](images/themes/radar.png) +![Synthwave](images/themes/synthwave.png) +![Noir](images/themes/noir.png) +![Topo](images/themes/topo.png) +![Glitch](images/themes/glitch.png) +![ArcticFire](images/themes/arcticfire.png) +![AcidLime](images/themes/acidlime.png) + +Palette reference:

diff --git a/contest-styles.json b/contest-styles.json index 30208d0..b5932d3 100644 --- a/contest-styles.json +++ b/contest-styles.json @@ -288,20 +288,6 @@ }, "preview": "[date time user] @host - /path" }, - { - "id": "demo", - "name": "Demo", - "tagline": "Auto-rotate all themes", - "description": "Cycles through all themes each prompt for rapid screenshots.", - "layout": { - "line1": "auto", - "line2": "auto" - }, - "colors": { - "note": "Uses each theme's native palette" - }, - "preview": "(auto-rotate)" - }, { "id": "radar", "name": "Radar", diff --git a/dotfiles/install/install-linux-global.sh b/dotfiles/install/install-linux-global.sh index 3bee6a2..45e12e9 100644 --- a/dotfiles/install/install-linux-global.sh +++ b/dotfiles/install/install-linux-global.sh @@ -171,36 +171,33 @@ if [[ -t 0 ]]; then if [[ "$style_pack" == "contest" ]]; then echo echo "Style presets:" - echo " 1) Demo - Cycles all themes every prompt" - echo " Preview: (auto-rotate)" - echo " 2) Aurora - Powerline blocks, seasonal palette, two-line" + echo " 1) Aurora - Powerline blocks, seasonal palette, two-line" echo " Preview: [date time user] > [@host /path]" - echo " 3) Neon - Magenta/cyan cyber blocks, high contrast" + echo " 2) Neon - Magenta/cyan cyber blocks, high contrast" echo " Preview: [user time] > [@host /path]" - echo " 4) Forge - Warm copper blocks, heavy frame" + echo " 3) Forge - Warm copper blocks, heavy frame" echo " Preview: [date time user] > [@host /path]" - echo " 5) Circuit - Green scanline, minimal rails" + echo " 4) Circuit - Green scanline, minimal rails" echo " Preview: [user time] - @host /path" - echo " 6) Mono - Clean monochrome, fast read" + echo " 5) Mono - Clean monochrome, fast read" echo " Preview: [date time user] @host /path" - echo " 7) Git - Minimal with git capsule" + echo " 6) Git - Minimal with git capsule" echo " Preview: [date time user] @host - /path (git)" - echo " 8) Hawolex - Winter neon, tech icons" + echo " 7) Hawolex - Winter neon, tech icons" echo " Preview: [date time user] @host - /path" - echo " 9) HawolexV2 - Winter neon gradient" + echo " 8) HawolexV2 - Winter neon gradient" echo " Preview: [date time user] @host - /path" read -r -p "Choose style [1]: " style_pick case "${style_pick}" in - 2) style_choice="aurora" ;; - 3) style_choice="neon" ;; - 4) style_choice="forge" ;; - 5) style_choice="circuit" ;; - 6) style_choice="mono" ;; - 7) style_choice="git" ;; - 8) style_choice="hawolex" ;; - 9) style_choice="hawolexv2" ;; - ""|1) style_choice="demo" ;; - *) echo "Invalid choice, using demo."; style_choice="demo" ;; + 2) style_choice="neon" ;; + 3) style_choice="forge" ;; + 4) style_choice="circuit" ;; + 5) style_choice="mono" ;; + 6) style_choice="git" ;; + 7) style_choice="hawolex" ;; + 8) style_choice="hawolexv2" ;; + ""|1) style_choice="aurora" ;; + *) echo "Invalid choice, using aurora."; style_choice="aurora" ;; esac elif [[ "$style_pack" == "custom" ]]; then diff --git a/dotfiles/install/install-macos-user.sh b/dotfiles/install/install-macos-user.sh index ed014d4..79d5dfd 100644 --- a/dotfiles/install/install-macos-user.sh +++ b/dotfiles/install/install-macos-user.sh @@ -147,36 +147,33 @@ if [[ -t 0 ]]; then if [[ "$style_pack" == "contest" ]]; then echo echo "Style presets:" - echo " 1) Demo - Cycles all themes every prompt" - echo " Preview: (auto-rotate)" - echo " 2) Aurora - Powerline blocks, seasonal palette, two-line" + echo " 1) Aurora - Powerline blocks, seasonal palette, two-line" echo " Preview: [date time user] > [@host /path]" - echo " 3) Neon - Magenta/cyan cyber blocks, high contrast" + echo " 2) Neon - Magenta/cyan cyber blocks, high contrast" echo " Preview: [user time] > [@host /path]" - echo " 4) Forge - Warm copper blocks, heavy frame" + echo " 3) Forge - Warm copper blocks, heavy frame" echo " Preview: [date time user] > [@host /path]" - echo " 5) Circuit - Green scanline, minimal rails" + echo " 4) Circuit - Green scanline, minimal rails" echo " Preview: [user time] - @host /path" - echo " 6) Mono - Clean monochrome, fast read" + echo " 5) Mono - Clean monochrome, fast read" echo " Preview: [date time user] @host /path" - echo " 7) Git - Minimal with git capsule" + echo " 6) Git - Minimal with git capsule" echo " Preview: [date time user] @host - /path (git)" - echo " 8) Hawolex - Winter neon, tech icons" + echo " 7) Hawolex - Winter neon, tech icons" echo " Preview: [date time user] @host - /path" - echo " 9) HawolexV2 - Winter neon gradient" + echo " 8) HawolexV2 - Winter neon gradient" echo " Preview: [date time user] @host - /path" read -r -p "Choose style [1]: " style_pick case "${style_pick}" in - 2) style_choice="aurora" ;; - 3) style_choice="neon" ;; - 4) style_choice="forge" ;; - 5) style_choice="circuit" ;; - 6) style_choice="mono" ;; - 7) style_choice="git" ;; - 8) style_choice="hawolex" ;; - 9) style_choice="hawolexv2" ;; - ""|1) style_choice="demo" ;; - *) echo "Invalid choice, using demo."; style_choice="demo" ;; + 2) style_choice="neon" ;; + 3) style_choice="forge" ;; + 4) style_choice="circuit" ;; + 5) style_choice="mono" ;; + 6) style_choice="git" ;; + 7) style_choice="hawolex" ;; + 8) style_choice="hawolexv2" ;; + ""|1) style_choice="aurora" ;; + *) echo "Invalid choice, using aurora."; style_choice="aurora" ;; esac elif [[ "$style_pack" == "custom" ]]; then diff --git a/dotfiles/ps1/ps1.sh b/dotfiles/ps1/ps1.sh index 241ed2c..44f107a 100644 --- a/dotfiles/ps1/ps1.sh +++ b/dotfiles/ps1/ps1.sh @@ -90,7 +90,7 @@ _ps1_season() { } # Style selection (aurora/neon/forge/circuit/mono/git/hawolex + custom pack) -# PS1_STYLE=aurora|neon|forge|circuit|mono|git|hawolex|hawolexv2|radar|synthwave|noir|topo|glitch|arcticfire|acidlime|demo +# PS1_STYLE=aurora|neon|forge|circuit|mono|git|hawolex|hawolexv2|radar|synthwave|noir|topo|glitch|arcticfire|acidlime # PS1_STYLE_PACK=standard|contest|holiday|custom # PS1_CONTEST_LAYOUT=day-time-user|user-time|time-user|day-time # PS1_HOLIDAY=christmas|easter|halloween|valentine|thanksgiving|newyear @@ -211,31 +211,6 @@ _ps1_path_topo() { printf "%s" "$out" } -_ps1_demo_next() { - local styles=( - "aurora" "neon" "forge" "circuit" "mono" "git" "hawolex" "hawolexv2" - "aurora" "aurora" "aurora" "aurora" "aurora" "aurora" - "radar" "synthwave" "noir" "topo" "glitch" "arcticfire" "acidlime" - ) - local packs=( - "standard" "contest" "contest" "contest" "contest" "contest" "contest" "contest" - "holiday" "holiday" "holiday" "holiday" "holiday" "holiday" - "custom" "custom" "custom" "custom" "custom" "custom" "custom" - ) - local holidays=( - "" "" "" "" "" "" "" "" - "christmas" "easter" "halloween" "valentine" "thanksgiving" "newyear" - "" "" "" "" "" "" "" - ) - local count=${#styles[@]} - local idx="${PS1_DEMO_INDEX:--1}" - idx=$(( (idx + 1) % count )) - PS1_DEMO_INDEX="$idx" - export PS1_DEMO_INDEX - __PS1_DEMO_STYLE="${styles[$idx]}" - __PS1_DEMO_PACK="${packs[$idx]}" - __PS1_DEMO_HOLIDAY="${holidays[$idx]}" -} # ---- Load Git prompt helper (best effort) ---- __try_source_git_prompt() { @@ -972,14 +947,6 @@ _ps1_update() { __PS1_HOLIDAY="$(_ps1_holiday)" __PS1_STYLE="$(_ps1_style)" __PS1_GIT="${PS1_GIT:-0}" - if [[ "$__PS1_STYLE" == "demo" ]]; then - _ps1_demo_next - __PS1_STYLE="$__PS1_DEMO_STYLE" - __PS1_STYLE_PACK="$__PS1_DEMO_PACK" - if [[ "$__PS1_STYLE_PACK" == "holiday" && -n "$__PS1_DEMO_HOLIDAY" ]]; then - __PS1_HOLIDAY="$__PS1_DEMO_HOLIDAY" - fi - fi __PS1_SYM="$(_ps1_symbol)" __PS1_PATH="$(_ps1_path)" if _ps1_has_nf; then __PS1_USE_NF=1; else __PS1_USE_NF=0; fi diff --git a/libary.md b/libary.md index 376c39e..55f99e4 100644 --- a/libary.md +++ b/libary.md @@ -304,7 +304,7 @@ FRAME=46 Core: ``` PS1_STYLE_PACK=standard|contest|holiday|custom -PS1_STYLE=aurora|neon|forge|circuit|mono|git|hawolex|hawolexv2|radar|synthwave|noir|topo|glitch|arcticfire|acidlime|demo +PS1_STYLE=aurora|neon|forge|circuit|mono|git|hawolex|hawolexv2|radar|synthwave|noir|topo|glitch|arcticfire|acidlime PS1_SEASON_MODE=dynamic|static PS1_SEASON=winter|spring|summer|autumn PS1_CONTEST_LAYOUT=day-time-user|user-time|time-user|day-time