@sebastienrousseau/dotfiles 0.2.481 → 0.2.500

package/scripts/theme/switch.sh

@@ -1,7 +1,40 @@
-#!/bin/sh
-# Theme Switcher - Supports Tokyo Night and Catppuccin theme families
-# Usage: dot theme [list|set <name>|toggle|family]
-set -e
+#!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+## Theme Switcher — Switch between theme families and light/dark modes.
+##
+## Supports Tokyo Night, Catppuccin, Rose Pine, Kanagawa, and other
+## popular theme families. Updates chezmoi data and applies changes.
+##
+## # Requirements
+## - chezmoi: Dotfiles manager
+## - sed: For updating theme configuration
+##
+## # Usage
+## dot theme list              # Show all available themes
+## dot theme set NAME          # Set theme to NAME
+## dot theme toggle            # Toggle light/dark within family
+## dot theme family            # Switch between theme families
+## dot theme current           # Show current theme info
+##
+## # Platform Notes
+## - All platforms: Updates chezmoi configuration
+
+set -euo pipefail
+
+# Cleanup function for temp files
+cleanup() {
+  if [[ -n "${tmp_file:-}" ]] && [[ -f "$tmp_file" ]]; then
+    rm -f "$tmp_file"
+  fi
+}
+trap cleanup EXIT
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../dot/lib/ui.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/../dot/lib/ui.sh"
+
+ui_init
 
 resolve_source_dir() {
   if [ -n "${CHEZMOI_SOURCE_DIR:-}" ] && [ -d "$CHEZMOI_SOURCE_DIR" ]; then
@@ -21,13 +54,15 @@ resolve_source_dir() {
 
 SRC_DIR="$(resolve_source_dir)"
 if [ -z "$SRC_DIR" ]; then
-  echo "Dotfiles source not found."
+  ui_err "Dotfiles source" "not found"
   exit 1
 fi
 
 DATA_FILE="$SRC_DIR/.chezmoidata.toml"
+THEMES_FILE="$SRC_DIR/.chezmoidata/themes.toml"
+WALLPAPER_DIR="${DOTFILES_WALLPAPER_DIR:-$HOME/Pictures/Wallpapers}"
 if [ ! -f "$DATA_FILE" ]; then
-  echo "Missing $DATA_FILE"
+  ui_err "Missing" "$DATA_FILE"
   exit 1
 fi
 
@@ -36,12 +71,8 @@ fi
 # =============================================================================
 
 # Default preferences
-DEFAULT_DARK="catppuccin-mocha"
-DEFAULT_LIGHT="catppuccin-latte"
-TOKYO_DARK="tokyonight-night"
-TOKYO_LIGHT="tokyonight-day"
-CATPPUCCIN_DARK="catppuccin-mocha"
-CATPPUCCIN_LIGHT="catppuccin-latte"
+DEFAULT_DARK="macos-monterey-dark"
+DEFAULT_LIGHT="macos-monterey-light"
 
 # =============================================================================
 # Theme Functions
@@ -51,24 +82,82 @@ current_theme() {
   awk -F'"' '/^theme =/ {print $2}' "$DATA_FILE" | head -n 1
 }
 
+theme_mode() {
+  local name="${1:-}"
+  awk -v n="$name" '
+    $0 == "[themes." n "]" { found=1; next }
+    /^\[/ { found=0 }
+    found && /^mode/ { sub(/.*= *"/, ""); sub(/".*/, ""); print; exit }
+  ' "$THEMES_FILE"
+}
+
+theme_exists() {
+  local name="${1:-}"
+  grep -q "^\[themes\.${name}\]$" "$THEMES_FILE" 2>/dev/null
+}
+
+all_theme_names() {
+  sed -n 's/^\[themes\.\([a-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.
+paired_families() {
+  local -A has_dark has_light
+  local 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
+  done < <(all_theme_names)
+
+  for family in $(printf '%s\n' "${!has_dark[@]}" | sort); do
+    [[ -n "${has_light[$family]+x}" ]] && echo "$family"
+  done
+}
+
+# Determine source type (system/custom) for a wallpaper family.
+wallpaper_source() {
+  local family="${1:-}"
+  # Check for custom wallpapers: dynamic (family.heic) or split (family-dark/light.ext)
+  for ext in heic jpg png; do
+    if [[ -f "$WALLPAPER_DIR/${family}.${ext}" || -f "$WALLPAPER_DIR/${family}-dark.${ext}" || -f "$WALLPAPER_DIR/${family}-light.${ext}" ]]; then
+      echo "Custom"
+      return
+    fi
+  done
+  echo "System"
+}
+
 get_theme_family() {
-  theme="$1"
-  case "$theme" in
-    tokyonight-*) echo "tokyonight" ;;
-    catppuccin-*) echo "catppuccin" ;;
-    rose-pine*) echo "rose-pine" ;;
-    kanagawa-*) echo "kanagawa" ;;
-    gruvbox-*) echo "gruvbox" ;;
-    solarized-*) echo "solarized" ;;
-    everforest-*) echo "everforest" ;;
-    *) echo "other" ;;
-  esac
+  local theme="${1:-}"
+  # Read family from themes.toml if available
+  if [[ -f "$THEMES_FILE" ]]; then
+    local family
+    family="$(awk -v n="$theme" '
+      $0 == "[themes." n "]" { found=1; next }
+      /^\[/ { found=0 }
+      found && /^family/ { sub(/.*= *"/, ""); sub(/".*/, ""); print; exit }
+    ' "$THEMES_FILE")"
+    if [[ -n "$family" ]]; then
+      echo "$family"
+      return
+    fi
+  fi
+  # Fallback: strip -dark/-light suffix
+  local family="${theme%-dark}"
+  [[ "$family" != "$theme" ]] || family="${theme%-light}"
+  echo "$family"
 }
 
 is_dark_theme() {
-  theme="$1"
+  local theme="${1:-}"
   case "$theme" in
-    *-night | *-storm | *-moon | *-mocha | *-frappe | *-macchiato | *-dark | *-wave | *-dragon | dracula | nord | onedark)
+    *-dark)
       return 0
       ;;
     *)
