@sebastienrousseau/dotfiles 0.2.481 → 0.2.500

package/scripts/theme/wallpaper-sync.sh

@@ -1,42 +1,397 @@
-#!/bin/sh
-set -e
+#!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+set -euo pipefail
+
+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
+ui_header "Wallpaper Sync"
 
 WALLPAPER_DIR="${DOTFILES_WALLPAPER_DIR:-$HOME/Pictures/Wallpapers}"
+CHEZMOI_CFG="${XDG_CONFIG_HOME:-$HOME/.config}/chezmoi/chezmoi.toml"
+DATA_FILE="${HOME}/.dotfiles/.chezmoidata.toml"
 
+WALLPAPER_DIR_EXISTS=true
 if [ ! -d "$WALLPAPER_DIR" ]; then
-  echo "Wallpaper directory not found: $WALLPAPER_DIR"
-  exit 1
+  WALLPAPER_DIR_EXISTS=false
 fi
 
+# Detect current color scheme (light/dark)
+detect_mode() {
+  if command -v dms &>/dev/null; then
+    local dms_mode
+    dms_mode="$(dms ipc theme getMode 2>/dev/null || true)"
+    case "$dms_mode" in
+      dark | light)
+        echo "$dms_mode"
+        return 0
+        ;;
+    esac
+  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
+}
+
+MODE="$(detect_mode)"
+
+current_theme() {
+  if [[ -f "$CHEZMOI_CFG" ]]; then
+    local chezmoi_theme
+    chezmoi_theme="$(awk -F'"' '/^theme =/ {print $2}' "$CHEZMOI_CFG" | head -n 1)"
+    if [[ -n "$chezmoi_theme" ]]; then
+      printf '%s\n' "$chezmoi_theme"
+      return 0
+    fi
+  fi
+
+  if [[ -f "$DATA_FILE" ]]; then
+    awk -F'"' '/^theme =/ {print $2}' "$DATA_FILE" | head -n 1
+  fi
+}
+
+wallpaper_for_theme() {
+  local theme="${1:-}"
+  local mode="${2:-}"
+  local candidate=""
+  local family=""
+
+  [[ -n "$theme" ]] || return 1
+  [[ -n "$mode" ]] || return 1
+
+  # 1. Check themes.toml for stored wallpaper path (set by extract-theme.py)
+  local themes_file="${HOME}/.dotfiles/.chezmoidata/themes.toml"
+  if [[ -f "$themes_file" ]]; then
+    local stored_wp
+    stored_wp="$(awk -v n="$theme" '
+      $0 == "[themes." n "]" { found=1; next }
+      /^\[/ { found=0 }
+      found && /^wallpaper/ { sub(/.*= *"/, ""); sub(/".*/, ""); print; exit }
+    ' "$themes_file")"
+    if [[ -n "$stored_wp" && -f "$stored_wp" ]]; then
+      printf '%s\n' "$stored_wp"
+      return 0
+    fi
+  fi
+
+  # 2. Check custom wallpaper directory
+  for ext in heic jpg png; do
+    candidate="$WALLPAPER_DIR/${theme}.${ext}"
+    if [[ -f "$candidate" ]]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+  done
+
+  family="${theme%-dark}"
+  if [[ "$family" == "$theme" ]]; then
+    family="${theme%-light}"
+  fi
+  for ext in heic jpg png; do
+    candidate="$WALLPAPER_DIR/${family}-${mode}.${ext}"
+    if [[ -f "$candidate" ]]; then
+      printf '%s\n' "$candidate"
+      return 0
+    fi
+  done
+
+  return 1
+}
+
+# Fallback: find a matching system wallpaper when no custom one exists.
+# Maps theme names to platform-native wallpapers shipped with the OS.
+system_wallpaper_for_theme() {
+  local theme="${1:-}"
+  local mode="${2:-}"
+  local SYS_MAC="/System/Library/Desktop Pictures"
+  local SYS_LINUX_DIRS=(
+    /usr/share/backgrounds
+    /usr/share/wallpapers
+  )
+
+  [[ -n "$theme" ]] || return 1
+
+  # macOS: map theme names to Apple system wallpapers
+  if [[ "$(uname -s)" == "Darwin" && -d "$SYS_MAC" ]]; then
+    local -A mac_map=(
+      [macos - sonoma]="$SYS_MAC/Sonoma.heic"
+      [macos - blue]="$SYS_MAC/Mac Blue.heic"
+      [macos - pink]="$SYS_MAC/Mac Pink.heic"
+      [macos - purple]="$SYS_MAC/Mac Purple.heic"
+      [macos - yellow]="$SYS_MAC/Mac Yellow.heic"
+      [macos - orange]="$SYS_MAC/iMac Orange.heic"
+      [macos - green]="$SYS_MAC/iMac Green.heic"
+      [macos - silver]="$SYS_MAC/iMac Silver.heic"
+    )
+
+    # Extract family from theme name (strip -dark/-light)
+    local family="${theme%-dark}"
+    [[ "$family" == "$theme" ]] && family="${theme%-light}"
+
+    local sys_wp="${mac_map[$family]:-}"
+    if [[ -n "$sys_wp" && -f "$sys_wp" ]]; then
+      printf '%s\n' "$sys_wp"
+      return 0
+    fi
+  fi
+
+  # Linux: search system background directories for keyword match
+  if [[ "$(uname -s)" == "Linux" ]]; then
+    local keyword="${theme#macos-}"
+    keyword="${keyword%-dark}"
+    keyword="${keyword%-light}"
+
+    for dir in "${SYS_LINUX_DIRS[@]}"; do
+      [[ -d "$dir" ]] || continue
+      local match
+      match="$(find "$dir" -maxdepth 3 -type f \( -name "*.jpg" -o -name "*.png" \) \
+        -iname "*${keyword}*" 2>/dev/null | head -1)"
+      if [[ -n "$match" ]]; then
+        printf '%s\n' "$match"
+        return 0
+      fi
+    done
+  fi
+
+  return 1
+}
+
+theme_wallpaper_pair() {
+  local theme="${1:-}"
+  local family=""
+  local light_wp=""
+  local dark_wp=""
+
+  [[ -n "$theme" ]] || return 1
+
+  family="${theme%-dark}"
+  if [[ "$family" == "$theme" ]]; then
+    family="${theme%-light}"
+  fi
+
+  light_wp="$(wallpaper_for_theme "${family}-light" "light" || true)"
+  dark_wp="$(wallpaper_for_theme "${family}-dark" "dark" || true)"
+
+  if [[ -n "$light_wp" && -n "$dark_wp" ]]; then
+    printf '%s\n%s\n' "$light_wp" "$dark_wp"
+    return 0
+  fi
+
+  return 1
+}
+
+# Pick a wallpaper matching the current mode
 pick_wallpaper() {
-  find "$WALLPAPER_DIR" -type f \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' \) | head -n 1
+  local mode="$1"
+  local theme="${2:-}"
+  local files=()
+
+  if [[ -n "$theme" ]]; then
+    local matched
+    matched="$(wallpaper_for_theme "$theme" "$mode" || true)"
+    if [[ -n "$matched" ]]; then
+      printf '%s\n' "$matched"
+      return 0
+    fi
+  fi
+
+  while IFS= read -r line; do
+    files+=("$line")
+  done < <(find "$WALLPAPER_DIR" -maxdepth 1 -type f \( -iname "*-${mode}.jpg" -o -iname "*-${mode}.png" -o -iname "*-${mode}.heic" \) | sort)
+
+  if [[ ${#files[@]} -eq 0 ]]; then
+    return 1
+  fi
+
+  # Pick a random one
+  if command -v shuf &>/dev/null; then
+    printf '%s\n' "${files[@]}" | shuf -n 1
+  else
+    echo "${files[$RANDOM % ${#files[@]}]}"
+  fi
 }
 
-WALLPAPER="$(pick_wallpaper)"
-if [ -z "$WALLPAPER" ]; then
-  echo "No wallpapers found in $WALLPAPER_DIR"
-  exit 1
+THEME="$(current_theme || true)"
+WALLPAPER=""
+if [[ "$WALLPAPER_DIR_EXISTS" == "true" ]]; then
+  WALLPAPER="$(pick_wallpaper "$MODE" "$THEME" || true)"
 fi
 
-case "$(uname -s)" in
-  Darwin)
-    osascript -e "tell application \"System Events\" to set picture of every desktop to POSIX file \"$WALLPAPER\"" || true
-    ;;
-  Linux)
-    if command -v feh >/dev/null; then
-      feh --bg-fill "$WALLPAPER"
-    elif command -v swaybg >/dev/null; then
-      pkill swaybg || true
-      swaybg -i "$WALLPAPER" -m fill &
-    else
-      echo "No supported wallpaper setter found (feh/swaybg)."
-      exit 1
-    fi
-    ;;
-  *)
-    echo "Wallpaper sync not supported on this OS."
-    exit 1
-    ;;
-esac
-
-printf "Wallpaper applied: %s\n" "$WALLPAPER"
+# Fallback: try OS-native system wallpapers
+if [[ -z "$WALLPAPER" ]]; then
+  WALLPAPER="$(system_wallpaper_for_theme "$THEME" "$MODE" || true)"
+  if [[ -n "$WALLPAPER" ]]; then
+    ui_info "Wallpaper" "using system wallpaper: $(basename "$WALLPAPER")"
+  fi
+fi
+
+if [[ -z "$WALLPAPER" ]]; then
+  ui_info "Wallpaper" "no wallpaper for ${THEME:-unknown} (skipping — theme colors still apply)"
+  exit 0
+fi
+
+# Convert .heic to .png on Linux (HEIC not universally supported)
+ensure_linux_compatible() {
+  local wp="$1"
+  [[ "$(uname -s)" == "Linux" ]] || {
+    printf '%s\n' "$wp"
+    return
+  }
+  [[ "${wp##*.}" == "heic" ]] || {
+    printf '%s\n' "$wp"
+    return
+  }
+
+  local png="${wp%.heic}.png"
+  if [[ -f "$png" ]] && [[ "$png" -nt "$wp" ]]; then
+    printf '%s\n' "$png"
+    return
+  fi
+
+  if command -v magick &>/dev/null; then
+    magick "$wp" -quality 95 "$png" 2>/dev/null && {
+      printf '%s\n' "$png"
+      return
+    }
+  elif command -v heif-convert &>/dev/null; then
+    heif-convert "$wp" "$png" 2>/dev/null && {
+      printf '%s\n' "$png"
+      return
+    }
+  elif command -v convert &>/dev/null; then
+    convert "$wp" "$png" 2>/dev/null && {
+      printf '%s\n' "$png"
+      return
+    }
+  fi
+
+  # Fallback: use original and hope the DE supports it
+  printf '%s\n' "$wp"
+}
+
+# Apply wallpaper based on platform and compositor
+apply_wallpaper() {
+  local wp="$1"
+  local mode="$2"
+
+  # Convert HEIC to PNG on Linux if needed
+  wp="$(ensure_linux_compatible "$wp")"
+  local wp_uri="file://${wp}"
+
+  case "$(uname -s)" in
+    Darwin)
+      osascript -e "tell application \"System Events\" to set picture of every desktop to POSIX file \"$wp\"" || true
+      ;;
+    Linux)
+      # Niri + DMS/Quickshell uses its own wallpaper state.
+      if command -v dms &>/dev/null; then
+        local dms_result current_outputs output current_dms_mode light_wp dark_wp
+        dms_result="$(dms ipc wallpaper set "$wp" 2>/dev/null || true)"
+        if [[ "$dms_result" == SUCCESS:* ]]; then
+          ui_info "Applied via" "dms ipc wallpaper set"
+        elif [[ "$dms_result" == ERROR:\ Per-monitor\ mode\ enabled* ]]; then
+          current_outputs="$(dms ipc outputs current 2>/dev/null | tr -d '[]"')"
+          for output in ${current_outputs//,/ }; do
+            [[ -n "$output" ]] || continue
+            dms ipc wallpaper setFor "$output" "$wp" >/dev/null 2>&1 || true
+          done
+          ui_info "Applied via" "dms ipc wallpaper setFor"
+        else
+          ui_warn "DMS wallpaper" "set failed, falling back"
+        fi
+
+        # Keep DMS light/dark wallpaper slots aligned with the theme family.
+        if [[ -n "${THEME:-}" ]] && mapfile -t _pair < <(theme_wallpaper_pair "$THEME"); then
+          light_wp="${_pair[0]:-}"
+          dark_wp="${_pair[1]:-}"
+          current_dms_mode="$(dms ipc theme getMode 2>/dev/null || printf '%s\n' "$mode")"
+
+          if [[ -n "$light_wp" && -n "$dark_wp" ]]; then
+            dms ipc theme light >/dev/null 2>&1 || true
+            dms ipc wallpaper set "$light_wp" >/dev/null 2>&1 || true
+
+            dms ipc theme dark >/dev/null 2>&1 || true
+            dms ipc wallpaper set "$dark_wp" >/dev/null 2>&1 || true
+
+            if [[ "$current_dms_mode" == "light" ]]; then
+              dms ipc theme light >/dev/null 2>&1 || true
+            else
+              dms ipc theme dark >/dev/null 2>&1 || true
+            fi
+            ui_info "DMS pair" "$(basename "$light_wp"), $(basename "$dark_wp")"
+          fi
+        fi
+      fi
+
+      # gsettings-based desktop state for GTK/freedesktop consumers
+      if command -v gsettings &>/dev/null; then
+        # Find the matching pair for picture-uri and picture-uri-dark
+        local light_wp dark_wp base ext
+        ext="${wp##*.}"
+        base="${wp%-${mode}.${ext}}"
+        if [[ -f "${base}-light.${ext}" ]] && [[ -f "${base}-dark.${ext}" ]]; then
+          light_wp="${base}-light.${ext}"
+          dark_wp="${base}-dark.${ext}"
+        elif [[ -f "${base}-light.heic" ]] && [[ -f "${base}-dark.heic" ]]; then
+          light_wp="${base}-light.heic"
+          dark_wp="${base}-dark.heic"
+        elif [[ -f "${base}-light.jpg" ]] && [[ -f "${base}-dark.jpg" ]]; then
+          light_wp="${base}-light.jpg"
+          dark_wp="${base}-dark.jpg"
+        elif [[ -f "${base}-light.png" ]] && [[ -f "${base}-dark.png" ]]; then
+          light_wp="${base}-light.png"
+          dark_wp="${base}-dark.png"
+        else
+          light_wp=""
+          dark_wp=""
+        fi
+
+        if [[ -n "$light_wp" ]] && [[ -n "$dark_wp" ]]; then
+          light_wp="$(ensure_linux_compatible "$light_wp")"
+          dark_wp="$(ensure_linux_compatible "$dark_wp")"
+          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
+          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"
+        ui_info "Applied via" "gsettings"
+      elif command -v swaybg &>/dev/null; then
+        pkill swaybg || true
+        swaybg -i "$wp" -m fill &
+        ui_info "Applied via" "swaybg"
+      elif command -v feh &>/dev/null; then
+        feh --bg-fill "$wp"
+        ui_info "Applied via" "feh"
+      else
+        ui_err "Wallpaper setter" "not found (gsettings/swaybg/feh)"
+        return 1
+      fi
+      ;;
+    *)
+      ui_err "Unsupported OS" "wallpaper sync"
+      return 1
+      ;;
+  esac
+}
+
+apply_wallpaper "$WALLPAPER" "$MODE"
+if [[ -n "$THEME" ]]; then
+  ui_ok "Wallpaper applied (${MODE})" "$(basename "$WALLPAPER") ← $THEME"
+else
+  ui_ok "Wallpaper applied (${MODE})" "$(basename "$WALLPAPER")"
+fi

