@sebastienrousseau/dotfiles 0.2.511 → 0.2.513

package/scripts/theme/rebuild-themes.sh

@@ -124,51 +124,99 @@ discover_linux_system() {
     /usr/share/wallpapers
   )
 
-  local dir file name
+  local dir file name variant
   for dir in "${dirs[@]}"; do
     [[ -d "$dir" ]] || continue
     while IFS= read -r file; do
       name="$(basename "$file")"
       name="${name%.*}"
-      name="$(echo "$name" | tr '[:upper:]' '[:lower:]' | tr ' ' '-')"
+      name="$(echo "$name" | tr '[:upper:]' '[:lower:]' | tr ' _' '--')"
       name="${name//[^a-z0-9-]/}"
-      # Avoid duplicates — first found wins for system
-      if [[ -z "${WALLPAPERS[$name]+x}" ]]; then
-        WALLPAPERS["$name"]="$file"
-        WP_SOURCE["$name"]="system"
+      while [[ "$name" == *--* ]]; do name="${name//--/-}"; done
+      name="${name#-}"
+      name="${name%-}"
+      [[ -n "$name" ]] || continue
+      # Static system images carry no mode; theme them in both modes so
+      # they show as a pair (unless the file is already a -dark/-light).
+      if [[ "$name" == *-dark || "$name" == *-light ]]; then
+        [[ -z "${WALLPAPERS[$name]+x}" ]] && {
+          WALLPAPERS["$name"]="$file"
+          WP_SOURCE["$name"]="system"
+        }
+        continue
       fi
