refactor(scripts): improve install and tool logic

- Update bootstrap.sh to support custom TARGET_DIR and prevent
  accidental overwrites of existing dotfiles directories.
- Fix a common issue in install.sh where interactive prompts were
  skipped by forcing read to use /dev/tty for user input.
- Export logging functions (info, success, etc.) and colors to ensure
  consistent output across all sub-scripts like macos.sh.
- Modify mise configuration for ruff and taplo-cli to use pipx and
  cargo backends respectively, fixing @latest resolution issues.
- Adjust macOS InitialKeyRepeat to 15 (225ms) and add standalone
  logging support to macos.sh.
- Refine local fish configuration examples and update README wording.

BREAKING CHANGE: bootstrap.sh now exits with an error if the target
directory already exists, rather than attempting to update it.

Author: windvalley

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026-present windvalley
+Copyright (c) 2026 windvalley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+

README.md

@@ -11,7 +11,7 @@
 [![License](https://img.shields.io/github/license/windvalley/dotfiles)](https://github.com/windvalley/dotfiles/blob/main/LICENSE)
 
 
-本项目是一套 **现代、高效、精炼、开箱即用** 的 macOS 终端开发环境，所有配置集中版本控制，通过 GNU Stow 一键部署。
+本项目是一套 **现代、高效、开箱即用** 的 macOS 终端开发环境，所有配置集中版本控制，通过 GNU Stow 一键部署。
 
 核心工具栈：Ghostty（终端）+ Zellij（复用器）+ Fish（Shell）+ Helix（编辑器）+ Mise（版本管理），视觉与交互风格全栈统一。
 
@@ -67,7 +67,6 @@
 最简单的方法是使用一键安装脚本（Bootstrap）：
 
 ```sh
-# 直接运行以下命令，会自动完成克隆仓库并执行安装脚本
 bash -c "$(curl -fsSL https://raw.githubusercontent.com/windvalley/dotfiles/main/bootstrap.sh)"
 ```
 

bootstrap.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 # dotfiles bootstrap script
 # curl -fsSL https://raw.githubusercontent.com/windvalley/dotfiles/main/bootstrap.sh | bash
 
@@ -8,6 +7,7 @@ set -euo pipefail
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 BLUE='\033[0;34m'
+YELLOW='\033[1;33m'
 NC='\033[0m'
 
 info() { echo -e "${BLUE}[INFO]${NC} $1"; }
@@ -33,18 +33,25 @@ if ! command -v git &> /dev/null; then
     success "Git installed successfully."
 fi
 
-if [ -d "$DOTFILES_DIR" ]; then
-    info "Dotfiles directory already exists at $DOTFILES_DIR. Updating..."
-    cd "$DOTFILES_DIR"
-    git pull origin main
-else
-    info "Cloning dotfiles repository to $DOTFILES_DIR..."
-    git clone "$REPO_URL" "$DOTFILES_DIR"
+# Allow user to specify a custom target directory via DOTFILES_DIR environment variable
+TARGET_DIR="${DOTFILES_DIR:-$HOME/dotfiles}"
+
+if [ -d "$TARGET_DIR" ]; then
+    error "Target directory already exists at $TARGET_DIR."
+    error "The bootstrap script is designed for first-time installation only."
+    echo -e "${YELLOW}[WARN]${NC} If you want to reinstall, please remove the existing directory:"
+    echo "       rm -rf $TARGET_DIR"
+    echo -e "${YELLOW}[WARN]${NC} Or specify a different location by running:"
+    echo "       export DOTFILES_DIR=~/some_other_path; curl ... | bash"
+    exit 1
 fi
 
-cd "$DOTFILES_DIR"
+info "Cloning dotfiles repository to $TARGET_DIR..."
+git clone "$REPO_URL" "$TARGET_DIR"
+
+cd "$TARGET_DIR"
 
 info "Executing install.sh..."
 bash install.sh "$@"
 
-success "Bootstrap completed successfully!"
+success "Bootstrap completed successfully!"

install.sh

@@ -8,11 +8,13 @@ GREEN='\033[0;32m'
 BLUE='\033[0;34m'
 YELLOW='\033[1;33m'
 NC='\033[0m'
+export RED GREEN BLUE YELLOW NC
 
 info() { echo -e "${BLUE}[INFO]${NC} $1"; }
 success() { echo -e "${GREEN}[SUCCESS]${NC} $1"; }
 warn() { echo -e "${YELLOW}[WARN]${NC} $1"; }
 error() { echo -e "${RED}[ERROR]${NC} $1"; }
+export -f info success warn error
 
 
 
@@ -39,7 +41,9 @@ ask_yes_no() {
         info "${prompt} (auto-yes)"
         return 0
     else
-        read -p "$prompt " -n 1 -r
+        # 从 /dev/tty 直接读取终端输入，避免上一步命令（brew/zsh/fish 等）
+        # 向 stdin 写入残留字节导致 read 跳过用户输入的问题
+        read -p "$prompt " -n 1 -r REPLY < /dev/tty
         echo
         if [[ $REPLY =~ ^[Yy]$ ]]; then
             return 0
@@ -254,12 +258,11 @@ else
 fi
 
 if [[ "$(uname)" == "Darwin" ]]; then
-    if [ "$NON_INTERACTIVE" = true ]; then
-        info "Skipping macOS system preferences in non-interactive mode."
-    elif ask_yes_no "Do you want to apply macOS system preferences (macos.sh)? (y/n)"; then
+    if ask_yes_no "Do you want to apply macOS system preferences (macos.sh)? (y/n)"; then
         info "Applying macOS system preferences..."
         bash "$DOTFILES_DIR/macos.sh"
     fi
+
 fi
 
 success "Installation complete!"

local/config.local.fish.example

@@ -7,21 +7,26 @@
 #
 # 使用方法：
 # cp config.local.fish.example ~/.config/fish/config.local.fish
-# 重启 fish 即可生效。
+# 执行 exec fish 即可生效。
 # ============================================================
 
 # --- 敏感环境变量 ---
-# 例如：LLM API 密钥，Homebrew 个人授权 token 等
+# 例如：OpenAI API 密钥
 # set -gx OPENAI_API_KEY "sk-xxxxxxxxx"
-# set -gx HOMEBREW_GITHUB_API_TOKEN "ghp_xxxxxxxx"
-#
-# 覆盖config.fish 中的 AI_CMD 默认配置
+
+# 强烈建议配置，用于提升 mise/Homebrew 等工具调用 GitHub API 的频率限制
+# 获取方式：https://github.com/settings/tokens (申请 Classic Token，无需勾选任何权限即可)
+# set -gx GITHUB_TOKEN "ghp_xxxxxxxx"
+
+# --- AI 命令行工具 ---
+# 覆盖 config.fish 中的 AI_CMD 默认配置
 # set -gx AI_CMD "opencode run -m google/antigravity-gemini-3-flash"
 
 # --- 机器特定别名 (Aliases) ---
 # 例如：某些只存在于这台 Mac 上的启动守护进程命令 / 脚本快捷方式
 # abbr -a -g restart-work-vpn "sudo launchctl restart com.corp.vpn"
 
-# --- 本机路径注入 ---
-# 虽然 install.sh 已经做了通用路径集成，如果你有特定工具仅安装在本机：
-# test -d "$HOME/.cargo/bin"; and fish_add_path --path "$HOME/.cargo/bin"
+# --- 本机特有路径注入 ---
+# 例如：公司内网 SDK 或手动解压的第三方工具，无法通过 mise/brew 管理的私有二进制
+# test -d "/opt/company-sdk/bin"; and fish_add_path --path "/opt/company-sdk/bin"
+

macos.sh

@@ -2,6 +2,13 @@
 
 set -euo pipefail
 
+# Fallback logging functions when run standalone (not via install.sh)
+if ! declare -f warn > /dev/null 2>&1; then
+    YELLOW='\033[1;33m'
+    NC='\033[0m'
+    warn() { echo -e "${YELLOW}[WARN]${NC} $1"; }
+fi
+
 # ==============================================================================
 # 🍎 macOS 系统偏好设置
 # ==============================================================================
@@ -13,21 +20,7 @@ set -euo pipefail
 osascript -e 'tell application "System Settings" to quit' 2>/dev/null || true
 osascript -e 'tell application "System Preferences" to quit' 2>/dev/null || true
 
-# 预先请求管理员密码
-sudo -v
-
-# 保持 sudo 权限：后台续期，脚本结束时自动清理
-sudo_keepalive() {
-    while kill -0 "$$" 2>/dev/null; do
-        sudo -n true
-        sleep 50
-    done
-}
-sudo_keepalive &
-SUDO_PID=$!
-trap 'kill $SUDO_PID 2>/dev/null; sudo -k' EXIT
-
-echo "正在配置 macOS..."
+echo "Configuring macOS..."
 
 ###############################################################################
 # 通用界面与用户体验                                                          #
@@ -38,8 +31,8 @@ echo "正在配置 macOS..."
 # 系统设置 UI 面板允许的最快极限值：KeyRepeat = 2 (30ms)，InitialKeyRepeat = 15 (225ms)
 # KeyRepeat：重复速率（数字越小越快，1 是最快）
 defaults write NSGlobalDomain KeyRepeat -int 1
-# InitialKeyRepeat：首次重复前的延迟（单位：毫秒，约 150ms）
-defaults write NSGlobalDomain InitialKeyRepeat -int 10
+# InitialKeyRepeat：首次重复前的延迟
+defaults write NSGlobalDomain InitialKeyRepeat -int 15
 
 # 禁用按键长按功能，改为重复输入该按键（对 Vim 用户很有用）
 # 默认值：true（启用长按显示特殊字符选择菜单）
@@ -182,4 +175,5 @@ for app in "Activity Monitor" \
 	killall "${app}" &> /dev/null || true
 done
 
-echo "完成。注意：部分更改需要注销或重启后才能生效。"
+echo "Done."
+warn "Some changes will only take effect after restarting your Mac."

mise/dot-config/mise/config.toml

@@ -62,8 +62,9 @@ rust = "latest"
 "go:github.com/golangci/golangci-lint/cmd/golangci-lint" = "latest"
 
 # --- Python 生态 ---
-ruff = "latest"             # Linter/Formatter/LSP (使用 native 预编译版更轻快)
-"npm:pyright" = "latest"           # Type Checker LSP (由 npm 分发更快更稳)
+# ruff: 默认 aqua backend 无法正确解析 @latest，改用 pipx 通过 PyPI 获取
+"pipx:ruff" = "latest"      # Linter/Formatter/LSP
+"npm:pyright" = "latest"    # Type Checker LSP
 
 # --- Web 生态 (TS/JS/CSS/HTML/JSON) ---
 "npm:@vtsls/language-server" = "latest"
@@ -72,7 +73,8 @@ ruff = "latest"             # Linter/Formatter/LSP (使用 native 预编译版
 "npm:@tailwindcss/language-server" = "latest"
 
 # --- Rust 生态 ---
-taplo = "latest"       # TOML Formatter/LSP (使用 native 预编译版，告别 cargo 编译)
+# taplo: 仅有 aqua/cargo 两个 backend；aqua 无法正确解析 @latest，cargo 为官方推荐，首次编译后有缓存
+"cargo:taplo-cli" = "latest" # TOML Formatter/LSP
 # 注意: 不通过 mise 管理 rust-analyzer 的原因
 # 1. 它是 Rust 官方工具链的一部分，强依赖底层的 rustc 和特定平台的系统级 API。
 # 2. 从源码通过 cargo 编译安装极其耗时，且容易因为 C 依赖报错。