package/scripts/tools/cmatrix.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 if ! command -v cmatrix >/dev/null; then

package/scripts/tools/detect-collisions.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # MIT License
-# Copyright (c) 2026 Sebastien Rousseau
+# Copyright (c) 2026
 # See LICENSE file for details.
 
 import os

package/scripts/tools/emoji-picker.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 EMOJI_FILE="${EMOJI_FILE:-$HOME/.config/emoji/emoji.txt}"
@@ -36,7 +37,9 @@ fi
 
 printf '%s' "$emoji"
 
-if command -v pbcopy >/dev/null; then
+if command -v cb >/dev/null; then
+  printf '%s' "$emoji" | cb
+elif command -v pbcopy >/dev/null; then
   printf '%s' "$emoji" | pbcopy
 elif command -v wl-copy >/dev/null; then
   printf '%s' "$emoji" | wl-copy

package/scripts/tools/figlet-banner.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 text="${*:-${USER:-dotfiles}}"

package/scripts/tools/log-rotate.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 LOG_DIR="${HOME}/.local/share"
@@ -15,7 +16,7 @@ if [[ "${size}" -lt "${MAX_SIZE_BYTES}" ]]; then
   exit 0
 fi
 
-for i in $(seq ${ROTATIONS} -1 1); do
+for ((i = ROTATIONS; i >= 1; i--)); do
   if [[ -f "${LOG_FILE}.${i}.gz" ]]; then
     mv "${LOG_FILE}.${i}.gz" "${LOG_FILE}.$((i + 1)).gz"
   elif [[ -f "${LOG_FILE}.${i}" ]]; then

