Dotfiles update 2025-12-25 12:04

refactor_backup/zsh/lib/colors.zsh

@@ -0,0 +1,86 @@
+# ============================================================================
+# Shared Color Definitions for Dotfiles
+# ============================================================================
+# Source this file in scripts and functions to get consistent color support.
+#
+# Usage in zsh functions:
+#   source "${0:A:h}/../lib/colors.zsh" 2>/dev/null || source "$HOME/.dotfiles/zsh/lib/colors.zsh"
+#
+# Usage in bash scripts:
+#   source "$HOME/.dotfiles/zsh/lib/colors.zsh"
+#
+# All variables are prefixed with DF_ (dotfiles) to avoid conflicts.
+# ============================================================================
+
+# Prevent double-sourcing
+[[ -n "$_DF_COLORS_LOADED" ]] && return 0
+typeset -g _DF_COLORS_LOADED=1
+
+# ============================================================================
+# Standard Colors (ANSI escape codes)
+# ============================================================================
+
+typeset -g DF_RED=$'\033[0;31m'
+typeset -g DF_GREEN=$'\033[0;32m'
+typeset -g DF_YELLOW=$'\033[1;33m'
+typeset -g DF_BLUE=$'\033[0;34m'
+typeset -g DF_MAGENTA=$'\033[0;35m'
+typeset -g DF_CYAN=$'\033[0;36m'
+typeset -g DF_WHITE=$'\033[0;37m'
+
+# Bold variants
+typeset -g DF_BOLD_RED=$'\033[1;31m'
+typeset -g DF_BOLD_GREEN=$'\033[1;32m'
+typeset -g DF_BOLD_YELLOW=$'\033[1;33m'
+typeset -g DF_BOLD_BLUE=$'\033[1;34m'
+typeset -g DF_BOLD_MAGENTA=$'\033[1;35m'
+typeset -g DF_BOLD_CYAN=$'\033[1;36m'
+typeset -g DF_BOLD_WHITE=$'\033[1;37m'
+
+# Text styles
+typeset -g DF_BOLD=$'\033[1m'
+typeset -g DF_DIM=$'\033[2m'
+typeset -g DF_ITALIC=$'\033[3m'
+typeset -g DF_UNDERLINE=$'\033[4m'
+typeset -g DF_RESET=$'\033[0m'
+typeset -g DF_NC=$'\033[0m'  # Alias for reset (No Color)
+
+# ============================================================================
+# 256-Color Palette (used in theme and MOTD)
+# ============================================================================
+
+typeset -g DF_GREY=$'\033[38;5;242m'
+typeset -g DF_LIGHT_GREY=$'\033[38;5;248m'
+typeset -g DF_DARK_GREY=$'\033[38;5;239m'
+typeset -g DF_ORANGE=$'\033[38;5;208m'
+typeset -g DF_LIGHT_ORANGE=$'\033[38;5;220m'
+typeset -g DF_PINK=$'\033[38;5;213m'
+typeset -g DF_PURPLE=$'\033[38;5;141m'
+typeset -g DF_LIGHT_BLUE=$'\033[38;5;39m'
+typeset -g DF_LIGHT_GREEN=$'\033[38;5;82m'
+typeset -g DF_BRIGHT_GREEN=$'\033[38;5;118m'
+typeset -g DF_TEAL=$'\033[38;5;51m'
+
+# ============================================================================
+# Semantic Colors (for consistent UI)
+# ============================================================================
+
+typeset -g DF_SUCCESS="$DF_GREEN"
+typeset -g DF_ERROR="$DF_RED"
+typeset -g DF_WARNING="$DF_YELLOW"
+typeset -g DF_INFO="$DF_CYAN"
+typeset -g DF_HINT="$DF_DIM"
+typeset -g DF_ACCENT="$DF_BLUE"
+typeset -g DF_MUTED="$DF_GREY"
+
+# ============================================================================
+# Bash Compatibility
+# ============================================================================
+
+# For bash scripts, export as regular variables too
+if [[ -n "$BASH_VERSION" ]]; then
+    export DF_RED DF_GREEN DF_YELLOW DF_BLUE DF_MAGENTA DF_CYAN DF_WHITE
+    export DF_BOLD DF_DIM DF_RESET DF_NC
+    export DF_GREY DF_LIGHT_BLUE DF_LIGHT_GREEN
+    export DF_SUCCESS DF_ERROR DF_WARNING DF_INFO
+fi

