Deepen dotfiles architecture modules

Author: mswell

CONTEXT.md

@@ -0,0 +1,31 @@
+# Dotfiles Domain Context
+
+This repository manages a Linux development environment through a few load-bearing concepts:
+
+## Installer setup plan
+
+An **installer setup plan** maps a top-level installer menu option to the ordered setup scripts that should run. Plans preserve the existing `install.sh` menu while making ordering, dry-run validation, logging, and failure behavior explicit.
+
+## Dotfiles installation manifest
+
+A **dotfiles installation manifest** is the auditable list of source-to-destination rules used to install config files. Manifest entries describe directory creation, file copies, directory copies, symlinks, executable bits, and idempotent install behavior without requiring a real home directory during tests.
+
+## Theme orchestration
+
+**Theme orchestration** owns supported theme names, current-theme persistence, first-install theme initialization, runtime theme switching, component-specific theme actions, generated settings, symlinks, and reload actions. Runtime switching and first-install defaults should use the same orchestration path.
+
+## Hacktools inventory
+
+A **hacktools inventory** is the structured definition of bug bounty tools, ProjectDiscovery tools, Go installs, Python installs, repository installs, wordlists, required paths, and post-install actions. Inventory planning must be inspectable without installing external tools.
+
+## Recon workspace pipeline
+
+A **recon workspace pipeline** is the explicit set of recon stages, their required input files, produced output files, and shared scan helpers. Existing shell function names remain the user-facing interface, while stage contracts make missing workspace artifacts easier to diagnose.
+
+## Shell runtime bootstrap
+
+**Shell runtime bootstrap** is the shell startup behavior needed for interactive use: path composition, completions, runtime config, and theme reload compatibility. Install-time plugin/tool setup should stay outside normal shell startup.
+
+## Mongo recon store
+
+A **Mongo recon store** is the persistence boundary for recon data. CLI commands adapt user input to store operations, while parsing, duplicate detection, listing, deletion, and persistence are testable through Mongo-backed and in-memory adapters.

config/hypr/scripts/theme-switch.sh

@@ -2,234 +2,18 @@
 # theme-switch.sh — Cycle or set desktop theme
 # Usage: theme-switch.sh [vantablack|white|tokyonight|next]
 
-HYPR_THEMES="$HOME/.config/hypr/themes"
-WAYBAR_THEMES="$HOME/.config/waybar/themes"
-KITTY_THEMES="$HOME/.config/kitty/themes"
-ROFI_COLORS="$HOME/.config/rofi/colors"
-TMUX_THEMES="$HOME/.config/tmux/themes"
-FZF_THEMES="$HOME/.config/fzf/themes"
-ZSH_THEMES="$HOME/.config/zsh/themes"
-KVANTUM_THEMES="$HOME/.config/Kvantum/themes"
-BAT_THEMES="$HOME/.config/bat/themes"
-GIT_THEMES="$HOME/.config/git/themes"
-CURRENT_FILE="$HOME/.config/hypr/current-theme"
-BG_DIR="$HOME/.config/backgrounds"
+set -euo pipefail
 
-THEMES=(vantablack white tokyonight)
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+DOTFILES_ROOT="${DOTFILES:-${DOTFILES_PATH:-$HOME/Projects/dotfiles}}"
 
-# Determine target theme
-if [[ "$1" == "next" || "$1" == "toggle" ]]; then
-    current=$(cat "$CURRENT_FILE" 2>/dev/null || echo "vantablack")
-    for i in "${!THEMES[@]}"; do
-        if [[ "${THEMES[$i]}" == "$current" ]]; then
-            THEME="${THEMES[$(( (i + 1) % ${#THEMES[@]} ))]}"
-            break
-        fi
-    done
-    THEME="${THEME:-vantablack}"
-elif [[ "$1" == "vantablack" || "$1" == "white" || "$1" == "tokyonight" ]]; then
-    THEME="$1"
+if [[ -f "$DOTFILES_ROOT/setup/lib/theme_orchestrator.sh" ]]; then
+    source "$DOTFILES_ROOT/setup/lib/theme_orchestrator.sh"
+elif [[ -f "$SCRIPT_DIR/../../../setup/lib/theme_orchestrator.sh" ]]; then
+    source "$SCRIPT_DIR/../../../setup/lib/theme_orchestrator.sh"
 else
-    echo "Usage: theme-switch.sh [vantablack|white|tokyonight|next]"
+    echo "theme_orchestrator.sh not found. Set DOTFILES or DOTFILES_PATH." >&2
     exit 1
 fi
 
