From 0437978c8cdcf411fbd1f5e69bbd60302cf463a7 Mon Sep 17 00:00:00 2001 From: "s0wlz (Matthias Puchstein)" Date: Wed, 31 Dec 2025 04:33:09 +0100 Subject: [PATCH] feat: update zsh prompt and neon color8 --- GEMINI.md | 2 +- apex-neon.md | 3 ++- src/neon.yaml | 2 +- templates/zsh/apex.zsh-theme.j2 | 12 +++++++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/GEMINI.md b/GEMINI.md index 7605988..466316c 100644 --- a/GEMINI.md +++ b/GEMINI.md @@ -47,7 +47,7 @@ Apex is not about pretty colors; it is about signal clarity. | 5 | Magenta | `#9d00ff` | `#7a3cff` | | 6 | Cyan | `#00eaff` | `#007a88` | | 7 | White/Fg | `#ededed` | `#f5f5f5` | -| 8 | BrBlack | `#262626` | `#737373` | +| 8 | BrBlack | `#737373` | `#737373` | | 9 | BrRed | `#ff8899` | `#ff4d6d` | | 10 | BrGreen | `#2bffb2` | `#33d6a6` | | 11 | BrYellow | `#ffd24d` | `#ffbf40` | diff --git a/apex-neon.md b/apex-neon.md index 8a8a93c..34cd9fc 100644 --- a/apex-neon.md +++ b/apex-neon.md @@ -24,6 +24,7 @@ Apex Neon is a high-contrast dark theme built for terminals, editors, and system | `#050505` | Void Deep | Main window backgrounds, terminal background. | | `#141414` | Dark Surface | Inputs, inactive tabs, widget backgrounds. | | `#262626` | Light Surface | Separators, scroll tracks, inactive borders. | +| `#404040` | Stealth | Comments, ignored text, suppressed hints. | | `#737373` | Muted Text | Comments, subtitles, inactive labels. | **Rule:** depth comes from contrast, not brightness. @@ -74,7 +75,7 @@ Bright colors represent **escalation**, not decoration. | Slot | Name | Hex | Meaning | |---|---|---|---| -| color8 | BrBlack | `#262626` | UI borders / separators | +| color8 | BrBlack | `#737373` | Muted text / suggestions | | color9 | BrRed | `#ff8899` | **Alerts** (Distinguishable from Cursor) | | color10 | BrGreen | `#2bffb2` | Active success / completion | | color11 | BrYellow | `#ffd24d` | Urgent warning | diff --git a/src/neon.yaml b/src/neon.yaml index 22bcca6..88228f8 100644 --- a/src/neon.yaml +++ b/src/neon.yaml @@ -38,7 +38,7 @@ ansi: white: "#ededed" bright: # Escalation only - black: "#262626" + black: "#737373" red: "#ff8899" green: "#2bffb2" yellow: "#ffd24d" diff --git a/templates/zsh/apex.zsh-theme.j2 b/templates/zsh/apex.zsh-theme.j2 index fa967ca..824fdb2 100644 --- a/templates/zsh/apex.zsh-theme.j2 +++ b/templates/zsh/apex.zsh-theme.j2 @@ -54,7 +54,7 @@ APEX[SHOW_VCS]=1 APEX[SHOW_INTEL]=1 APEX[SHOW_JOBS]=1 APEX[SHOW_RO]=1 -APEX[GIT_AHEAD_BEHIND]=0 +APEX[GIT_AHEAD_BEHIND]=1 # Ops commands (also match wrappers like sudo/doas/command) APEX[OPS_RE]='^((sudo|doas|command)[[:space:]]+)*((pacman|yay|paru|apt|dnf|brew|systemctl|docker|kubectl|helm|git))([[:space:]]|$)' @@ -189,10 +189,12 @@ apex_git_update() { # Upstream (earned ✓) if command git rev-parse --abbrev-ref --symbolic-full-name @{u} &>/dev/null; then - local counts + local counts behind ahead counts="$(command git rev-list --left-right --count @{u}...HEAD 2>/dev/null)" || return - apex_git_behind="${counts%% *}" - apex_git_ahead="${counts##* }" + local IFS=$' \t' + read -r behind ahead <<<"$counts" + apex_git_behind="${behind:-0}" + apex_git_ahead="${ahead:-0}" if (( apex_git_dirty_wt == 0 && apex_git_dirty_ix == 0 )) && [[ -z "$apex_git_op" ]]; then [[ "$apex_git_behind" == "0" && "$apex_git_ahead" == "0" ]] && apex_git_up_ok=1 @@ -217,7 +219,7 @@ apex_identity() { fi elif (( is_ssh )); then color="${C[CYAN]}" - label="${I[SSH]} %n @%m" + label="${I[SSH]} %n@%m" else return 0 fi