diff --git a/.chezmoidata/packages.toml b/.chezmoidata/packages.toml index 8869004..615a38e 100644 --- a/.chezmoidata/packages.toml +++ b/.chezmoidata/packages.toml @@ -58,11 +58,11 @@ pacman_force = [ 'llvm', 'llvm-libs', 'sudo', + 'git', ] pacman = [ 'chezmoi', - 'git', 'lazygit', 'base-devel', 'fakeroot', diff --git a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl index 0108693..1a0bdaf 100644 --- a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl +++ b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl @@ -130,7 +130,7 @@ wait_for_pacman_unlock if [[ ${#to_install_pacmanForce[@]} -gt 0 ]]; then echo " - Installing missing packages via pacman: ${to_install_pacmanForce[@]}" - sudo pacman -Sy --needed --noconfirm "${to_install_pacmanForce[@]}" + sudo pacman -Sy --needed --noconfirm --overwrite \* "${to_install_pacmanForce[@]}" else sudo pacman -Sy fi @@ -147,7 +147,7 @@ done if [[ ${#to_install_pacman[@]} -gt 0 ]]; then echo " - Installing missing packages via pacman: ${to_install_pacman[@]}" - sudo pacman -S --needed --noconfirm "${to_install_pacman[@]}" + sudo pacman -S --needed --noconfirm --overwrite \* "${to_install_pacman[@]}" fi # 等待鎖定檔案被移除