@@ -78,135 +167,198 @@ is_dark_theme() {
 }
 
 set_theme() {
-  new_theme="$1"
+  local new_theme="$1"
   if [ -z "$new_theme" ]; then
-    echo "Theme name required."
+    pick_theme
+    return
+  fi
+  dot-theme-sync "$new_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
-  # Validate theme name: only allow alphanumeric, hyphens, underscores
-  case "$new_theme" in
-    *[!a-zA-Z0-9_-]*)
-      echo "Invalid theme name: $new_theme" >&2
-      echo "Theme names may only contain letters, digits, hyphens, and underscores." >&2
-      exit 1
-      ;;
-  esac
 
-  tmp_file="$(mktemp)"
-  if grep -q '^theme = ' "$DATA_FILE"; then
-    sed "s/^theme = .*/theme = \"$new_theme\"/" "$DATA_FILE" >"$tmp_file"
-  else
-    cat "$DATA_FILE" >"$tmp_file"
-    echo "theme = \"$new_theme\"" >>"$tmp_file"
+  local current
+  local current="$(current_theme)"
+
+  if [[ ! -f "$THEMES_FILE" ]]; then
+    ui_err "Missing" "$THEMES_FILE"
+    exit 1
+  fi
+
+  local current_family="${current%-dark}"
+  [[ "$current_family" != "$current" ]] || current_family="${current%-light}"
+  local current_mode="dark"
+  is_dark_theme "$current" 2>/dev/null || current_mode="light"
+
+  # Build theme list: one row per family, shows active mode
+  local theme_list=""
+  local family source marker active_mode
+  while IFS= read -r family; do
+    [[ -n "$family" ]] || continue
+    source="$(wallpaper_source "$family")"
+    marker="○"
+    active_mode=""
+    if [[ "$family" == "$current_family" ]]; then
+      marker="✓"
+      active_mode="$current_mode"
+    fi
+    theme_list+="$(printf '%s  %-35s  %-8s  %s' "$marker" "$family" "$source" "$active_mode")"$'\n'
+  done < <(paired_families)
+
+  local selected_family
+  selected_family="$(echo "$theme_list" | fzf \
+    --header "Select wallpaper theme (current: $current_family [$current_mode])" \
+    --prompt "Theme > " \
+    --height 30 \
+    --reverse \
+    --no-sort \
+    --no-preview \
+    --ansi |
+    awk '$1 !~ /^#/ && NF >= 2 {print $2}')" || return 0
+
+  if [[ -n "$selected_family" ]]; then
+    # Apply with current appearance mode (dark/light)
+    local new_theme="${selected_family}-${current_mode}"
+    if [[ "$new_theme" != "$current" ]]; then
+      dot-theme-sync "$new_theme"
+    else
+      ui_info "Theme" "already on $current"
+    fi
   fi