package/scripts/tools/lolcat-wrap.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 if command -v lolcat >/dev/null; then

package/scripts/tools/pipes.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 # Simple terminal pipes screensaver

package/scripts/tuning/linux.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 # Linux System Tuning (opt-in)
 # Managed by chezmoi - https://github.com/sebastienrousseau/dotfiles
 #
@@ -7,38 +8,46 @@
 
 set -euo pipefail
 
+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
+ui_header "Linux Tuning"
+
 if [[ "${DOTFILES_TUNING:-0}" != "1" ]]; then
-  echo "Tuning is disabled. Re-run with DOTFILES_TUNING=1 to apply."
+  ui_warn "Tuning" "disabled. Re-run with DOTFILES_TUNING=1"
   exit 0
 fi
 
 PROFILE="${DOTFILES_PROFILE:-laptop}"
 
 if [[ "$PROFILE" != "laptop" && "$PROFILE" != "desktop" && "$PROFILE" != "server" ]]; then
-  echo "DOTFILES_PROFILE must be: laptop, desktop, or server. Got: $PROFILE"
+  ui_err "DOTFILES_PROFILE" "must be laptop, desktop, or server (got: $PROFILE)"
   exit 1
 fi
 
-echo "Applying Linux tuning for profile: $PROFILE"
+ui_info "Applying tuning" "$PROFILE profile"
 
 apply_sysctl() {
   local key="$1"
   local value="$2"
   if command -v sudo >/dev/null; then
-    echo "  Setting $key = $value"
-    sudo sysctl -w "$key=$value" >/dev/null 2>&1 || echo "  Warning: Failed to set $key"
+    ui_info "Setting" "$key = $value"
+    sudo sysctl -w "$key=$value" >/dev/null 2>&1 || ui_warn "Failed to set" "$key"
   fi
 }
 
 if ! command -v sudo >/dev/null; then