-# Hyprland + Hyprlock colors
-ln -sf "$HYPR_THEMES/$THEME.conf" "$HOME/.config/hypr/colors.conf"
-
-# Waybar CSS
-ln -sf "$WAYBAR_THEMES/$THEME.css" "$HOME/.config/waybar/themes/current.css"
-
-# Kitty — symlink must match the include name in kitty.conf
-ln -sf "$KITTY_THEMES/$THEME.conf" "$HOME/.config/kitty/current-theme.conf"
-kill -SIGUSR1 $(pgrep -x kitty) 2>/dev/null
-
-# Rofi (kept as fallback)
-ln -sf "$ROFI_COLORS/$THEME.rasi" "$HOME/.config/rofi/colors/current.rasi"
-
-# Walker — update theme and restart service so it reloads config
-WALKER_CFG="$HOME/.config/walker/config.toml"
-if [[ -f "$WALKER_CFG" ]]; then
-    sed -i "s/^theme = .*/theme = \"$THEME\"/" "$WALKER_CFG"
-    pkill -x walker 2>/dev/null
-    sleep 0.2
-    walker --gapplication-service &
-fi
-
-# Tmux
-ln -sf "$TMUX_THEMES/$THEME.conf" "$HOME/.config/tmux/current-theme.conf"
-tmux source-file ~/.tmux.conf 2>/dev/null
-
-# fzf — new shells will pick up the theme via .zshrc sourcing current-theme.sh
-mkdir -p "$HOME/.config/fzf"
-ln -sf "$FZF_THEMES/$THEME.sh" "$HOME/.config/fzf/current-theme.sh"
-
-# Update FZF_DEFAULT_OPTS in running tmux instances and send SIGUSR1 to shells if possible
-if command -v tmux &>/dev/null && tmux info &>/dev/null; then
-    # We evaluate the script in a clean subshell to get the final FZF_DEFAULT_OPTS
-    # We pass the current FZF_DEFAULT_OPTS to avoid losing other configuration
-    CURRENT_FZF=$(tmux show-environment FZF_DEFAULT_OPTS 2>/dev/null | sed 's/^FZF_DEFAULT_OPTS=//' || echo "")
-    NEW_FZF_OPTS=$(env -i bash -c "export FZF_DEFAULT_OPTS='$CURRENT_FZF'; source $HOME/.config/fzf/current-theme.sh && echo \"\$FZF_DEFAULT_OPTS\"")
-    if [[ -n "$NEW_FZF_OPTS" ]]; then
-        tmux set-environment -g FZF_DEFAULT_OPTS "$NEW_FZF_OPTS"
-    fi
-fi
-
-# Send SIGUSR1 to zsh instances to ask them to reload fzf config if they trap it
-# Not all shells trap SIGUSR1 by default, but we can update tmux for now
-killall -SIGUSR1 zsh 2>/dev/null || true
-
-
-# ZSH — p10k + autosuggestions colors (new shells pick up via .zshrc)
-mkdir -p "$HOME/.config/zsh/themes"
-ln -sf "$ZSH_THEMES/$THEME.zsh" "$HOME/.config/zsh/current-theme.zsh"
-
-# Kvantum / Qt apps — keep Qt in the same theme flow
-if [[ -d "$KVANTUM_THEMES" ]]; then
-    mkdir -p "$HOME/.config/Kvantum"
-    ln -sf "$KVANTUM_THEMES/$THEME.kvconfig" "$HOME/.config/Kvantum/kvantum.kvconfig"
-fi
-
-# bat — theme selected via symlinked config file
-if [[ -d "$BAT_THEMES" ]]; then
-    mkdir -p "$HOME/.config/bat"
-    ln -sf "$BAT_THEMES/$THEME.conf" "$HOME/.config/bat/config"
-fi
-
-# git-delta — include a theme-specific gitconfig fragment
-if [[ -d "$GIT_THEMES" ]]; then
-    mkdir -p "$HOME/.config/git"
-    ln -sf "$GIT_THEMES/$THEME.gitconfig" "$HOME/.config/git/current-theme.gitconfig"
-fi
-
-# Wallpaper via wpaperd — generate config with per-output rotation workaround
-if [[ -d "$BG_DIR/$THEME" ]]; then
-    "$HOME/.config/hypr/scripts/wpaperd-set.sh" "$BG_DIR/$THEME"
-fi
-
-# Reload Hyprland (picks up colors.conf)
-hyprctl reload
-
-# Reload Waybar
-sleep 0.3
-if ! pkill -SIGUSR2 waybar 2>/dev/null; then
-    pkill waybar 2>/dev/null
-    sleep 0.2
-    waybar &
-fi
-
-# GTK + icon + cursor theme sync
-# gsettings → propagates to running GTK4/libadwaita apps via xdg-desktop-portal-gtk
-# settings.ini → applies at launch for GTK3 apps without a settings daemon
-if [[ "$THEME" == "white" ]]; then
-    GTK_THEME_NAME="Adwaita"
-    GTK_DARK="0"
-    GTK_COLOR_SCHEME="prefer-light"
-    GTK_ICONS="Papirus-Light"
-    GTK_CURSOR="Bibata-Modern-Ice"
-else
-    GTK_THEME_NAME="Adwaita-dark"
-    GTK_DARK="1"
-    GTK_COLOR_SCHEME="prefer-dark"
-    GTK_ICONS="Papirus-Dark"
-    GTK_CURSOR="Bibata-Modern-Classic"
-fi
-
-# Write GTK3 settings.ini (read at app launch; no daemon needed)
-mkdir -p "$HOME/.config/gtk-3.0"
-cat > "$HOME/.config/gtk-3.0/settings.ini" <<EOF
-[Settings]
-gtk-theme-name=$GTK_THEME_NAME
-gtk-icon-theme-name=$GTK_ICONS
-gtk-cursor-theme-name=$GTK_CURSOR
-gtk-cursor-theme-size=24
-gtk-font-name=Adwaita Sans 11
-gtk-application-prefer-dark-theme=$GTK_DARK
-EOF
-
-# Write GTK4 settings.ini (libadwaita dark/light toggle)
-mkdir -p "$HOME/.config/gtk-4.0"
-cat > "$HOME/.config/gtk-4.0/settings.ini" <<EOF
-[Settings]
-gtk-application-prefer-dark-theme=$GTK_DARK
-gtk-icon-theme-name=$GTK_ICONS
-gtk-cursor-theme-name=$GTK_CURSOR
-gtk-cursor-theme-size=24
-EOF
-
-# Write GTK2 gtkrc for older apps
-cat > "$HOME/.gtkrc-2.0" <<EOF
-# Managed by ~/.config/hypr/scripts/theme-switch.sh
-gtk-theme-name="$GTK_THEME_NAME"
-gtk-icon-theme-name="$GTK_ICONS"
-gtk-font-name="Adwaita Sans 11"
-gtk-cursor-theme-name="$GTK_CURSOR"
-gtk-cursor-theme-size=24
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=0
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle="hintslight"
-gtk-xft-rgba="rgb"
-EOF
-
-# Keep ~/.icons/default aligned for apps that still read index.theme
-mkdir -p "$HOME/.icons/default"
-cat > "$HOME/.icons/default/index.theme" <<EOF
-[Icon Theme]
-Inherits=$GTK_CURSOR
-EOF
-
-# Notify running GTK apps via dconf/xdg-desktop-portal-gtk
-gsettings set org.gnome.desktop.interface color-scheme   "$GTK_COLOR_SCHEME"
-gsettings set org.gnome.desktop.interface gtk-theme      "$GTK_THEME_NAME"
-gsettings set org.gnome.desktop.interface icon-theme     "$GTK_ICONS"
-gsettings set org.gnome.desktop.interface cursor-theme   "$GTK_CURSOR"
-gsettings set org.gnome.desktop.interface cursor-size    24
-
-# Apply cursor live in Hyprland (compositor + all new X/Wayland clients)
-hyprctl setcursor "$GTK_CURSOR" 24
-
-# Quit Nautilus completely (including daemon) so it reloads icon theme on next open
-nautilus -q 2>/dev/null
-
-# Mako — update colors and reload (Omarchy pattern: text/border/background from theme)
-if command -v mako &>/dev/null; then
-    MAKO_CFG="$HOME/.config/mako/config"
-    if [[ "$THEME" == "white" ]]; then
-        MAKO_TEXT="#000000"; MAKO_BORDER="#6e6e6e"; MAKO_BG="#ffffff"
-    elif [[ "$THEME" == "tokyonight" ]]; then
-        MAKO_TEXT="#c0caf5"; MAKO_BORDER="#7aa2f7"; MAKO_BG="#1a1b26"
-    else
-        MAKO_TEXT="#ffffff"; MAKO_BORDER="#8d8d8d"; MAKO_BG="#000000"
-    fi
-    sed -i "s/^text-color=.*/text-color=$MAKO_TEXT/" "$MAKO_CFG"
-    sed -i "s/^border-color=.*/border-color=$MAKO_BORDER/" "$MAKO_CFG"
-    sed -i "s/^background-color=.*/background-color=$MAKO_BG/" "$MAKO_CFG"
-    makoctl reload 2>/dev/null
-fi
-
-# Pi coding agent — use named theme if installed, fallback to dark/light
-PI_SETTINGS="$HOME/.pi/agent/settings.json"
-if [[ -f "$PI_SETTINGS" ]]; then
-    if [[ -f "$HOME/.pi/agent/themes/$THEME.json" ]]; then
-        PI_THEME="$THEME"
-    else
-        PI_THEME=$([[ "$THEME" == "white" ]] && echo "light" || echo "dark")
-    fi
-    if command -v jq &>/dev/null; then
-        tmp=$(mktemp)
-        jq --arg t "$PI_THEME" '.theme = $t' "$PI_SETTINGS" > "$tmp" && mv "$tmp" "$PI_SETTINGS"
-    else
-        sed -i "s/\"theme\": \"[^\"]*\"/\"theme\": \"$PI_THEME\"/" "$PI_SETTINGS"
-    fi
-fi
-
-# Persist current theme
-echo "$THEME" > "$CURRENT_FILE"
-
-notify-send "Theme" "Switched to: $THEME" --icon=preferences-desktop-theme -t 2000
+theme_apply "${1:-}"