-  mv "$tmp_file" "$DATA_FILE"
-  echo "Theme set to: $new_theme"
-  echo "Applying dotfiles..."
-  chezmoi apply --force 2>/dev/null || chezmoi apply
 }
 
 list_themes() {
-  echo "=== Catppuccin (Recommended) ==="
-  echo "  catppuccin-latte      (light)"
-  echo "  catppuccin-frappe     (dark - muted)"
-  echo "  catppuccin-macchiato  (dark - balanced)"
-  echo "  catppuccin-mocha      (dark - rich)"
-  echo ""
-  echo "=== Tokyo Night ==="
-  echo "  tokyonight-day        (light)"
-  echo "  tokyonight-storm      (dark - muted)"
-  echo "  tokyonight-night      (dark - default)"
-  echo "  tokyonight-moon       (dark - softer)"
-  echo ""
-  echo "=== Rose Pine ==="
-  echo "  rose-pine             (dark)"
-  echo "  rose-pine-moon        (dark - softer)"
-  echo "  rose-pine-dawn        (light)"
-  echo ""
-  echo "=== Kanagawa ==="
-  echo "  kanagawa-wave         (dark - default)"
-  echo "  kanagawa-dragon       (dark - vibrant)"
-  echo "  kanagawa-lotus        (light)"
-  echo ""
-  echo "=== Other ==="
-  echo "  dracula               (dark)"
-  echo "  gruvbox-light         (light)"
-  echo "  gruvbox-dark          (dark)"
-  echo "  nord                  (dark)"
-  echo "  onelight              (light)"
-  echo "  onedark               (dark)"
-  echo "  solarized-light       (light)"
-  echo "  solarized-dark        (dark)"
-  echo "  everforest-light      (light)"
-  echo "  everforest-dark       (dark)"
+  local current="$(current_theme)"
+  local current_family="${current%-dark}"
+  [[ "$current_family" != "$current" ]] || current_family="${current%-light}"
+
+  local count=0
+  local family source
+
+  printf '  %-35s  %s\n' "WALLPAPER" "SOURCE"
+  printf '  %-35s  %s\n' "---------" "------"
+  while IFS= read -r family; do
+    [[ -n "$family" ]] || continue
+    source="$(wallpaper_source "$family")"
+    if [[ "$family" == "$current_family" ]]; then
+      ui_ok "$family" "$source ◀"
+    else
+      printf '  %-35s  %s\n' "$family" "$source"
+    fi
+    count=$((count + 1))
+  done < <(paired_families)
+
   echo ""
-  echo "Current theme: $(current_theme)"
+  ui_info "Current" "$(current_theme) ($count wallpaper themes available)"
 }
 
 # Toggle between light and dark within the same family, or switch families
 toggle_theme() {
-  current="$(current_theme)"
-  family="$(get_theme_family "$current")"
+  local current="$(current_theme)"
 
   if is_dark_theme "$current"; then
-    # Currently dark, switch to light variant
-    case "$family" in
-      tokyonight) set_theme "$TOKYO_LIGHT" ;;
-      catppuccin) set_theme "$CATPPUCCIN_LIGHT" ;;
-      rose-pine) set_theme "rose-pine-dawn" ;;
-      kanagawa) set_theme "kanagawa-lotus" ;;
-      gruvbox) set_theme "gruvbox-light" ;;
-      solarized) set_theme "solarized-light" ;;
-      everforest) set_theme "everforest-light" ;;
-      *) set_theme "$DEFAULT_LIGHT" ;;
-    esac
+    if [[ "$current" == *-dark ]]; then
+      set_theme "${current%-dark}-light"
+    else
+      set_theme "$DEFAULT_LIGHT"
+    fi
   else
