@sebastienrousseau/dotfiles 0.2.469 → 0.2.481

package/scripts/dot/commands/core.sh

@@ -0,0 +1,130 @@
+#!/usr/bin/env bash
+# Dotfiles CLI - Core Commands
+# apply, sync, update, add, diff, status, remove, cd, edit
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../lib/utils.sh
+source "$SCRIPT_DIR/../lib/utils.sh"
+
+cmd_apply() {
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+  if [ -n "$src_dir" ] && [ -f "$src_dir/scripts/ops/chezmoi-apply.sh" ]; then
+    exec bash "$src_dir/scripts/ops/chezmoi-apply.sh" "$@"
+  fi
+  exec chezmoi apply "$@"
+}
+
+cmd_sync() {
+  cmd_apply "$@"
+}
+
+cmd_update() {
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+  if [ -n "$src_dir" ] && [ -f "$src_dir/scripts/ops/chezmoi-update.sh" ]; then
+    exec bash "$src_dir/scripts/ops/chezmoi-update.sh" "$@"
+  fi
+  echo "Updating Dotfiles..."
+  exec chezmoi update "$@"
+}
+
+cmd_add() {
+  if [ -z "$1" ]; then
+    echo "Usage: dot add <file>"
+    echo ""
+    echo "Add a file to the chezmoi source directory."
+    echo "The file will be managed by chezmoi from now on."
+    exit 1
+  fi
+  exec chezmoi add "$@"
+}
+
+cmd_diff() {
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+  if [ -n "$src_dir" ] && [ -f "$src_dir/scripts/ops/chezmoi-diff.sh" ]; then
+    exec bash "$src_dir/scripts/ops/chezmoi-diff.sh" "$@"
+  fi
+  exec chezmoi diff "$@"
+}
+
+cmd_status() {
+  exec chezmoi status "$@"
+}
+
+cmd_remove() {
+  run_script "scripts/ops/chezmoi-remove.sh" "Remove helper" "$@"
+}
+
+cmd_cd() {
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+  if [ -n "$src_dir" ]; then
+    echo "$src_dir"
+  else
+    echo "Dotfiles source not found." >&2
+    exit 1
+  fi
+}
+
+cmd_edit() {
+  local src_dir
+  src_dir="$(require_source_dir)"
+  if [ -n "${EDITOR:-}" ]; then
+    exec "$EDITOR" "$src_dir"
+  elif has_command nvim; then
+    exec nvim "$src_dir"
+  elif has_command vim; then
+    exec vim "$src_dir"
+  else
+    echo "No editor found. Set \$EDITOR to open $src_dir."
+    exit 1
+  fi
+}
+
+# Dispatch
+case "${1:-}" in
+  apply)
+    shift
+    cmd_apply "$@"
+    ;;
+  sync)
+    shift
+    cmd_sync "$@"
+    ;;
+  update)
+    shift
+    cmd_update "$@"
+    ;;
+  add)
+    shift
+    cmd_add "$@"
+    ;;
+  diff)
+    shift
+    cmd_diff "$@"
+    ;;
+  status)
+    shift
+    cmd_status "$@"
+    ;;
+  remove)
+    shift
+    cmd_remove "$@"
+    ;;
+  cd)
+    shift
+    cmd_cd "$@"
+    ;;
+  edit)
+    shift
+    cmd_edit "$@"
+    ;;
+  *)
+    echo "Unknown core command: ${1:-}" >&2
+    exit 1
+    ;;
+esac

package/scripts/dot/commands/diagnostics.sh

