From 3d1ec60d6fe201055ed398ac428ceb15c8a751c7 Mon Sep 17 00:00:00 2001 From: imbytecat Date: Wed, 25 Mar 2026 13:27:26 +0800 Subject: [PATCH] Add dcli to base module and make sync manual --- README.md | 8 +++++++- arch-config/modules/base.yaml | 6 ++++++ bootstrap.sh | 14 ++++++++------ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 08797b9..a1b4aa8 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,15 @@ git clone git@git-ssh.furtherverse.com:imbytecat/archlinux-wsl-init.git cd archlinux-wsl-init -# 2. 运行 bootstrap(仅首次) +# 2. 运行 bootstrap(安装 yay 和 dcli) chmod +x bootstrap.sh ./bootstrap.sh + +# 3. 检查配置(可选) +cat ~/.config/arch-config/hosts/wsl.yaml + +# 4. 应用配置 +dcli sync ``` ## 配置说明 diff --git a/arch-config/modules/base.yaml b/arch-config/modules/base.yaml index 9737316..dcc6ce6 100644 --- a/arch-config/modules/base.yaml +++ b/arch-config/modules/base.yaml @@ -5,3 +5,9 @@ packages: - wget - vim - neovim + +aur_packages: + - dcli-arch-git + +aur_packages: + - dcli-arch-git diff --git a/bootstrap.sh b/bootstrap.sh index fab98e0..ba71fcd 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -echo "==> 安装 yay (唯一手动步骤)..." +echo "==> 安装 yay..." if ! command -v yay &> /dev/null; then sudo pacman -S --needed --noconfirm base-devel git cd /tmp @@ -14,11 +14,13 @@ fi echo "==> 安装 dcli..." yay -S --needed --noconfirm dcli-arch-git -echo "==> 初始化 dcli 配置..." +echo "==> 复制配置..." mkdir -p ~/.config/arch-config cp -r ./arch-config/* ~/.config/arch-config/ -echo "==> 运行 dcli sync..." -dcli sync - -echo "✓ 完成!所有配置已应用" +echo "" +echo "✓ Bootstrap 完成!" +echo "" +echo "下一步:" +echo " 1. 检查配置: ~/.config/arch-config/" +echo " 2. 应用配置: dcli sync"