-    # Currently light, switch to dark variant
-    case "$family" in
-      tokyonight) set_theme "$TOKYO_DARK" ;;
-      catppuccin) set_theme "$CATPPUCCIN_DARK" ;;
-      rose-pine) set_theme "rose-pine" ;;
-      kanagawa) set_theme "kanagawa-wave" ;;
-      gruvbox) set_theme "gruvbox-dark" ;;
-      solarized) set_theme "solarized-dark" ;;
-      everforest) set_theme "everforest-dark" ;;
-      *) set_theme "$DEFAULT_DARK" ;;
-    esac
+    if [[ "$current" == *-light ]]; then
+      set_theme "${current%-light}-dark"
+    else
+      set_theme "$DEFAULT_DARK"
+    fi
   fi
 }
 
-# Switch between Tokyo Night and Catppuccin families
+# Switch to the next wallpaper family while preserving mode.
 switch_family() {
-  current="$(current_theme)"
-  family="$(get_theme_family "$current")"
+  local current="$(current_theme)"
+  local family="$(get_theme_family "$current")"
+  local mode="dark"
+  local families=()
+  local idx=0
+  local next_family=""
 
-  if is_dark_theme "$current"; then
-    # Stay in dark mode, switch family
-    case "$family" in
-      tokyonight) set_theme "$CATPPUCCIN_DARK" ;;
-      catppuccin) set_theme "$TOKYO_DARK" ;;
-      *) set_theme "$CATPPUCCIN_DARK" ;;
-    esac
-  else
-    # Stay in light mode, switch family
-    case "$family" in
-      tokyonight) set_theme "$CATPPUCCIN_LIGHT" ;;
-      catppuccin) set_theme "$TOKYO_LIGHT" ;;
-      *) set_theme "$CATPPUCCIN_LIGHT" ;;
-    esac
+  if [[ "$current" == *-light ]]; then
+    mode="light"
+  fi
+
+  while IFS= read -r name; do
+    [[ -n "$name" ]] || continue
+    families+=("$name")
+  done < <(paired_families)
+
+  if [[ ${#families[@]} -eq 0 ]]; then
+    set_theme "$DEFAULT_DARK"
+    return
   fi
+
+  for idx in "${!families[@]}"; do
+    if [[ "${families[$idx]}" == "$family" ]]; then
+      next_family="${families[$(((idx + 1) % ${#families[@]}))]}"
+      break
+    fi
+  done
+
+  if [[ -z "$next_family" ]]; then
+    next_family="${families[0]}"
+  fi
+
+  set_theme "${next_family}-${mode}"
 }
 
 # Show current theme info
 show_current() {
-  current="$(current_theme)"
-  family="$(get_theme_family "$current")"
-  if is_dark_theme "$current"; then
-    mode="dark"
-  else
+  local current="$(current_theme)"
+  local family="$(get_theme_family "$current")"
+  local mode="dark"
+  if ! is_dark_theme "$current" 2>/dev/null; then
     mode="light"
   fi
-  echo "Current: $current ($family, $mode)"
+  ui_info "Current" "$current ($family, $mode)"
+}
+
+# Detect system appearance (Dark/Light) and sync dotfiles
+sync_theme() {
+  local os_mode="dark" # Default fallback
+  case "$(uname -s)" in
+    Darwin)
+      if defaults read -g AppleInterfaceStyle >/dev/null 2>&1; then
+        os_mode="dark"
+      else
+        os_mode="light"
+      fi
+      ;;
+    Linux)
+      if command -v gsettings >/dev/null 2>&1; then
+        # Check GNOME color scheme
+        local scheme=scheme=$(gsettings get org.gnome.desktop.interface color-scheme 2>/dev/null | tr -d "'")
+        if [[ "$scheme" == "prefer-light" ]]; then
+          os_mode="light"
+        else
+          os_mode="dark"
+        fi
+      fi
+      ;;
+  esac
+
+  local current="$(current_theme)"
+  if is_dark_theme "$current" && [[ "$os_mode" == "light" ]]; then
+    ui_info "Sync" "System is light, switching dotfiles to light..."
+    toggle_theme
+  elif ! is_dark_theme "$current" && [[ "$os_mode" == "dark" ]]; then
+    ui_info "Sync" "System is dark, switching dotfiles to dark..."
+    toggle_theme
+  else
+    ui_ok "Sync" "Dotfiles already match system ($os_mode mode)"
+  fi
 }
 
 # =============================================================================