-    done < <(find "$dir" -maxdepth 3 -type f \( -name "*.jpg" -o -name "*.png" -o -name "*.heic" \) 2>/dev/null | sort)
+      local key
+      for variant in dark light; do
+        key="${name}-${variant}"
+        if [[ -z "${WALLPAPERS[$key]+x}" ]]; then
+          WALLPAPERS["$key"]="$file"
+          WP_SOURCE["$key"]="system"
+        fi
+      done
+    done < <(find "$dir" -maxdepth 3 -type f \
+      \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' \
+      -o -iname '*.heic' -o -iname '*.webp' -o -iname '*.tiff' \) 2>/dev/null | sort)
   done
 }
 
 discover_custom() {
   [[ -d "$CUSTOM_DIR" ]] || return 0
 
-  local file name frame_count
-  for file in "$CUSTOM_DIR"/*.heic "$CUSTOM_DIR"/*.jpg "$CUSTOM_DIR"/*.png; do
+  local file base name ext frame_count
+  # Case-insensitive, wide extension match. The old fixed-glob loop
+  # (`*.heic *.jpg *.png`) silently dropped `.jpeg`, `.webp`, `.tiff`
+  # and every uppercase variant (`.JPG`, `.HEIC`, …), so those
+  # wallpapers never made it into the theme table.
+  while IFS= read -r file; do
     [[ -f "$file" ]] || continue
-    name="$(basename "$file")"
-    name="${name%.*}"
+    base="$(basename "$file")"
+    base="${base%.*}"
+    ext="$(echo "${file##*.}" | tr '[:upper:]' '[:lower:]')"
+
+    # Normalize to the [a-z0-9-] namespace that themes.toml and the
+    # `dot theme list` picker regex both require — a raw name with
+    # spaces/uppercase would generate a section the picker can't match.
+    name="$(echo "$base" | tr '[:upper:]' '[:lower:]' | tr ' _' '--')"
+    name="${name//[^a-z0-9-]/}"
+    while [[ "$name" == *--* ]]; do name="${name//--/-}"; done
+    name="${name#-}"
+    name="${name%-}"
+    [[ -n "$name" ]] || continue
 
-    # Check if this is a dynamic HEIC (multi-frame = light+dark in one file)
-    if [[ "${file##*.}" == "heic" ]]; then
+    # Dynamic HEIC (multi-frame = light+dark packed in one file).
+    if [[ "$ext" == "heic" ]]; then
       frame_count="$(magick identify "$file" 2>/dev/null | wc -l | tr -d ' ')"
       if [[ "$frame_count" -ge 2 && "$name" != *-dark && "$name" != *-light ]]; then
-        # Dynamic HEIC: register as both dark and light
         WALLPAPERS["${name}-light"]="${file}[0]"
         WP_SOURCE["${name}-light"]="custom"
         WALLPAPERS["${name}-dark"]="${file}[1]"
         WP_SOURCE["${name}-dark"]="custom"
-        # Store the original file path for wallpaper-sync
+        # Store the original file path for wallpaper-sync.
         WALLPAPERS["${name}"]="$file"
         WP_SOURCE["${name}"]="custom-dynamic"
         continue
       fi
     fi
 
-    WALLPAPERS["$name"]="$file"
-    WP_SOURCE["$name"]="custom"
-  done
+    # Explicitly-named single-mode variant (foo-dark.jpg / foo-light.jpg):
+    # honour the author's mode, register the one variant as-is.
+    if [[ "$name" == *-dark || "$name" == *-light ]]; then
+      WALLPAPERS["$name"]="$file"
+      WP_SOURCE["$name"]="custom"
+      continue
+    fi
+
+    # Static single image: theme it in BOTH modes (extract-theme forces
+    # the mode from the -dark/-light suffix) so it appears as a light/dark
+    # pair in `dot theme list`. Previously a static produced only one
+    # variant and paired_families() hid it entirely.
+    WALLPAPERS["${name}-dark"]="$file"
+    WP_SOURCE["${name}-dark"]="custom"
+    WALLPAPERS["${name}-light"]="$file"
+    WP_SOURCE["${name}-light"]="custom"
+  done < <(find "$CUSTOM_DIR" -maxdepth 1 -type f \
+    \( -iname '*.heic' -o -iname '*.jpg' -o -iname '*.jpeg' \
+    -o -iname '*.png' -o -iname '*.webp' -o -iname '*.tiff' \) 2>/dev/null | sort)
 }
 
 # Remove dynamic base entries (keep only the -dark/-light variants for theme gen)
@@ -181,11 +229,15 @@ cleanup_dynamic_entries() {
   done
 }
 
-# Discover in order: system first, custom overrides
-case "$(uname -s)" in
-  Darwin) discover_macos_system ;;
-  Linux) discover_linux_system ;;
-esac
+# Discover in order: system first, custom overrides. System (OS-shipped)
+# wallpapers are opt-in — most users only want themes from their own
+# wallpapers. Enable the ~100 built-in ones with DOTFILES_THEME_SYSTEM=1.
+if [[ "${DOTFILES_THEME_SYSTEM:-0}" == "1" ]]; then
+  case "$(uname -s)" in
+    Darwin) discover_macos_system ;;
+    Linux) discover_linux_system ;;
+  esac
+fi
 discover_custom
 cleanup_dynamic_entries
 
@@ -238,16 +290,29 @@ done
 # Generate themes
 # ---------------------------------------------------------------------------
 
-sys_count=0
-cust_count=0
+# Report distinct WALLPAPERS (families), not theme sections. Every
+# wallpaper — a dynamic HEIC (light+dark frames) or a static image —
+# yields a `-light` and a `-dark` theme, so a raw section count is ~2x
+# the file count and reads as wrong ("74 files → 148 custom"). Collapse
+# -dark/-light back to the family so the numbers match what's on disk
+# and what `dot theme list` shows, and report the theme total separately.
+# Explicit empty init: a `declare -A x` that never gets a key still trips
+# `set -u` on ${#x[@]} (even in bash 5) — happens now that system wallpapers
+# are opt-in and sys_fam can stay empty.
+declare -A sys_fam=() cust_fam=()
 for name in "${!WP_SOURCE[@]}"; do
+  family="${name%-dark}"
+  family="${family%-light}"
   case "${WP_SOURCE[$name]}" in
-    system) sys_count=$((sys_count + 1)) ;;
-    custom) cust_count=$((cust_count + 1)) ;;
+    system) sys_fam["$family"]=1 ;;
+    custom) cust_fam["$family"]=1 ;;
   esac
 done
+sys_count=${#sys_fam[@]}
+cust_count=${#cust_fam[@]}
 echo "Discovering wallpapers..."
-echo "  Found: $sys_count system, $cust_count custom (${#WALLPAPERS[@]} total)"
+echo "  Found: $sys_count system, $cust_count custom wallpapers" \
+  "($((sys_count + cust_count)) total → ${#WALLPAPERS[@]} light/dark themes)"
 echo ""
 
 GENERATED=0
@@ -297,11 +362,20 @@ if [[ $TOTAL_WORK -gt 0 ]]; then
   wait
 fi
 
-# Count results
-GENERATED=$(find "$CACHE_DIR" -name "*.toml" -newer "$0" 2>/dev/null | wc -l | tr -d ' ')
-FAILED=$((TOTAL_WORK - GENERATED))
+# Count results — how many of THIS run's work items produced a cache file.
+# (The old `find -newer "$0"` counted every cache file newer than the script,
+# so when everything was cached FAILED went negative.)
+GENERATED=0
+FAILED=0
+for name in "${WORK[@]}"; do
+  if [[ -f "$CACHE_DIR/${name}.toml" ]]; then
+    GENERATED=$((GENERATED + 1))
+  else
+    FAILED=$((FAILED + 1))
+  fi
+done
 echo ""
-echo "Results: $TOTAL_WORK processed, $CACHED cached, $FAILED failed"
+echo "Results: $GENERATED generated, $CACHED cached, $FAILED failed"
 
 # ---------------------------------------------------------------------------
 # Assemble themes.toml
@@ -326,14 +400,145 @@ echo "Assembling themes.toml..."
 
 HEADER
 
-  for cache_file in "$CACHE_DIR"/*.toml; do
+  # Assemble ONLY the wallpapers discovered this run, not every file left in
+  # the cache. This drops themes for wallpapers no longer present (e.g. system
+  # wallpapers once DOTFILES_THEME_SYSTEM is turned off) instead of letting
+  # stale cache entries pile up in themes.toml.
+  for name in $(printf '%s\n' "${!WALLPAPERS[@]}" | sort); do
+    cache_file="$CACHE_DIR/${name}.toml"
     [[ -f "$cache_file" ]] || continue
     echo ""
     cat "$cache_file"
   done
+
+  # Synthetic fallback themes — always emitted, never wallpaper-derived.
+  # Every theme template degrades to `fallback-dark` when `.theme` is unset or
+  # names a theme absent from this file. Because these are re-emitted on every
+  # rebuild, a regeneration that drops any wallpaper theme can never break the
+  # fallback (unlike hardcoding a wallpaper theme like the old big-sur-dark).
+  # switch.sh hides the `fallback` family from user-facing theme lists.
+  cat <<'FALLBACK'
+
+# ─────────────────────────────────────────────────────────────────────
+# Synthetic fallback themes (NOT wallpaper-derived, NEVER user-selectable).
+# ─────────────────────────────────────────────────────────────────────
+
+[themes.fallback-dark]
+mode = "dark"
+family = "fallback"
+macos_accent = 4
+wallpaper = ""
+source = "custom"
+
+[themes.fallback-dark.term]
+bg = "#1e1e2e"
+fg = "#d4d4d4"
+cursor = "#455c67"
+cursor_text = "#1e1e2e"
+sel_bg = "#394145"
+sel_fg = "#d4d4d4"
+c0  = "#3c3c4d"
+c1  = "#997d7a"
+c2  = "#479174"
+c3  = "#8a836f"
+c4  = "#5f86b7"
+c5  = "#917e8e"
+c6  = "#5c8d82"
+c7  = "#b9b8bb"
+c8  = "#605f72"
+c9  = "#bf9b97"
+c10 = "#67b293"
+c11 = "#aba389"
+c12 = "#7fa6d9"
+c13 = "#b49cb0"
+c14 = "#7bada1"
+c15 = "#e2e2e3"
+
+[themes.fallback-dark.ui]
+accent = "#455c67"
+accent_text = "#ffffff"
+error = "#997d7a"
+warning = "#8a836f"
+success = "#479174"
+info = "#5f86b7"
+panel = "#242435"
+border = "#302f38"
+
+[themes.fallback-dark.app]
+nvim = "tokyonight"
+nvim_style = "night"
+lualine = "tokyonight"
+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"
+cat_wallpaper = ""
+starship_palette = "catppuccin_mocha"
+
+
+[themes.fallback-light]
+mode = "light"
+family = "fallback"
+macos_accent = 4
+wallpaper = ""
+source = "custom"
+
+[themes.fallback-light.term]
+bg = "#fbf1c7"
+fg = "#3c3836"
+cursor = "#2c5989"
+cursor_text = "#fbf1c7"
+sel_bg = "#c6cfe0"
+sel_fg = "#3c3836"
+c0  = "#2e2c26"
+c1  = "#7d3d39"
+c2  = "#205a48"
+c3  = "#5b501d"
+c4  = "#2b527d"
+c5  = "#6e4069"
+c6  = "#25554c"
+c7  = "#6f6d67"
+c8  = "#54524b"
+c9  = "#853733"
+c10 = "#025c46"
+c11 = "#5b500b"
+c12 = "#0d5388"
+c13 = "#743b6f"
+c14 = "#15564b"
+c15 = "#979693"
+
+[themes.fallback-light.ui]
+accent = "#2c5989"
+accent_text = "#ffffff"
+error = "#7d3d39"
+warning = "#5b501d"
+success = "#205a48"
+info = "#2b527d"
+panel = "#f2e8bf"
+border = "#e3e0d3"
+
+[themes.fallback-light.app]
+nvim = "catppuccin"
+nvim_style = "latte"
+lualine = "catppuccin"
+gtk_theme = "Adwaita"
+gtk_icon = "Papirus-Light"
+gnome_shell = ""
+gnome_gtk = "Adwaita"
+vscode = "Catppuccin Latte"
+vscode_dark = "Catppuccin Mocha"
+vscode_light = "Catppuccin Latte"
+cat_wallpaper = ""
+starship_palette = "catppuccin_latte"
+FALLBACK
 } >"$THEMES_FILE"
 
-theme_count=$(grep -c '^\[themes\.' "$THEMES_FILE" | head -1)
-echo "  Written: $THEMES_FILE ($theme_count theme sections)"
+# Count top-level [themes.NAME] blocks only — not the .term/.ui/.app
+# subsections (which inflated the tally ~4x).
+theme_count=$(grep -cE '^\[themes\.[a-z0-9-]+\]$' "$THEMES_FILE")
+echo "  Written: $THEMES_FILE ($theme_count themes)"
 echo ""
 echo "Done. Run 'dot theme list' to see available themes."

package/scripts/theme/switch.sh

@@ -78,15 +78,33 @@ fi
 # Theme Database
 # =============================================================================
 
-# Default preferences
-DEFAULT_DARK="macos-monterey-dark"
-DEFAULT_LIGHT="macos-monterey-light"
+# Default preferences (must be present keys in themes.toml — the theme
+# regeneration removed the old macos-monterey-* names; bloom is the current
+# default family and always ships a dark+light pair).
+DEFAULT_DARK="bloom-dark"
+DEFAULT_LIGHT="bloom-light"
+
+# Machine-local chezmoi override (chezmoi.toml [data] theme) takes precedence
+# over .chezmoidata.toml when rendering, so it is the authoritative "current"
+# value. Kept in sync by dot-theme-sync's write_theme().
+CHEZMOI_CFG="${XDG_CONFIG_HOME:-$HOME/.config}/chezmoi/chezmoi.toml"
 
 # =============================================================================
 # Theme Functions
 # =============================================================================
 
 current_theme() {
+  # Prefer the machine-local override (what chezmoi actually renders), so
+  # `dot theme current` never disagrees with the deployed configs. Fall back
+  # to the repo default in .chezmoidata.toml when no override is set.
+  if [[ -f "$CHEZMOI_CFG" ]]; then
+    local override
+    override="$(awk -F'"' '/^theme =/ {print $2}' "$CHEZMOI_CFG" | head -n 1)"
+    if [[ -n "$override" ]]; then
+      echo "$override"
+      return 0
+    fi
+  fi
   awk -F'"' '/^theme =/ {print $2}' "$DATA_FILE" | head -n 1
 }
 
@@ -124,6 +142,9 @@ paired_families() {
   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
 }
@@ -185,12 +206,6 @@ set_theme() {
 
 # Interactive theme picker
 pick_theme() {
-  if ! command -v fzf &>/dev/null; then
-    ui_err "fzf" "required for interactive picker"
-    ui_info "Usage" "dot theme set <name>"
-    exit 1
-  fi
-
   local current
   current="$(current_theme)"
 
@@ -220,14 +235,9 @@ pick_theme() {
   done < <(paired_families)
 
   local selected_family
-  selected_family="$(echo "$theme_list" | fzf \
+  selected_family="$(printf '%s' "$theme_list" | ui_pick \
     --header "Select wallpaper theme (current: $current_family [$current_mode])" \
-    --prompt "Theme > " \
-    --height 30 \
-    --reverse \
-    --no-sort \
-    --no-preview \
-    --ansi |
+    --prompt "Theme >" |
     awk '$1 !~ /^#/ && NF >= 2 {print $2}')" || return 0
 
   if [[ -n "$selected_family" ]]; then

package/scripts/theme/wallpaper-sync.sh

@@ -43,6 +43,16 @@ detect_mode() {
     esac
   fi
 
+  if [[ "$(uname -s)" == "Darwin" ]]; then
+    # AppleInterfaceStyle is "Dark" in dark mode and unset in light mode.
+    if [[ "$(defaults read -g AppleInterfaceStyle 2>/dev/null || true)" == "Dark" ]]; then
+      echo "dark"
+    else
+      echo "light"
+    fi
+    return 0
+  fi
+
   if command -v gsettings &>/dev/null; then
     local scheme
     scheme="$(gsettings get org.gnome.desktop.interface color-scheme 2>/dev/null || echo "")"
@@ -125,10 +135,16 @@ wallpaper_for_theme() {
       found && /^wallpaper/ { sub(/.*= *"/, ""); sub(/".*/, ""); print; exit }
     ' "$themes_file")"
     if [[ -n "$stored_wp" ]]; then