@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+# Dotfiles CLI - Diagnostics Commands
+# doctor, heal, health, rollback, drift, history, benchmark
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../lib/utils.sh
+source "$SCRIPT_DIR/../lib/utils.sh"
+
+cmd_doctor() {
+  echo "Running Dotfiles Doctor..."
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+  if [ -n "$src_dir" ] && [ -f "$src_dir/scripts/diagnostics/doctor.sh" ]; then
+    exec bash "$src_dir/scripts/diagnostics/doctor.sh" "$@"
+  fi
+  exec chezmoi doctor "$@"
+}
+
+cmd_heal() {
+  run_script "scripts/ops/heal.sh" "Heal script" "$@"
+}
+
+cmd_health() {
+  run_script "scripts/diagnostics/health.sh" "Health dashboard" "$@"
+}
+
+cmd_security_score() {
+  run_script "scripts/diagnostics/security-score.sh" "Security score" "$@"
+}
+
+cmd_rollback() {
+  run_script "scripts/ops/rollback.sh" "Rollback script" "$@"
+}
+
+cmd_drift() {
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+  if [ -n "$src_dir" ] && [ -f "$src_dir/scripts/diagnostics/drift-dashboard.sh" ]; then
+    exec bash "$src_dir/scripts/diagnostics/drift-dashboard.sh" "$@"
+  fi
+  exec chezmoi status "$@"
+}
+
+cmd_history() {
+  run_script "scripts/diagnostics/history-analysis.sh" "History analysis script" "$@"
+}
+
+cmd_benchmark() {
+  run_script "scripts/diagnostics/benchmark.sh" "Benchmark script" "$@"
+}
+
+cmd_restore() {
+  run_script "scripts/dot/commands/restore.sh" "Restore script" "$@"
+}
+
+# Dispatch
+case "${1:-}" in
+  doctor)
+    shift
+    cmd_doctor "$@"
+    ;;
+  heal)
+    shift
+    cmd_heal "$@"
+    ;;
+  health | health-check)
+    shift
+    cmd_health "$@"
+    ;;
+  security-score)
+    shift
+    cmd_security_score "$@"
+    ;;
+  rollback)
+    shift
+    cmd_rollback "$@"
+    ;;
+  drift)
+    shift
+    cmd_drift "$@"
+    ;;
+  history)
+    shift
+    cmd_history "$@"
+    ;;
+  benchmark)
+    shift
+    cmd_benchmark "$@"
+    ;;
+  restore)
+    shift
+    cmd_restore "$@"
+    ;;
+  *)
+    echo "Unknown diagnostics command: ${1:-}" >&2
+    exit 1
+    ;;
+esac

package/scripts/dot/commands/meta.sh

@@ -0,0 +1,117 @@
+#!/usr/bin/env bash
+# Dotfiles CLI - Meta Commands
+# upgrade, docs, learn, keys, sandbox
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../lib/utils.sh
+source "$SCRIPT_DIR/../lib/utils.sh"
+
+cmd_upgrade() {
+  local src_dir
+  src_dir="$(require_source_dir)"
+
+  if [ -f "$src_dir/nix/flake.nix" ] && has_command nix; then
+    echo "Updating Nix flake..."
+    (cd "$src_dir" && nix flake update) || true
+    echo "Running Nix garbage collection..."
+    nix-collect-garbage -d || true
+  fi
+
+  echo "Updating dotfiles..."
+  chezmoi update || true
+
+  if has_command nvim; then
+    echo "Updating Neovim plugins..."
+    nvim --headless "+Lazy! sync" +qa || true
+  fi
+
+  if [ "${DOTFILES_FONTS:-}" = "1" ]; then
+    if [ -f "$src_dir/scripts/fonts/install-nerd-fonts.sh" ]; then
+      echo "Installing Nerd Fonts..."
+      sh "$src_dir/scripts/fonts/install-nerd-fonts.sh"
+    fi
+  fi
+}
+
+cmd_docs() {
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+
+  if [ -n "$src_dir" ] && [ -f "$src_dir/README.md" ]; then
+    exec cat "$src_dir/README.md"
+  else
+    die "README not found."
+  fi
+}
+
+cmd_learn() {
+  local dot_bin
+  dot_bin="$(dirname "${BASH_SOURCE[0]}")/../../../dot_local/bin"
+  if [ -f "$dot_bin/executable_tour" ]; then
+    exec bash "$dot_bin/executable_tour" "$@"
+  fi
+  # Fallback to PATH
+  exec tour "$@"
+}
+
+cmd_keys() {
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+
+  if [ -n "$src_dir" ] && [ -f "$src_dir/docs/KEYS.md" ]; then
+    if [ -n "$1" ]; then
+      rg -i --fixed-strings --context 1 "$1" "$src_dir/docs/KEYS.md" || true
+    else
+      exec cat "$src_dir/docs/KEYS.md"
+    fi
+  else
+    die "Keybindings catalog not found."
+  fi
+}
+
+cmd_sandbox() {
+  local src_dir
+  src_dir="$(require_source_dir)"
+
+  if has_command docker; then
+    echo "Launching sandbox via Docker..."
+    docker build -f "$src_dir/tests/Dockerfile.sandbox" -t dotfiles-sandbox "$src_dir"
+    exec docker run --rm -it dotfiles-sandbox
+  elif has_command podman; then
+    echo "Launching sandbox via Podman..."
+    podman build -f "$src_dir/tests/Dockerfile.sandbox" -t dotfiles-sandbox "$src_dir"
+    exec podman run --rm -it dotfiles-sandbox
+  else
+    die "Docker or Podman is required for sandbox."
+  fi
+}
+
+# Dispatch
+case "${1:-}" in
+  upgrade)
+    shift
+    cmd_upgrade "$@"
+    ;;
+  docs)
+    shift
+    cmd_docs "$@"
+    ;;
+  learn)
+    shift
+    cmd_learn "$@"
+    ;;
+  keys)
+    shift
+    cmd_keys "$@"
+    ;;
+  sandbox)
+    shift
+    cmd_sandbox "$@"
+    ;;
+  *)
+    echo "Unknown meta command: ${1:-}" >&2
+    exit 1
+    ;;
+esac