@@ -224,27 +376,46 @@ case "${1:-}" in
   toggle)
     toggle_theme
     ;;
+  sync)
+    sync_theme
+    ;;
   family)
     switch_family
     ;;
   current)
     show_current
     ;;
-  "")
-    echo "Usage: dot theme [command]"
+  rebuild)
+    shift
+    bash "$SCRIPT_DIR/rebuild-themes.sh" "$@"
+    ;;
+  help | --help | -h)
+    ui_header "Usage"
+    ui_info "dot theme" "[command]"
     echo ""
-    echo "Commands:"
-    echo "  list      Show all available themes"
-    echo "  set NAME  Set theme to NAME"
-    echo "  toggle    Toggle between light/dark within current family"
-    echo "  family    Switch between Tokyo Night and Catppuccin families"
-    echo "  current   Show current theme info"
+    ui_header "Commands"
+    ui_ok "(no args)" "Interactive theme picker (fzf)"
+    ui_ok "list" "Show all available themes"
+    ui_ok "set [NAME]" "Set theme (interactive if no name)"
+    ui_ok "toggle" "Toggle between light/dark within current family"
+    ui_ok "family" "Cycle between theme families"
+    ui_ok "current" "Show current theme info"
+    ui_ok "sync" "Sync dotfiles with system dark/light mode"
+    ui_ok "rebuild" "Regenerate themes from system + custom wallpapers"
     echo ""
     show_current
     ;;
+  "")
+    pick_theme
+    ;;
   *)
-    echo "Unknown theme command: $1"
-    echo "Usage: dot theme [list|set <name>|toggle|family|current]"
-    exit 1
+    # Treat unknown args as theme names for quick switching: dot theme macos-sequoia-dark
+    if grep -q "^\[themes\.${1}\]" "$THEMES_FILE" 2>/dev/null; then
+      dot-theme-sync "$1"
+    else
+      ui_err "Unknown command or theme" "$1"
+      ui_info "Usage" "dot theme [list|set <name>|toggle|family|current|help]"
+      exit 1
+    fi
     ;;
 esac

package/scripts/theme/wallpaper-rotate.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 WALLPAPER_DIR="${DOTFILES_WALLPAPER_DIR:-$HOME/Pictures/Wallpapers}"
@@ -15,6 +16,14 @@ while [[ $# -gt 0 ]]; do
       ONCE=1
       shift
       ;;
+    --light)
+      FORCE_MODE="light"
+      shift
+      ;;
+    --dark)
+      FORCE_MODE="dark"
+      shift
+      ;;
     *)
       shift
       ;;
@@ -26,37 +35,78 @@ if [[ ! -d "$WALLPAPER_DIR" ]]; then
   exit 1
 fi
 