-  echo "sudo not available; skipping sysctl tuning."
+  ui_warn "sudo" "not available; skipping sysctl tuning"
   exit 0
 fi
 
 # =============================================================================
 # File System Tuning
 # =============================================================================
-echo "Configuring file system settings..."
+ui_header "File system settings"
 
 # Increase inotify watchers for IDEs and file sync tools
 apply_sysctl "fs.inotify.max_user_watches" "524288"
@@ -50,7 +59,7 @@ apply_sysctl "fs.file-max" "2097152"
 # =============================================================================
 # Memory Tuning - vm.swappiness
 # =============================================================================
-echo "Configuring memory settings..."
+ui_header "Memory settings"
 
 case "$PROFILE" in
   laptop)
@@ -79,7 +88,7 @@ esac
 # =============================================================================
 # Network Tuning - TCP Keepalive
 # =============================================================================
-echo "Configuring TCP keepalive settings..."
+ui_header "TCP keepalive settings"
 
 # TCP keepalive: Detect dead connections faster
 # Default: 7200s (2 hours) - we reduce to 60s for faster detection
@@ -113,8 +122,9 @@ apply_sysctl "net.ipv4.tcp_fin_timeout" "15"
 # =============================================================================
 # Security Tuning
 # =============================================================================
-echo "Configuring security settings..."
+ui_header "Security settings"
 