package/scripts/dot/commands/restore.sh

@@ -0,0 +1,209 @@
+#!/usr/bin/env bash
+# dot restore - Restore dotfiles from backup or previous state
+# Usage: dot restore [--list|--latest|<backup-id>]
+
+set -euo pipefail
+
+DOTFILES_DIR="${DOTFILES_DIR:-$HOME/.dotfiles}"
+BACKUP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/dotfiles/backups"
+CHEZMOI_SOURCE="${HOME}/.local/share/chezmoi"
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+log_info() { echo -e "${BLUE}[INFO]${NC} $*"; }
+log_warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
+log_error() { echo -e "${RED}[ERROR]${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}[OK]${NC} $*"; }
+
+usage() {
+  echo "Usage: dot restore [OPTIONS]"
+  echo ""
+  echo "Options:"
+  echo "  --list, -l       List available backups"
+  echo "  --latest         Restore from latest backup"
+  echo "  --git <ref>      Restore from git ref (commit, tag, branch)"
+  echo "  --diff <ref>     Show diff between current and ref"
+  echo "  --dry-run        Show what would be restored"
+  echo "  -h, --help       Show this help"
+  echo ""
+  echo "Examples:"
+  echo "  dot restore --list"
+  echo "  dot restore --latest"
+  echo "  dot restore --git HEAD~1"
+  echo "  dot restore --git v0.2.470"
+}
+
+list_backups() {
+  if [[ ! -d "$BACKUP_DIR" ]]; then
+    log_warn "No backups found at $BACKUP_DIR"
+    return 1
+  fi
+
+  echo -e "${BLUE}Available Backups:${NC}"
+  echo "─────────────────────────────────────────"
+
+  find "$BACKUP_DIR" -maxdepth 1 -type d -name "backup-*" -printf "%T@ %f\n" 2>/dev/null | sort -rn | cut -d' ' -f2- | while read -r backup; do
+    echo "  $backup"
+  done
+
+  echo ""
+  echo -e "${BLUE}Git History (last 10):${NC}"
+  echo "─────────────────────────────────────────"
+
+  if [[ -d "$DOTFILES_DIR/.git" ]]; then
+    git -C "$DOTFILES_DIR" log --oneline -10
+  elif [[ -d "$CHEZMOI_SOURCE/.git" ]]; then
+    git -C "$CHEZMOI_SOURCE" log --oneline -10
+  fi
+}
+
+restore_from_git() {
+  local ref="$1"
+  local dry_run="${2:-false}"
+  local source_dir
+
+  if [[ -d "$DOTFILES_DIR/.git" ]]; then
+    source_dir="$DOTFILES_DIR"
+  elif [[ -d "$CHEZMOI_SOURCE/.git" ]]; then
+    source_dir="$CHEZMOI_SOURCE"
+  else
+    log_error "No git repository found"
+    return 1
+  fi
+
+  log_info "Restoring from git ref: $ref"
+
+  if $dry_run; then
+    log_info "Dry run - showing changes:"
+    git -C "$source_dir" diff "$ref" --stat
+    return 0
+  fi
+
+  # Create backup first
+  create_backup
+
+  # Restore
+  git -C "$source_dir" checkout "$ref" -- .
+  log_success "Restored from $ref"
+
+  # Re-apply chezmoi
+  if command -v chezmoi >/dev/null 2>&1; then
+    log_info "Re-applying chezmoi..."
+    chezmoi apply
+  fi
+}
+
+show_diff() {
+  local ref="$1"
+  local source_dir
+
+  if [[ -d "$DOTFILES_DIR/.git" ]]; then
+    source_dir="$DOTFILES_DIR"
+  elif [[ -d "$CHEZMOI_SOURCE/.git" ]]; then
+    source_dir="$CHEZMOI_SOURCE"
+  else
+    log_error "No git repository found"
+    return 1
+  fi
+
+  git -C "$source_dir" diff "$ref"
+}
+
+create_backup() {
+  local backup_name
+  backup_name="backup-$(date +%Y%m%d_%H%M%S)"
+  local backup_path="$BACKUP_DIR/$backup_name"
+
+  mkdir -p "$backup_path"
+
+  log_info "Creating backup: $backup_name"
+
+  # Backup key config files
+  local files_to_backup=(
+    "$HOME/.zshrc"
+    "$HOME/.config/zsh"
+    "$HOME/.config/nvim"
+    "$HOME/.config/git"
+    "$HOME/.gitconfig"
+  )
+
+  for f in "${files_to_backup[@]}"; do
+    if [[ -e "$f" ]]; then
+      cp -r "$f" "$backup_path/" 2>/dev/null || true
+    fi
+  done
+
+  log_success "Backup created at $backup_path"
+}
+
+restore_latest() {
+  if [[ ! -d "$BACKUP_DIR" ]]; then
+    log_error "No backups found"
+    return 1
+  fi
+
+  local latest
+  latest=$(find "$BACKUP_DIR" -maxdepth 1 -type d -name "backup-*" -printf "%T@ %f\n" 2>/dev/null | sort -rn | head -1 | cut -d' ' -f2-)
+
+  if [[ -z "$latest" ]]; then
+    log_error "No backups found"
+    return 1
+  fi
+
+  log_info "Restoring from: $latest"
+
+  local backup_path="$BACKUP_DIR/$latest"
+  local target
+  for item in "$backup_path"/*; do
+    if [[ -e "$item" ]]; then
+      target="$HOME/$(basename "$item")"
+      cp -r "$item" "$target"
+      log_success "Restored: $(basename "$item")"
+    fi
+  done
+}
+
+# Parse arguments
+DRY_RUN=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -l | --list)
+      list_backups
+      exit 0
+      ;;
+    --latest)
+      restore_latest
+      exit 0
+      ;;
+    --git)
+      restore_from_git "$2" "$DRY_RUN"
+      exit 0
+      ;;
+    --diff)
+      show_diff "$2"
+      exit 0
+      ;;
+    --dry-run)
+      DRY_RUN=true
+      shift
+      ;;
+    -h | --help)
+      usage
+      exit 0
+      ;;
+    *)
+      log_error "Unknown option: $1"
+      usage
+      exit 1
+      ;;
+  esac
+done
+
+# Default: show usage
+usage

package/scripts/dot/commands/secrets.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+# Dotfiles CLI - Secrets Commands
+# secrets-init, secrets, secrets-create, ssh-key
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../lib/utils.sh
+source "$SCRIPT_DIR/../lib/utils.sh"
+
+cmd_secrets_init() {
+  local src_dir
+  src_dir="$(resolve_source_dir)"
+
+  if [ -n "$src_dir" ] && [ -f "$src_dir/scripts/secrets/age-init.sh" ]; then
+    exec bash "$src_dir/scripts/secrets/age-init.sh" "$@"
+  fi
+
+  local secrets_dir="$HOME/.config/chezmoi"
+  local key_file="$secrets_dir/key.txt"
+
+  mkdir -p "$secrets_dir"
+
+  if [ -f "$key_file" ]; then
+    echo "Age key already exists: $key_file"
+    exit 0
+  fi
+
+  if ! has_command age-keygen; then
+    die "age-keygen not found. Install 'age' first."
+  fi
+
+  age-keygen -o "$key_file"
+  chmod 600 "$key_file"
+  echo "Age key created at $key_file"
+  echo "Public key:"
+  age-keygen -y "$key_file"
+}
+
+cmd_secrets() {
+  local secrets_dir="$HOME/.config/chezmoi"
+  local key_file="$secrets_dir/key.txt"
+
+  if [ ! -f "$key_file" ]; then
+    die "No age key found. Run: dot secrets-init"
+  fi
+
+  exec chezmoi edit --apply "$HOME/.config/chezmoi/encrypted_secrets.age"
+}
+
+cmd_secrets_create() {
+  run_script "scripts/secrets/create-secrets-file.sh" "Secrets creation script" "$@"
+}
+
+cmd_ssh_key() {
+  run_script "scripts/secrets/encrypt-ssh-key.sh" "SSH key encryption script" "$@"
+}
+
+# Dispatch
+case "${1:-}" in
+  secrets-init)
+    shift
+    cmd_secrets_init "$@"
+    ;;
+  secrets)
+    shift
+    cmd_secrets "$@"
+    ;;
+  secrets-create)
+    shift
+    cmd_secrets_create "$@"
+    ;;
+  ssh-key)
+    shift
+    cmd_ssh_key "$@"
+    ;;
+  *)
+    echo "Unknown secrets command: ${1:-}" >&2
+    exit 1
+    ;;
+esac

package/scripts/dot/commands/security.sh

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# Dotfiles CLI - Security Commands
+# backup, encrypt-check, firewall, telemetry, dns-doh, lock-screen, usb-safety
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../lib/utils.sh
+source "$SCRIPT_DIR/../lib/utils.sh"
+
+cmd_backup() {
+  run_script "scripts/security/backup.sh" "Backup script" "$@"
+}
+
+cmd_encrypt_check() {
+  run_script "scripts/security/encryption-check.sh" "Encryption check script" "$@"
+}
+
+cmd_firewall() {
+  run_script "scripts/security/firewall.sh" "Firewall script" "$@"
+}
+
+cmd_telemetry() {
+  run_script "scripts/security/telemetry-kill.sh" "Telemetry script" "$@"
+}
+
+cmd_dns_doh() {
+  run_script "scripts/security/dns-doh.sh" "DNS DoH script" "$@"
+}
+
+cmd_lock_screen() {
+  run_script "scripts/security/lock-screen.sh" "Lock screen script" "$@"
+}
+
+cmd_usb_safety() {
+  run_script "scripts/security/usb-safety.sh" "USB safety script" "$@"
+}
+
+# Dispatch
+case "${1:-}" in
+  backup)
+    shift
+    cmd_backup "$@"
+    ;;
+  encrypt-check)
+    shift
+    cmd_encrypt_check "$@"
+    ;;
+  firewall)
+    shift
+    cmd_firewall "$@"
+    ;;
+  telemetry)
+    shift
+    cmd_telemetry "$@"
+    ;;
+  dns-doh)
+    shift
+    cmd_dns_doh "$@"
+    ;;
+  lock-screen)
+    shift
+    cmd_lock_screen "$@"
+    ;;
+  usb-safety)
+    shift
+    cmd_usb_safety "$@"
+    ;;
+  *)
+    echo "Unknown security command: ${1:-}" >&2
+    exit 1
+    ;;
+esac