-      # Cross-platform: resolve macOS paths on Linux
+      # Home-relative form (current generator): ~/Pictures/... → $HOME/Pictures/...
+      # Prefix-strip comparison avoids a quoted-tilde glob (SC2088); the tilde
+      # here is a literal leading character, not a path to expand.
+      if [[ "$stored_wp" != "${stored_wp#\~/}" ]]; then
+        stored_wp="${HOME}/${stored_wp#\~/}"
+      fi
+      # Cross-platform: resolve legacy absolute macOS paths on Linux
       if [[ ! -f "$stored_wp" ]]; then
         if [[ "$stored_wp" == /Users/* ]]; then
-          # /Users/<user>/Pictures/... → $HOME/Pictures/...
+          # /Users/<user>/Pictures/... → $HOME/Pictures/... (pre-relativize data)
           stored_wp="${HOME}/${stored_wp#/Users/*/}"
         elif [[ "$stored_wp" == /System/* ]]; then
           # macOS system wallpapers don't exist on Linux — skip to next fallback
@@ -397,6 +413,56 @@ ensure_linux_compatible() {
   printf '%s\n' "$wp"
 }
 
+# macOS: a dynamic appearance HEIC (two frames + apple_desktop:apr metadata)
+# set as a plain imageFile gets pinned to a single frame and stops tracking
+# Light/Dark — so Light mode can show the dark frame. Extract the frame that
+# matches the requested mode (0 = light, 1 = dark, per Apple's apr convention,
+# same as the Linux -0/-1 path) to a small single-image HEIC and apply that
+# instead. Single-image HEICs and non-HEICs are returned unchanged.
+macos_appearance_frame() {
+  local wp="$1" mode="$2"
+  [[ "${wp##*.}" == "heic" ]] || {
+    printf '%s\n' "$wp"
+    return
+  }
+  command -v magick &>/dev/null || {
+    printf '%s\n' "$wp"
+    return
+  }
+  local frames
+  frames="$(magick identify "$wp" 2>/dev/null | wc -l | tr -d ' ')"
+  [[ "${frames:-0}" -ge 2 ]] || {
+    printf '%s\n' "$wp"
+    return
+  }
+
+  local idx=0
+  [[ "$mode" == "dark" ]] && idx=1
+  local cache_dir="$WALLPAPER_DIR/.dot-frames"
+  mkdir -p "$cache_dir" 2>/dev/null || {
+    printf '%s\n' "$wp"
+    return
+  }
+  local frame
+  frame="$cache_dir/$(basename "${wp%.heic}")-${mode}.heic"
+
+  # Reuse a cached frame that is newer than its source wallpaper.
+  if [[ -f "$frame" && "$frame" -nt "$wp" ]]; then
+    printf '%s\n' "$frame"
+    return
+  fi
+  local tmp
+  tmp="$(mktemp "${frame%.heic}.XXXXXX.heic")"
+  if magick "${wp}[${idx}]" "$tmp" 2>/dev/null && [[ -s "$tmp" ]]; then
+    if mv -f "$tmp" "$frame" 2>/dev/null; then
+      printf '%s\n' "$frame"
+      return
+    fi
+  fi
+  rm -f "$tmp" 2>/dev/null
+  printf '%s\n' "$wp"
+}
+
 # Apply wallpaper based on platform and compositor
 apply_wallpaper() {
   local wp="$1"
@@ -408,6 +474,10 @@ apply_wallpaper() {
 
   case "$(uname -s)" in
     Darwin)
+      # Resolve a dynamic HEIC down to the mode-appropriate static frame so
+      # macOS renders the right appearance instead of pinning one frame.
+      wp="$(macos_appearance_frame "$wp" "$mode")"
+
       # macOS Sonoma+ moved wallpaper state to ~/Library/Application Support/
       # com.apple.wallpaper/Store/Index.plist, owned by WallpaperAgent. Each
       # Space and Display has its own entry, and AppleScript's `every desktop`
@@ -494,12 +564,29 @@ if updated:
 print(updated)
 PYEOF
 
-      # Restart WallpaperAgent so it re-reads the store. launchd respawns it.
-      killall WallpaperAgent 2>/dev/null || true
+      # Restart WallpaperAgent so it re-reads the store and repaints EVERY
+      # Space (the store rewrite above covers all Spaces; the agent only
+      # applies it on respawn). Then BLOCK until it's actually back and the
+      # wallpaper has re-applied — the caller reports "Done" once this returns,
+      # so it must not return while Spaces are still repainting. Set
+      # DOT_THEME_SKIP_WALLPAPER_AGENT=1 to skip the restart (faster, but
+      # background Spaces won't refresh until next login).
+      if [[ "${DOT_THEME_SKIP_WALLPAPER_AGENT:-0}" != "1" ]]; then
+        killall WallpaperAgent 2>/dev/null || true
+
+        # Wait for launchd to bring WallpaperAgent back (KeepAlive respawns it
+        # within ~1s; cap the wait so a theme switch can never hang).
+        local _waited=0
+        while ! pgrep -x WallpaperAgent >/dev/null 2>&1; do
+          sleep 0.1
+          _waited=$((_waited + 1))
+          [[ "$_waited" -ge 60 ]] && break
+        done
+      fi
 
-      # Also nudge the active Space via the public API. This covers the
-      # initial render before WallpaperAgent comes back, and handles screens
-      # the Index.plist rewrite somehow missed.
+      # Re-assert the wallpaper through the (now running) agent — covers the
+      # active Space's first paint and any screen the store rewrite missed —
+      # then give that paint a moment to finish before returning.
       if command -v wallpaper &>/dev/null; then
         wallpaper set "$wp" --screen all 2>/dev/null || true
       else
@@ -511,6 +598,7 @@ tell application \"System Events\"
     end repeat
 end tell" 2>/dev/null || true
       fi
+      sleep 0.5
       ;;
     Linux)
       # DMS owns wallpaper display and runs matugen for color extraction.