+# Detect current color scheme (light/dark)
+detect_mode() {
+  if [[ -n "${FORCE_MODE:-}" ]]; then
+    echo "$FORCE_MODE"
+    return
+  fi
+  if command -v gsettings &>/dev/null; then
+    local scheme
+    scheme="$(gsettings get org.gnome.desktop.interface color-scheme 2>/dev/null || echo "")"
+    case "$scheme" in
+      *dark*) echo "dark" ;;
+      *) echo "light" ;;
+    esac
+  else
+    echo "dark"
+  fi
+}
+
+# Pick a random wallpaper matching mode, excluding the given path
 pick_wallpaper() {
-  local files
-  files=()
+  local mode="$1"
+  local exclude="${2:-}"
+  local files=()
   while IFS= read -r line; do
+    [[ "$line" == "$exclude" ]] && continue
     files+=("$line")
-  done < <(find "$WALLPAPER_DIR" -type f \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' \))
+  done < <(find "$WALLPAPER_DIR" -maxdepth 1 -type f -iname "*-${mode}.jpg")
+
   if [[ ${#files[@]} -eq 0 ]]; then
     return 1
   fi
+
   if command -v shuf &>/dev/null; then
     printf '%s\n' "${files[@]}" | shuf -n 1
   else
-    # macOS fallback using $RANDOM
     echo "${files[$RANDOM % ${#files[@]}]}"
   fi
 }
 
 apply_wallpaper() {
   local wp="$1"
+  local mode="$2"
+
   case "$(uname -s)" in
     Darwin)
       osascript -e "tell application \"System Events\" to set picture of every desktop to POSIX file \"$wp\"" || true
       ;;
     Linux)
-      if command -v feh >/dev/null; then
-        feh --bg-fill "$wp"
-      elif command -v swaybg >/dev/null; then
+      if command -v gsettings &>/dev/null; then
+        local light_wp dark_wp
+        local base="${wp%-${mode}.jpg}"
+        light_wp="${base}-light.jpg"
+        dark_wp="${base}-dark.jpg"
+
+        if [[ -f "$light_wp" ]] && [[ -f "$dark_wp" ]]; then
+          gsettings set org.gnome.desktop.background picture-uri "file://${light_wp}"
+          gsettings set org.gnome.desktop.background picture-uri-dark "file://${dark_wp}"
+          gsettings set org.gnome.desktop.screensaver picture-uri "file://${light_wp}"
+        else
+          local wp_uri="file://${wp}"
+          gsettings set org.gnome.desktop.background picture-uri "$wp_uri"
+          gsettings set org.gnome.desktop.background picture-uri-dark "$wp_uri"
+          gsettings set org.gnome.desktop.screensaver picture-uri "$wp_uri"
+        fi
+        gsettings set org.gnome.desktop.background picture-options "zoom"
+      elif command -v swaybg &>/dev/null; then
         pkill swaybg || true
         swaybg -i "$wp" -m fill &
+      elif command -v feh &>/dev/null; then
+        feh --bg-fill "$wp"
       else
-        echo "No supported wallpaper setter found (feh/swaybg)." >&2
+        echo "No supported wallpaper setter found (gsettings/swaybg/feh)." >&2
         return 1
       fi
       ;;
@@ -67,14 +117,18 @@ apply_wallpaper() {
   esac
 }
 
+LAST_WP=""
+
 while true; do
-  wp=$(pick_wallpaper)
+  MODE="$(detect_mode)"
+  wp="$(pick_wallpaper "$MODE" "$LAST_WP" || true)"
   if [[ -z "$wp" ]]; then
-    echo "No wallpapers found in $WALLPAPER_DIR" >&2
+    echo "No ${MODE} wallpapers found in $WALLPAPER_DIR" >&2
     exit 1
   fi
-  apply_wallpaper "$wp"
-  echo "Wallpaper applied: $wp"
+  apply_wallpaper "$wp" "$MODE"
+  LAST_WP="$wp"
+  echo "Wallpaper applied (${MODE}): $(basename "$wp")"
   if [[ "$ONCE" -eq 1 ]]; then
     break
   fi