@sebastienrousseau/dotfiles 0.2.519 → 0.2.520

package/scripts/theme/extract-theme.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 # extract-theme.py — Generate a terminal theme from wallpaper dominant colors.
 #
@@ -329,6 +329,28 @@ def ensure_contrast(
     return lab_to_rgb(fl, fa, fb)
 
 
+# VS Code theming — Catppuccin only.
+#
+# The label must match `contributes.themes[].label` in the extension's
+# package.json exactly, and the icon id must match `contributes.iconThemes[].id`.
+# VS Code cannot resolve an unknown name: it keeps whatever is active and logs
+# an error the user never sees, which is how three wrong values here survived.
+#
+# Verified against catppuccin.catppuccin-vsc 3.19.0 and
+# catppuccin.catppuccin-vsc-icons 1.26.0:
+#   themes      Catppuccin Mocha | Macchiato | Frappe | Latte
+#   iconThemes  catppuccin-mocha | -macchiato | -frappe | -latte
+#   productIconThemes  (none — the extension registers none at all)
+#
+# Neovim still picks per-family (tokyonight/everforest/catppuccin) from the
+# wallpaper hue; only the VS Code surface is pinned, because a single editor
+# theme that is always installed beats three that mostly are not.
+VSCODE_DARK = "Catppuccin Mocha"
+VSCODE_LIGHT = "Catppuccin Latte"
+VSCODE_ICONS_DARK = "catppuccin-mocha"
+VSCODE_ICONS_LIGHT = "catppuccin-latte"
+
+
 def _nvim_from_hue(hue: float, is_dark: bool) -> Tuple[str, str]:
     """Map accent hue angle to nearest Neovim colorscheme."""
     if 60 <= hue < 150:
@@ -385,13 +407,41 @@ def _compute_bg_fg(clusters, is_dark):
     Override per mode via DOTFILES_TERM_BG_DARK / _FG_DARK / _BG_LIGHT /
     _FG_LIGHT.
     """
-    _ = clusters  # bg/fg no longer wallpaper-derived
     if is_dark:
         bg_rgb = hex_to_rgb(_env_hex("DOTFILES_TERM_BG_DARK", "#1e1e2e"))
         fg_rgb = hex_to_rgb(_env_hex("DOTFILES_TERM_FG_DARK", "#d4d4d4"))
     else:
         bg_rgb = hex_to_rgb(_env_hex("DOTFILES_TERM_BG_LIGHT", "#fbf1c7"))
         fg_rgb = hex_to_rgb(_env_hex("DOTFILES_TERM_FG_LIGHT", "#3c3836"))
+
+    # Tint the engineered neutral toward the wallpaper's dominant hue.
+    #
+    # The lightness stays exactly where it was — that is what the docstring
+    # above is protecting, and it is what keeps contrast and eye strain
+    # predictable. Only a*/b* move, and only to TINT_CHROMA, which is small
+    # enough to read as "this terminal belongs to that wallpaper" rather than
+    # as a coloured background.
+    #
+    # Without this, term.bg had exactly two values across 228 themes and every
+    # theme looked identical apart from one accent. Set DOTFILES_TERM_TINT=0
+    # for the previous flat neutrals.
+    if _env_hex("DOTFILES_TERM_TINT", "1") != "0":
+        ranked = sorted(clusters, key=lambda c: c[1] * lab_chroma(*c[0]), reverse=True)
+        src = ranked[0][0] if ranked and lab_chroma(*ranked[0][0]) >= 5.0 else None
+        if src is not None:
+            hue_c = lab_chroma(*src)
+            if hue_c > 0:
+                # Unit vector along the wallpaper's hue, scaled to a fixed,
+                # deliberately low chroma. Dark surfaces take a touch more:
+                # the same chroma reads weaker against a low-lightness ground.
+                bg_chroma = 4.5 if is_dark else 3.0
+                fg_chroma = 2.5 if is_dark else 2.0
+                ua, ub = src[1] / hue_c, src[2] / hue_c
+                bl = rgb_to_lab(*bg_rgb)[0]
+                fl = rgb_to_lab(*fg_rgb)[0]
+                bg_rgb = lab_to_rgb(bl, ua * bg_chroma, ub * bg_chroma)
+                fg_rgb = lab_to_rgb(fl, ua * fg_chroma, ub * fg_chroma)
+
     bg_lab = rgb_to_lab(*bg_rgb)
     return bg_lab, bg_rgb, fg_rgb
 
@@ -423,6 +473,212 @@ def _compute_accent(clusters, is_dark):
     return (al, aa, ab), lab_to_rgb(al, aa, ab)
 
 
+# A support colour that has to fall below this lightness to satisfy the 7:1
+# white-on-block requirement is not carrying colour any more. See the
+# rejection note in _compute_support_colours.
+SUPPORT_MIN_L = 25.0
+
+# Minimum perceptual distance between the three support colours, as dE*ab.
+#
+# This replaced a 12-degree hue-angle check, which let near-identical colours
+# through: hue angle is meaningless at low chroma, so three slate blues at
+# chroma ~13 could sit 12 degrees apart and still be the same colour to look
+# at. forest-dark's accent/secondary/tertiary measured dE 3.6 — against ~2.3
+# for "just noticeable" — while passing the hue rule comfortably.
+#
+# 10 is roughly where two colours read as clearly different rather than as
+# shades of one. Measured over the library, 68 of 228 themes had at least one
+# pair below it; those now reach further down the cluster ranking for a
+# candidate that is actually distinct, and only fall back to a synthetic
+# rotation when the wallpaper genuinely has nothing else to offer.
+SUPPORT_MIN_DE = 10.0
+
+
+def _aaa_darkened(lab, is_dark):
+    """Clamp lightness per mode, then darken until white sits on it at 7:1.
+
+    Shared by the selection filter and the final emission so a candidate is
+    judged on exactly the colour it will become, not on the one it started
+    as — checking the input and emitting the output was how a colour that
+    passed the chroma filter still arrived at L*=14.8.
+
+    A candidate that is ALREADY darker than SUPPORT_MIN_L is then lifted back
+    toward it, one step at a time, stopping the moment another step would
+    cost the 7:1 guarantee. Two different things can leave a support colour
+    too dark: the darkening loop travelling a long way (a low-chroma
+    candidate), and the cluster simply starting dark (dune-light's whole
+    palette sits near L*17 and holds 14.3:1, so the loop never ran). The
+    first is handled by rejecting the candidate; only the second can be
+    lifted, and only where there is contrast headroom to pay for it.
+    """
+    L = max(lab[0], 35.0) if is_dark else min(lab[0], 45.0)
+    a, b = lab[1], lab[2]
+    for _ in range(80):
+        if contrast_ratio((255, 255, 255), lab_to_rgb(L, a, b)) >= 7.0:
+            break
+        L = max(0.0, L - 2.0)
+    while L < SUPPORT_MIN_L:
+        nxt = min(SUPPORT_MIN_L, L + 1.0)
+        if contrast_ratio((255, 255, 255), lab_to_rgb(nxt, a, b)) < 7.0:
+            break
+        L = nxt
+    return (L, a, b)
+
+
+def _displayed(lab, is_dark):
+    """The LAB of the colour that will actually be SHOWN.
+
+    Cluster centroids routinely land outside sRGB — Tang's top three sit at
+    chroma 197, 119 and 98, where sRGB tops out near 130 — and `lab_to_rgb`
+    clamps them. Comparing the raw LAB values said those three were dE 79 and
+    49 apart; after clamping they were #a80000 and #b00000, dE 3.3. The
+    distance test has to run on the clamped colour or it is measuring
+    something the user never sees.
+    """
+    return rgb_to_lab(*lab_to_rgb(*_aaa_darkened(lab, is_dark)))
+
+
+def _compute_support_colours(clusters, accent_lab, is_dark):
+    """The wallpaper's SECOND and THIRD chromatic colours, as UI accents.
+
+    `_compute_accent` takes the top of the population x chroma ranking and
+    throws the rest away, so a wallpaper contributed exactly one colour to
+    the UI and everything else — status bars, separators, inactive states —
+    fell back to fixed neutrals. These are the next two ranked clusters,
+    put through the same AAA-darkening as the accent so white text sits on
+    them at 7:1.
+
+    Clusters within 12 degrees of a colour already chosen are skipped: two
+    near-identical blues give no more information than one, and the point of
+    a secondary is that it reads as different.
+    """
+    ranked = [c for c in sorted(clusters, key=lambda c: c[1] * lab_chroma(*c[0]), reverse=True)
+              if lab_chroma(*c[0]) >= 5.0]
+    # Compare the colours as they will be SHOWN, not as the clusters arrived:
+    # the AAA-darkening moves lightness, which moves perceptual distance too.
+    picked, chosen = [], [rgb_to_lab(*lab_to_rgb(*accent_lab))]
+    for lab, _pop in ranked:
+        final = _displayed(lab, is_dark)
+        if any(lab_distance(final, o) < SUPPORT_MIN_DE for o in chosen):
+            continue
+        # Reject a candidate that only reaches 7:1 by going almost black.
+        #
+        # The AAA-darkening below drives lightness down until white sits on
+        # the colour at 7:1. A low-chroma candidate has to travel a long way
+        # to get there: bauhaus-light's second cluster landed at L*=14.8,
+        # which reads as another shade of dark rather than as a colour, even
+        # though its chroma of 8.0 passed the filter above.
+        #
+        # Measured across the library this affected 7 themes, all light
+        # variants, where the surface is pale and the colours must darken to
+        # sit on it. Raising the chroma floor instead would have cost 34
+        # themes their support colours and fixed only one of these seven, so
+        # the constraint belongs on the OUTCOME, not on the input.
+        if final[0] < SUPPORT_MIN_L:
+            continue
+        picked.append(lab)
+        chosen.append(final)
+        if len(picked) == 2:
+            break
+    # A wallpaper with only one usable hue still needs two support colours, so
+    # the accent's hue is rotated to invent them. Rotating blindly does not
+    # work: a rotated hue at high chroma often falls outside sRGB, and
+    # lab_to_rgb clamps it. Two different angles then clamp to nearly the same
+    # colour — tang-light produced #695600 and #685600, dE 0.5 apart, both at
+    # chroma 45. The fallback was the one path not checking its own output.
+    #
+    # So search: walk angles away from the accent, and drop chroma until the
+    # result survives a round trip through sRGB (proof it is in gamut) and is
+    # far enough from everything already chosen.
+    while len(picked) < 2:
+        base = picked[-1] if picked else accent_lab
+        best = None
+        for deg in (120, 90, 150, 60, 180, 40, 210, 30, 240, 270, 300):
+            for scale in (1.0, 0.85, 0.7, 0.55, 0.4):
+                c = lab_chroma(*base) * scale
+                rad = math.radians((lab_hue(*base) + deg) % 360.0)
+                cand_lab = (base[0], math.cos(rad) * c, math.sin(rad) * c)
+                final = _displayed(cand_lab, is_dark)
+                rgb = lab_to_rgb(*_aaa_darkened(cand_lab, is_dark))
+                # Round trip: if the colour was out of gamut it was clamped,
+                # and the clamped value will not convert back to what we asked
+                # for. That is exactly how the duplicates were produced.
+                if lab_distance(rgb_to_lab(*rgb), final) > 3.0:
+                    continue
+                if final[0] < SUPPORT_MIN_L:
+                    continue
+                d = min(lab_distance(final, o) for o in chosen)
+                if d >= SUPPORT_MIN_DE:
+                    best = cand_lab
+                    break
+                if best is None or d > min(lab_distance(_displayed(best, is_dark), o) for o in chosen):
+                    best = cand_lab
+            if best is not None and min(
+                lab_distance(_displayed(best, is_dark), o) for o in chosen
+            ) >= SUPPORT_MIN_DE:
+                break
+        if best is None:
+            best = (base[0], -base[1], -base[2])  # last resort: opposite hue
+        picked.append(best)
+        chosen.append(_displayed(best, is_dark))
+
+    return (lab_to_rgb(*_aaa_darkened(picked[0], is_dark)),
+            lab_to_rgb(*_aaa_darkened(picked[1], is_dark)))
+
+
+def _on_dark(lab, surfaces, min_ratio=4.5):
+    """The same hue, light enough to be TEXT on a dark surface.
+
+    `accent`, `secondary` and `tertiary` are darkened until white sits on
+    them at 7:1 — they are background colours by construction, and painting
+    them as text on the dark status bar measured as low as 1.67:1.
+
+    This keeps the hue and chroma and walks lightness up instead, until the
+    ratio holds against every surface the text can land on. Without it there
+    is no way to show a wallpaper colour AS text: the choice would be
+    between wallpaper colour and legibility.
+    """
+    L, a, b = lab
+    for _ in range(120):
+        rgb = lab_to_rgb(L, a, b)
+        if all(contrast_ratio(rgb, s) >= min_ratio for s in surfaces):
+            return rgb
+        if L >= 100.0:
+            break
+        L = min(100.0, L + 1.5)
+    return lab_to_rgb(L, a, b)
+
+
+def _muted_text(panel_rgb, border_rgb, bg_lab, is_dark):
+    """Readable de-emphasised text — 4.5:1 against every surface it lands on.
+
+    Not `term.c8`. c8 is ANSI bright-black and is supposed to be dim; its
+    floor is 2.5:1 against bg, and tmux was painting the clock and the
+    inactive window names with it at 2.12:1 and 2.45:1. Raising c8 would
+    have made every terminal's dim colour less dim in order to fix a status
+    bar, so this is a separate slot.
+
+    Floored against BOTH panel and border, not just panel: the two differ in
+    lightness, tmux draws muted text on each of them, and flooring against
+    only the friendlier one left the other at 4.40:1 — a near miss is still
+    a miss.
+    """
+    start = 62.0 if is_dark else 42.0
+    seed = lab_to_rgb(start, bg_lab[1] * 0.5, bg_lab[2] * 0.5)
+    out = seed
+    for surface in (panel_rgb, border_rgb):
+        out = ensure_contrast(out, surface, 4.5, is_dark)
+    # ensure_contrast against the second surface can walk back toward the
+    # first, so confirm rather than assume, and step until both hold.
+    for _ in range(80):
+        if all(contrast_ratio(out, s) >= 4.5 for s in (panel_rgb, border_rgb)):
+            break
+        l, a, b = rgb_to_lab(*out)
+        l = min(100.0, l + 2.0) if is_dark else max(0.0, l - 2.0)
+        out = lab_to_rgb(l, a, b)
+    return out
+
+
 def _compute_panel_border(bg_lab, bg_rgb, is_dark):
     """Compute panel and border with enforced contrast ranges against bg."""
     if is_dark:
@@ -538,6 +794,14 @@ def generate_theme(
     sel_rgb = lab_to_rgb(*sel_lab)
 
     panel_rgb, border_rgb = _compute_panel_border(bg_lab, bg_rgb, is_dark)
+    secondary_rgb, tertiary_rgb = _compute_support_colours(clusters, accent_lab, is_dark)
+    muted_rgb = _muted_text(panel_rgb, border_rgb, bg_lab, is_dark)
+    # Text-safe versions of the three chromatic colours, for consumers that
+    # paint them as foreground on panel/border rather than as a block.
+    _surfaces = (panel_rgb, border_rgb, bg_rgb)
+    accent_on_rgb = _on_dark(rgb_to_lab(*accent_rgb), _surfaces)
+    secondary_on_rgb = _on_dark(rgb_to_lab(*secondary_rgb), _surfaces)
+    tertiary_on_rgb = _on_dark(rgb_to_lab(*tertiary_rgb), _surfaces)
     ansi = _ansi_palette(clusters, accent_lab, bg_rgb, is_dark)
     c0_rgb, c7_rgb, c8_rgb, c15_rgb = _structural_colors(bg_lab, bg_rgb, is_dark)
 
@@ -587,6 +851,17 @@ def generate_theme(
             "info": rgb_to_hex(*ansi["blue"][0]),
             "panel": rgb_to_hex(*panel_rgb),
             "border": rgb_to_hex(*border_rgb),
+            # The wallpaper's 2nd and 3rd chromatic colours. White sits on
+            # either at 7:1, same as accent.
+            "secondary": rgb_to_hex(*secondary_rgb),
+            "tertiary": rgb_to_hex(*tertiary_rgb),
+            # De-emphasised text that is still text: 4.5:1 against `panel`.
+            "text_muted": rgb_to_hex(*muted_rgb),
+            # Same hues, lightened until they are legible AS TEXT on panel,
+            # border and bg (>= 4.5:1 on all three).
+            "accent_on_surface": rgb_to_hex(*accent_on_rgb),
+            "secondary_on_surface": rgb_to_hex(*secondary_on_rgb),
+            "tertiary_on_surface": rgb_to_hex(*tertiary_on_rgb),
         },
         "app": {
             "nvim": nvim_theme[0],
@@ -596,9 +871,10 @@ def generate_theme(
             "gtk_icon": "Papirus-Dark" if is_dark else "Papirus-Light",
             "gnome_shell": "",
             "gnome_gtk": "Adwaita-dark" if is_dark else "Adwaita",
-            "vscode": f"{nvim_theme[0].replace('-', ' ').title()} {'Mocha' if is_dark else 'Latte'}",
-            "vscode_dark": f"{nvim_theme[0].replace('-', ' ').title()} Mocha",
-            "vscode_light": f"{nvim_theme[0].replace('-', ' ').title()} Latte",
+            "vscode": VSCODE_DARK if is_dark else VSCODE_LIGHT,
+            "vscode_dark": VSCODE_DARK,
+            "vscode_light": VSCODE_LIGHT,
+            "vscode_icons": VSCODE_ICONS_DARK if is_dark else VSCODE_ICONS_LIGHT,
             "cat_wallpaper": "",
             "starship_palette": f"catppuccin_{'mocha' if is_dark else 'latte'}",
         },
@@ -631,7 +907,9 @@ def theme_to_toml(theme: Dict) -> str:
     lines.append("")
 
     lines.append(f"[themes.{name}.ui]")
-    for key in ["accent", "accent_text", "error", "warning", "success", "info", "panel", "border"]:
+    for key in ["accent", "accent_text", "secondary", "tertiary", "text_muted",
+                "accent_on_surface", "secondary_on_surface", "tertiary_on_surface",
+                "error", "warning", "success", "info", "panel", "border"]:
         lines.append(f'{key} = "{theme["ui"][key]}"')
     lines.append("")
 

package/scripts/theme/install-boot-logo.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail
 

package/scripts/theme/install-catppuccin-themes.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 ## Catppuccin Theme Installer — Install Catppuccin themes for GNOME.
 ##

package/scripts/theme/install-cursors.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail
 

package/scripts/theme/install-file-icons.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail
 

package/scripts/theme/install-grub-theme.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail
 

package/scripts/theme/install-lock-icon.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail
 

package/scripts/theme/merge-wallpaper.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 # merge-wallpaper.sh — Merge dark+light wallpapers into a single dynamic HEIC.
 #

package/scripts/theme/rebuild-themes.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 # rebuild-themes.sh — Discover wallpapers and generate themes.toml dynamically.
 #
@@ -277,6 +277,45 @@ fi
 
 mkdir -p "$CACHE_DIR"
 
+# ---------------------------------------------------------------------------
+# Invalidate the cache when the generator itself changes
+#
+# A cache entry is only valid for the extract-theme.py that produced it, but
+# the freshness check below compares the entry against its *wallpaper* alone.
+# So a wallpaper that never changes keeps serving whatever the generator
+# emitted the first time, indefinitely — while every other theme silently
+# moves on.
+#
+# That is not hypothetical: catalina and sonoma shipped in themes.toml with
+# blocks generated in June/July, months after the rest. They carried an
+# absolute /Users/<name>/ wallpaper path (predating the `~/` normalisation)
+# and a c15 of #181818 in a *light* theme (predating the structural-ramp fix),
+# which failed the WCAG AAA gate in CI. Two real defects, both invisible here
+# because those two wallpapers had simply not been touched since.
+#
+# Keyed on the generator's CONTENT, not its mtime: `git checkout` rewrites
+# mtimes without changing behaviour, and mtime alone would force a full
+# rebuild of every theme on each checkout.
+generator_digest() {
+  if command -v shasum >/dev/null 2>&1; then
+    shasum -a 256 "$1" | awk '{print $1}'
+  elif command -v sha256sum >/dev/null 2>&1; then
+    sha256sum "$1" | awk '{print $1}'
+  else
+    # No digest tool: fall back to always regenerating rather than risk
+    # serving stale blocks. Correctness over speed.
+    echo "no-digest-tool-$(date +%s)"
+  fi
+}
+
+GENERATOR_STAMP="$CACHE_DIR/.extract-theme.sha256"
+GENERATOR_HASH="$(generator_digest "$EXTRACT_SCRIPT")"
+GENERATOR_STALE=false
+if [[ ! -f "$GENERATOR_STAMP" || "$(cat "$GENERATOR_STAMP")" != "$GENERATOR_HASH" ]]; then
+  GENERATOR_STALE=true
+  echo "Generator changed since the cache was written — rebuilding all themes."
+fi
+
 # Clean orphaned cache files (wallpapers that no longer exist)
 for cache_file in "$CACHE_DIR"/*.toml; do
   [[ -f "$cache_file" ]] || continue
@@ -328,7 +367,8 @@ for name in $(printf '%s\n' "${!WALLPAPERS[@]}" | sort); do
   wp_path="${WALLPAPERS[$name]}"
   cache_file="$CACHE_DIR/${name}.toml"
 
-  if [[ "$FORCE" != "true" && -f "$cache_file" && "$cache_file" -nt "$wp_path" ]]; then
+  if [[ "$FORCE" != "true" && "$GENERATOR_STALE" != "true" &&
+    -f "$cache_file" && "$cache_file" -nt "$wp_path" ]]; then
     CACHED=$((CACHED + 1))
     continue
   fi
@@ -463,6 +503,12 @@ success = "#479174"
 info = "#5f86b7"
 panel = "#242435"
 border = "#302f38"
+secondary = "#2d5987"
+tertiary = "#16654b"
+text_muted = "#9898a5"
+accent_on_surface = "#819dab"
+secondary_on_surface = "#7b9bc4"
+tertiary_on_surface = "#53a987"
 
 [themes.fallback-dark.app]
 nvim = "tokyonight"
@@ -472,9 +518,10 @@ gtk_theme = "Adwaita-dark"
 gtk_icon = "Papirus-Dark"
 gnome_shell = ""
 gnome_gtk = "Adwaita-dark"
-vscode = "Tokyonight Mocha"
-vscode_dark = "Tokyonight Mocha"
-vscode_light = "Tokyonight Latte"
+vscode = "Catppuccin Mocha"
+vscode_dark = "Catppuccin Mocha"
+vscode_light = "Catppuccin Latte"
+vscode_icons = "catppuccin-mocha"
 cat_wallpaper = ""
 starship_palette = "catppuccin_mocha"
 
@@ -519,6 +566,12 @@ success = "#205a48"
 info = "#2b527d"
 panel = "#f2e8bf"
 border = "#e3e0d3"
+secondary = "#85443e"
+tertiary = "#29623e"
+text_muted = "#686256"
+accent_on_surface = "#2c5989"
+secondary_on_surface = "#2b527d"
+tertiary_on_surface = "#205a48"
 
 [themes.fallback-light.app]
 nvim = "catppuccin"
@@ -531,6 +584,7 @@ gnome_gtk = "Adwaita"
 vscode = "Catppuccin Latte"
 vscode_dark = "Catppuccin Mocha"
 vscode_light = "Catppuccin Latte"
+vscode_icons = "catppuccin-latte"
 cat_wallpaper = ""
 starship_palette = "catppuccin_latte"
 FALLBACK
@@ -540,5 +594,10 @@ FALLBACK
 # subsections (which inflated the tally ~4x).
 theme_count=$(grep -cE '^\[themes\.[a-z0-9-]+\]$' "$THEMES_FILE")
 echo "  Written: $THEMES_FILE ($theme_count themes)"
+
+# Record which generator produced this cache. Written only now, after the file
+# has been assembled: stamping earlier would mark the cache current even if the
+# run died partway, so the next run would trust half-regenerated blocks.
+printf '%s\n' "$GENERATOR_HASH" >"$GENERATOR_STAMP"
 echo ""
 echo "Done. Run 'dot theme list' to see available themes."

package/scripts/theme/switch.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 ## Theme Switcher — Switch between theme families and light/dark modes.
 ##
@@ -123,30 +123,34 @@ theme_exists() {
 }
 
 all_theme_names() {
-  sed -n 's/^\[themes\.\([a-z0-9-]*\)\]$/\1/p' "$THEMES_FILE" | sort -u
+  sed -n 's/^\[themes\.\([a-zA-Z0-9-]*\)\]$/\1/p' "$THEMES_FILE" | sort -u
 }
 
 # List wallpaper families that have BOTH dark and light variants in themes.toml.
 # Only these are presented to users — unpaired wallpapers are hidden.
+#
+# This was two associative arrays. Those are bash 4 only, and macOS still
+# ships 3.2 as /bin/bash, where `local -A` fails outright ("local: -A:
+# invalid option"). Both arrays then stayed empty, so this function printed
+# nothing and `dot theme list`, `dot theme family` and the interactive picker
+# silently offered no themes at all on a stock macOS shell.
+#
+# Two newline-separated lists plus `comm` behave identically on 3.2 and 4+.
 paired_families() {
-  local -A has_dark has_light
-  local name family
+  local darks="" lights="" name family
   while IFS= read -r name; do
-    if [[ "$name" == *-dark ]]; then
-      family="${name%-dark}"
-      has_dark["$family"]=1
-    elif [[ "$name" == *-light ]]; then
-      family="${name%-light}"
-      has_light["$family"]=1
-    fi
+    case "$name" in
+      *-dark) darks="${darks}${name%-dark}"$'\n' ;;
+      *-light) lights="${lights}${name%-light}"$'\n' ;;
+    esac
   done < <(all_theme_names)
 
-  for family in $(printf '%s\n' "${!has_dark[@]}" | sort); do
-    # `fallback` is a synthetic safety theme (see themes.toml) that templates
-    # degrade to when .theme is unset/invalid — never a user-selectable one.
-    [[ "$family" == "fallback" ]] && continue
-    [[ -n "${has_light[$family]+x}" ]] && echo "$family"
-  done
+  # `fallback` is a synthetic safety theme (see themes.toml) that templates
+  # degrade to when .theme is unset/invalid — never a user-selectable one.
+  comm -12 \
+    <(printf '%s' "$darks" | sort -u) \
+    <(printf '%s' "$lights" | sort -u) |
+    grep -vxF 'fallback' || true
 }
 
 # Determine source type (system/custom) for a wallpaper family.
@@ -196,8 +200,17 @@ is_dark_theme() {
 }
 
 set_theme() {
-  local new_theme="$1"
+  local new_theme="${1:-}"
   if [ -z "$new_theme" ]; then
+    # A picker needs someone to pick. Under DOTFILES_NONINTERACTIVE the
+    # selector cannot run, and ui_pick reports "nothing selected" the same
+    # way it reports a cancel — so answering with a silent success would
+    # make a forgotten argument indistinguishable from a theme change.
+    if [ "${DOTFILES_NONINTERACTIVE:-0}" = "1" ]; then
+      ui_err "Missing theme name" "no interactive picker in a non-interactive session"
+      ui_info "Usage" "dot theme set <name>  (or 'dot theme list' to see them)"
+      return 1
+    fi
     pick_theme
     return
   fi
@@ -248,6 +261,11 @@ pick_theme() {
     else
       ui_info "Theme" "already on $current"
     fi
+  else
+    # Cancelled, or no selector could run. Either way nothing changed, and
+    # saying so beats exiting mute on a command the user asked to be
+    # interactive.
+    ui_info "Theme" "no selection — still on $current"
   fi
 }
 
@@ -399,7 +417,16 @@ case "${1:-}" in
     ;;
   set)
     shift
-    set_theme "$1"
+    # `"${1:-}"`, not `"$1"`: with no theme name the bare positional aborts
+    # the script under `set -u` before set_theme's own empty-string check can
+    # open the picker `dot help theme` promises. Worse, the abort is silent
+    # about its status on bash 3.2 (macOS /bin/bash): when a script dies on an
+    # unbound variable with an EXIT trap installed — switch.sh installs
+    # `trap cleanup EXIT` — 3.2 exits 0, and no handler can recover the status
+    # because `$?` is already 0 when the handler runs. So on a stock Mac this
+    # one missing default turned every `dot theme set` typo into a reported
+    # success. Keep every expansion in this script guarded.
+    set_theme "${1:-}"
     ;;
   toggle)
     toggle_theme

package/scripts/theme/wallpaper-rotate.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail
 

package/scripts/theme/wallpaper-sync.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail
 

package/scripts/tools/cmatrix.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail
 

package/scripts/tools/detect-collisions.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # MIT License
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 # See LICENSE file for details.
 

package/scripts/tools/emoji-picker.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 # Copyright (c) 2015-2026 Sebastien Rousseau
 set -euo pipefail