refactor_backup/zsh/lib/config.zsh

@@ -0,0 +1,154 @@
+# ============================================================================
+# Dotfiles Configuration Loader
+# ============================================================================
+# This file loads dotfiles.conf and sets up all configuration variables.
+# It serves as the bridge between dotfiles.conf and the rest of the system.
+#
+# Source this file to get access to all configuration:
+#   source "${0:A:h}/config.zsh"
+#
+# This file:
+#   1. Finds and sources dotfiles.conf
+#   2. Sets sensible defaults for any missing values
+#   3. Exports variables for use in subshells/scripts
+# ============================================================================
+
+# Prevent double-sourcing
+[[ -n "$_DF_CONFIG_LOADED" ]] && return 0
+
+# ============================================================================
+# Find and Source dotfiles.conf
+# ============================================================================
+
+_df_find_config() {
+    local locations=(
+        "${DOTFILES_DIR}/dotfiles.conf"
+        "${DOTFILES_HOME}/dotfiles.conf"
+        "$HOME/.dotfiles/dotfiles.conf"
+        "${0:A:h}/../../dotfiles.conf"
+    )
+    
+    for loc in "${locations[@]}"; do
+        [[ -f "$loc" ]] && { echo "$loc"; return 0; }
+    done
+    return 1
+}
+
+_DF_CONFIG_FILE=$(_df_find_config)
+
+if [[ -n "$_DF_CONFIG_FILE" && -f "$_DF_CONFIG_FILE" ]]; then
+    source "$_DF_CONFIG_FILE"
+    typeset -g _DF_CONFIG_LOADED=1
+else
+    # Config file not found - set critical defaults
+    typeset -g _DF_CONFIG_LOADED=1
+fi
+
+# ============================================================================
+# Set Defaults for Any Missing Values
+# ============================================================================
+# These defaults ensure scripts work even if dotfiles.conf is incomplete
+
+# Core Settings
+typeset -g DOTFILES_VERSION="${DOTFILES_VERSION:-1.0.0}"
+typeset -g DOTFILES_DIR="${DOTFILES_DIR:-$HOME/.dotfiles}"
+typeset -g DOTFILES_HOME="${DOTFILES_HOME:-$DOTFILES_DIR}"  # Alias for compatibility
+typeset -g DOTFILES_BRANCH="${DOTFILES_BRANCH:-main}"
+typeset -g DOTFILES_BACKUP_PREFIX="${DOTFILES_BACKUP_PREFIX:-$HOME/.dotfiles_backup}"
+
+# GitHub Settings
+typeset -g DOTFILES_GITHUB_USER="${DOTFILES_GITHUB_USER:-adlee-was-taken}"
+typeset -g DOTFILES_REPO_NAME="${DOTFILES_REPO_NAME:-dotfiles}"
+typeset -g DOTFILES_REPO_URL="${DOTFILES_REPO_URL:-https://github.com/${DOTFILES_GITHUB_USER}/${DOTFILES_REPO_NAME}.git}"
+typeset -g DOTFILES_RAW_URL="${DOTFILES_RAW_URL:-https://raw.githubusercontent.com/${DOTFILES_GITHUB_USER}/${DOTFILES_REPO_NAME}/${DOTFILES_BRANCH}}"
+
+# Display Settings
+typeset -g DF_WIDTH="${DF_WIDTH:-66}"
+typeset -g ENABLE_MOTD="${ENABLE_MOTD:-true}"
+typeset -g MOTD_STYLE="${MOTD_STYLE:-compact}"
+typeset -g MOTD_SHOW_FAILED_SERVICES="${MOTD_SHOW_FAILED_SERVICES:-true}"
+typeset -g MOTD_SHOW_UPDATES="${MOTD_SHOW_UPDATES:-true}"
+
+# Theme Settings
+typeset -g ZSH_THEME_NAME="${ZSH_THEME_NAME:-adlee}"
+typeset -g THEME_TIMER_THRESHOLD="${THEME_TIMER_THRESHOLD:-10}"
+typeset -g THEME_PATH_TRUNCATE_LENGTH="${THEME_PATH_TRUNCATE_LENGTH:-32}"
+
+# Feature Toggles
+typeset -g ENABLE_SMART_SUGGESTIONS="${ENABLE_SMART_SUGGESTIONS:-true}"
+typeset -g ENABLE_COMMAND_PALETTE="${ENABLE_COMMAND_PALETTE:-true}"
+typeset -g ENABLE_SHELL_ANALYTICS="${ENABLE_SHELL_ANALYTICS:-false}"
+typeset -g ENABLE_VAULT="${ENABLE_VAULT:-true}"
+typeset -g DOTFILES_AUTO_SYNC_CHECK="${DOTFILES_AUTO_SYNC_CHECK:-true}"
+
+# Btrfs Settings
+typeset -g BTRFS_DEFAULT_MOUNT="${BTRFS_DEFAULT_MOUNT:-/}"
+
+# Snapper Settings
+typeset -g SNAPPER_CONFIG="${SNAPPER_CONFIG:-root}"
+typeset -g LIMINE_CONF="${LIMINE_CONF:-/boot/limine.conf}"
+
+# Tmux Settings
+typeset -g TW_SESSION_PREFIX="${TW_SESSION_PREFIX:-work}"
+typeset -g TW_DEFAULT_TEMPLATE="${TW_DEFAULT_TEMPLATE:-dev}"
+
+# Python Template Settings
+typeset -g PY_TEMPLATE_BASE_DIR="${PY_TEMPLATE_BASE_DIR:-$HOME/projects}"
+typeset -g PY_TEMPLATE_PYTHON="${PY_TEMPLATE_PYTHON:-python3}"
+typeset -g PY_TEMPLATE_VENV_NAME="${PY_TEMPLATE_VENV_NAME:-venv}"
+typeset -g PY_TEMPLATE_USE_POETRY="${PY_TEMPLATE_USE_POETRY:-false}"
+typeset -g PY_TEMPLATE_GIT_INIT="${PY_TEMPLATE_GIT_INIT:-true}"
+
+# SSH Settings
+typeset -g SSH_AUTO_TMUX="${SSH_AUTO_TMUX:-true}"
+typeset -g SSH_TMUX_SESSION_PREFIX="${SSH_TMUX_SESSION_PREFIX:-ssh}"
+typeset -g SSH_SYNC_DOTFILES="${SSH_SYNC_DOTFILES:-ask}"
+
+# Password Manager Settings
+typeset -g PW_CLIP_TIME="${PW_CLIP_TIME:-45}"
+
+# Package Manager
+typeset -g AUR_HELPER="${AUR_HELPER:-auto}"
+
+# Git Settings (with fallbacks to user identity)
+typeset -g GIT_USER_NAME="${GIT_USER_NAME:-$USER_FULLNAME}"
+typeset -g GIT_USER_EMAIL="${GIT_USER_EMAIL:-$USER_EMAIL}"
+typeset -g GIT_DEFAULT_BRANCH="${GIT_DEFAULT_BRANCH:-main}"
+
+# ============================================================================
+# Export for Bash Scripts
+# ============================================================================
+# Bash scripts can't see typeset -g, so we export key variables
+
+export DOTFILES_VERSION DOTFILES_DIR DOTFILES_HOME DOTFILES_BRANCH
+export DOTFILES_GITHUB_USER DOTFILES_REPO_NAME DOTFILES_REPO_URL DOTFILES_RAW_URL
+export DF_WIDTH MOTD_STYLE
+export ZSH_THEME_NAME
+
+# ============================================================================
+# Helper Function: Get Config Value
+# ============================================================================
+# Usage: df_config "VARIABLE_NAME" "default_value"
+
+df_config() {
+    local var_name="$1"
+    local default="$2"
+    local value="${(P)var_name}"
+    echo "${value:-$default}"
+}
+
+# ============================================================================
+# Helper Function: Show Config Summary
+# ============================================================================
+
+df_show_config() {
+    echo "Dotfiles Configuration"
+    echo "======================"
+    echo "Config File:    ${_DF_CONFIG_FILE:-not found}"
+    echo "Version:        $DOTFILES_VERSION"
+    echo "Directory:      $DOTFILES_DIR"
+    echo "Branch:         $DOTFILES_BRANCH"
+    echo "Display Width:  $DF_WIDTH"
+    echo "MOTD Style:     $MOTD_STYLE"
+    echo "Theme:          $ZSH_THEME_NAME"
+}