+# shellcheck disable=SC1091
 # Disable IP source routing
 apply_sysctl "net.ipv4.conf.all.accept_source_route" "0"
 apply_sysctl "net.ipv4.conf.default.accept_source_route" "0"
@@ -132,7 +142,7 @@ apply_sysctl "net.ipv4.tcp_syncookies" "1"
 # =============================================================================
 # Persist Settings
 # =============================================================================
-echo "Persisting settings to /etc/sysctl.d/99-dotfiles.conf..."
+ui_header "Persisting sysctl settings"
 
 if command -v sudo >/dev/null; then
   sudo tee /etc/sysctl.d/99-dotfiles.conf >/dev/null <<'EOF'
@@ -171,5 +181,5 @@ net.ipv4.tcp_syncookies = 1
 EOF
 fi
 
-echo "Linux tuning complete for profile: $PROFILE"
-echo "Note: Some settings require a reboot to take full effect."
+ui_ok "Linux tuning complete" "$PROFILE profile"
+ui_info "Note" "Some settings require a reboot"

package/scripts/tuning/macos.sh

@@ -1,19 +1,28 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 # macOS tuning (opt-in)
 
 set -euo pipefail
 
+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
+ui_header "macOS Tuning"
+
 if [[ "${DOTFILES_TUNING:-0}" != "1" ]]; then
-  echo "Tuning is disabled. Re-run with DOTFILES_TUNING=1 to apply."
+  ui_warn "Tuning" "disabled. Re-run with DOTFILES_TUNING=1"
   exit 0
 fi
 
 if [[ "${DOTFILES_PROFILE:-}" != "laptop" && "${DOTFILES_PROFILE:-}" != "desktop" && "${DOTFILES_PROFILE:-}" != "server" ]]; then
-  echo "DOTFILES_PROFILE is not set to a known profile. Aborting."
+  ui_err "DOTFILES_PROFILE" "not set to known profile"
   exit 1
 fi
 
-echo "Applying macOS tuning..."
+ui_info "Applying" "macOS tuning"
 
 # Faster key repeat (requires logout/login to fully apply)
 defaults write -g InitialKeyRepeat -int 15
@@ -43,4 +52,4 @@ defaults write com.apple.dock autohide-delay -float 0
 defaults write com.apple.dock autohide-time-modifier -float 0.2
 killall Dock >/dev/null 2>&1 || true
 
-echo "macOS tuning complete."
+ui_ok "macOS tuning" "complete"