ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Share one theme color resolver across consumers

Browse Source 
Five scripts each hand-rolled colors.toml parsing plus their own
alias/fallback cascade, and the tables had drifted: theme-osc grew a
divergent color8/color9 chain, tmux and gnome carried private mode
detection, and the preview tool duplicated the lot. The differences
never mattered for shipped themes but were a standing bug factory for
sparse user themes.

omarchy-theme-color is now the single resolver. Its cascade is a
verbatim port of the canonical theme-set-templates logic (semantic
keys, legacy colorN aliases, derived shades, selection/cursor
derivation, mode precedence), exposed as --all, --raw, or single-key
lookup with fallback.

Generated output is byte-identical across all 21 shipped themes on
every surface: 17 template files, OSC byte stream, tmux and gsettings
command logs, and previews. Sparse legacy themes now resolve the same
palette everywhere instead of five slightly different ones.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
David Heinemeier Hansson
2026-07-03 09:06:31 -07:00
co-authored by Claude Fable 5
parent 03f7420d72
commit 3bd6e72211
6 changed files with 327 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-theme-osc
+19 -76
View File
@@ -7,84 +7,27 @@ theme="${1:-$HOME/.local/state/omarchy/current/theme/colors.toml}"
[[ -f $theme ]] || exit 0
awk -F= '
function clean(value) {
gsub(/^[[:space:]]+|[[:space:]]+$/, "", value)
if (value ~ /^"/) {
sub(/^"/, "", value)
sub(/".*$/, "", value)
}
return value
}
declare -A COLORS
function alias_color(target, source) {
if (colors[target] == "" && colors[source] != "") colors[target] = colors[source]
}
while IFS=$'\t' read -r key value; do
COLORS[$key]="$value"
done < <(omarchy-theme-color --file "$theme" --all)
function emit_color(color_index, key) {
if (colors[key] != "") printf "\033]4;%d;%s\007", color_index, colors[key]
}
emit_osc() {
local code="$1"
local key="$2"
{
key = $1
gsub(/^[[:space:]]+|[[:space:]]+$/, "", key)
value = clean($2)
colors[key] = value
}
[[ -n ${COLORS[$key]:-} ]] || return 0
printf '\033]%s;%s\007' "$code" "${COLORS[$key]}"
}
END {
if (colors["background"] != "") colors["bg"] = colors["background"]
if (colors["foreground"] != "") colors["fg"] = colors["foreground"]
if (colors["bg"] != "") colors["background"] = colors["bg"]
if (colors["fg"] != "") colors["foreground"] = colors["fg"]
if (colors["bg"] != "") colors["color0"] = colors["bg"]
if (colors["fg"] != "") colors["color7"] = colors["fg"]
emit_osc 10 foreground
emit_osc 11 background
emit_osc 12 cursor
emit_osc 17 selection_background
emit_osc 19 selection_foreground
alias_color("color0", "bg")
alias_color("color0", "background")
alias_color("color1", "red")
alias_color("color2", "green")
alias_color("color3", "yellow")
alias_color("color4", "blue")
alias_color("color5", "magenta")
alias_color("color5", "purple")
alias_color("color6", "cyan")
alias_color("color7", "fg")
alias_color("color7", "foreground")
alias_color("color8", "muted")
alias_color("color8", "dark_fg")
alias_color("color8", "foreground")
alias_color("color9", "bright_red")
alias_color("color9", "red")
alias_color("color10", "bright_green")
alias_color("color10", "green")
alias_color("color11", "bright_yellow")
alias_color("color11", "yellow")
alias_color("color12", "bright_blue")
alias_color("color12", "blue")
alias_color("color13", "bright_magenta")
alias_color("color13", "bright_purple")
alias_color("color13", "magenta")
alias_color("color13", "purple")
alias_color("color14", "bright_cyan")
alias_color("color14", "cyan")
alias_color("color15", "bright_fg")
alias_color("color15", "foreground")
alias_color("light_fg", "color7")
alias_color("light_fg", "fg")
alias_color("bright_fg", "color15")
alias_color("bright_fg", "fg")
if (colors["bright_fg"] != "") colors["cursor"] = colors["bright_fg"]
if (colors["selection_background"] == "" && colors["selection"] != "") colors["selection_background"] = colors["selection"]
if (colors["selection_foreground"] == "") colors["selection_foreground"] = colors["bright_fg"]
if (colors["foreground"] != "") printf "\033]10;%s\007", colors["foreground"]
if (colors["background"] != "") printf "\033]11;%s\007", colors["background"]
if (colors["cursor"] != "") printf "\033]12;%s\007", colors["cursor"]
if (colors["selection_background"] != "") printf "\033]17;%s\007", colors["selection_background"]
if (colors["selection_foreground"] != "") printf "\033]19;%s\007", colors["selection_foreground"]
for (i = 0; i <= 15; i++) emit_color(i, "color" i)
}
' "$theme"
for i in {0..15}; do
[[ -n ${COLORS[color$i]:-} ]] || continue
printf '\033]4;%d;%s\007' "$i" "${COLORS[color$i]}"
done