refactor_backup/zsh/lib/utils.zsh

@@ -0,0 +1,182 @@
+# ============================================================================
+# Shared Utility Functions for Zsh Dotfiles
+# ============================================================================
+# Common helper functions used across multiple function files.
+#
+# This file sources config.zsh (which sources dotfiles.conf) and colors.zsh,
+# so sourcing this single file gives you access to everything.
+#
+# Source this file in function files:
+#   source "${0:A:h}/../lib/utils.zsh"
+# ============================================================================
+
+# Prevent double-sourcing
+[[ -n "$_DF_UTILS_LOADED" ]] && return 0
+typeset -g _DF_UTILS_LOADED=1
+
+# ============================================================================
+# Source Configuration and Colors
+# ============================================================================
+# Order matters: config first (sets DF_WIDTH, etc.), then colors
+
+# Find lib directory
+_df_lib_dir="${0:A:h}"
+[[ ! -d "$_df_lib_dir" ]] && _df_lib_dir="$HOME/.dotfiles/zsh/lib"
+
+# Source config (provides all settings from dotfiles.conf)
+source "${_df_lib_dir}/config.zsh" 2>/dev/null || \
+source "$HOME/.dotfiles/zsh/lib/config.zsh" 2>/dev/null || {
+    # Fallback: set critical defaults if config.zsh not found
+    typeset -g DOTFILES_DIR="${DOTFILES_DIR:-$HOME/.dotfiles}"
+    typeset -g DOTFILES_HOME="${DOTFILES_HOME:-$DOTFILES_DIR}"
+    typeset -g DOTFILES_VERSION="${DOTFILES_VERSION:-unknown}"
+    typeset -g DF_WIDTH="${DF_WIDTH:-66}"
+}
+
+# Source colors
+source "${_df_lib_dir}/colors.zsh" 2>/dev/null || \
+source "$HOME/.dotfiles/zsh/lib/colors.zsh" 2>/dev/null || {
+    # Fallback colors if colors.zsh not found
+    typeset -g DF_RED=$'\033[0;31m' DF_GREEN=$'\033[0;32m' DF_YELLOW=$'\033[1;33m'
+    typeset -g DF_BLUE=$'\033[0;34m' DF_CYAN=$'\033[0;36m' DF_NC=$'\033[0m'
+    typeset -g DF_GREY=$'\033[38;5;242m' DF_LIGHT_BLUE=$'\033[38;5;39m'
+    typeset -g DF_LIGHT_GREEN=$'\033[38;5;82m' DF_BOLD=$'\033[1m' DF_DIM=$'\033[2m'
+}
+
+unset _df_lib_dir
+
+# ============================================================================
+# MOTD-Style Header Functions
+# ============================================================================
+
+# Prints a standardized header box for functions
+# Usage: df_print_func_name "Function Name"
+df_print_func_name() {
+    local func_name="${1:-func}"
+    local datetime=$(date '+%a %b %d %H:%M')
+    local width="${DF_WIDTH:-66}"
+
+    # Build horizontal line
+    local hline=""
+    for ((i=0; i<width; i++)); do hline+="═"; done
+    local inner=$((width - 2))
+
+    # Header content
+    local h_left="${func_name}"
+    local h_right="${datetime}"
+    local h_pad=$((inner - ${#h_left} - ${#h_right}))
+    local h_spaces=""
+    for ((i=0; i<h_pad; i++)); do h_spaces+=" "; done
+
+    echo -e "${DF_GREY}╒${hline}╕${DF_NC}"
+    echo -e "${DF_GREY}│${DF_NC} ${DF_BOLD}${DF_LIGHT_BLUE}${h_left}${DF_NC}${h_spaces}${DF_NC}${DF_BOLD}${h_right}${DF_NC} ${DF_GREY}│${DF_NC}"
+    echo -e "${DF_GREY}╘${hline}╛${DF_NC}"
+}
+
+# Prints a standardized header box for scripts
+# Usage: df_print_header "script-name"
+df_print_header() {
+    local script_name="${1:-script}"
+    local user="${USER:-root}"
+    local hostname="${HOST:-${HOSTNAME:-$(hostname -s 2>/dev/null)}}"
+    local datetime=$(date '+%a %b %d %H:%M')
+    local width="${DF_WIDTH:-66}"
+
+    # Build horizontal line
+    local hline=""
+    for ((i=0; i<width; i++)); do hline+="═"; done
+    local inner=$((width - 2))
+
+    # Header content
+    local h_left="✦ ${user}@${hostname}"
+    local h_center="${script_name}"
+    local h_right="${datetime}"
+    local h_pad=$(((inner - ${#h_left} - ${#h_center} - ${#h_right}) / 2))
+    local h_spaces=""
+    for ((i=0; i<h_pad; i++)); do h_spaces+=" "; done
+
+    # Use red for root, light blue for normal users
+    local user_color="${DF_LIGHT_BLUE}"
+    [[ "$EUID" -eq 0 ]] && user_color="${DF_RED}"
+
+    echo ""
+    echo -e "${DF_GREY}╒${hline}╕${DF_NC}"
+    echo -e "${DF_GREY}│${DF_NC} ${DF_BOLD}${user_color}${h_left}${DF_NC}${h_spaces}${DF_LIGHT_GREEN}${h_center}${h_spaces}${DF_NC}${DF_BOLD}${h_right}${DF_NC} ${DF_GREY}│${DF_NC}"
+    echo -e "${DF_GREY}╘${hline}╛${DF_NC}"
+    echo ""
+}
+
+# ============================================================================
+# Output Formatting Functions
+# ============================================================================
+
+df_print_step() { echo -e "${DF_BLUE}==>${DF_NC} $1"; }
+df_print_success() { echo -e "${DF_GREEN}✓${DF_NC} $1"; }
+df_print_error() { echo -e "${DF_RED}✗${DF_NC} $1" >&2; }
+df_print_warning() { echo -e "${DF_YELLOW}⚠${DF_NC} $1"; }
+df_print_info() { echo -e "${DF_CYAN}ℹ${DF_NC} $1"; }
+df_print_section() { echo -e "${DF_CYAN}$1:${DF_NC}"; }
+df_print_indent() { echo "  $1"; }
+
+# ============================================================================
+# Command Dependency Checking
+# ============================================================================
+
+df_cmd_exists() { command -v "$1" &>/dev/null; }
+
+df_require_cmd() {
+    local cmd="$1"
+    local package="${2:-$1}"
+    
+    if ! command -v "$cmd" &>/dev/null; then
+        df_print_error "$cmd not installed"
+        echo "Install: sudo pacman -S $package"
+        return 1
+    fi
+    return 0
+}
+
+# ============================================================================
+# User Confirmation
+# ============================================================================
+
+df_confirm() {
+    local prompt="$1"
+    read -q "REPLY?$prompt [y/N]: "
+    echo
+    [[ "$REPLY" =~ ^[Yy]$ ]]
+}
+
+df_confirm_warning() {
+    df_print_warning "$1"
+    df_confirm "Continue?"
+}
+
+# ============================================================================
+# File/Directory Helpers
+# ============================================================================
+
+df_in_git_repo() { git rev-parse --git-dir &>/dev/null 2>&1; }
+df_git_root() { git rev-parse --show-toplevel 2>/dev/null; }
+df_ensure_dir() { [[ ! -d "$1" ]] && mkdir -p "$1"; }
+
+df_ensure_file() {
+    local file="$1" content="${2:-}"
+    if [[ ! -f "$file" ]]; then
+        df_ensure_dir "$(dirname "$file")"
+        [[ -n "$content" ]] && echo "$content" > "$file" || touch "$file"
+    fi
+}
+
+# ============================================================================
+# Environment Checks
+# ============================================================================
+
+df_in_tmux() { [[ -n "$TMUX" ]]; }
+df_is_btrfs() { [[ "$(df -T / 2>/dev/null | awk 'NR==2 {print $2}')" == "btrfs" ]]; }
+
+# ============================================================================
+# FZF Helpers
+# ============================================================================
+
+df_fzf_opts() { echo "--height=50% --layout=reverse --border=rounded"; }