.chezmoidata/packages.toml

@@ -1,4 +1,3 @@
-# macOS ------------------------------------------------------------------------
 [packages.darwin]
 brews = [
   'chezmoi',
@@ -26,37 +25,6 @@ casks = [
 #  'macvim',
 ]
 
-# Arch Linux -------------------------------------------------------------------
-[packages.linux.arch]
-pacman_force = [
-  'archlinux-keyring',
-  'llvm',
-  'llvm-libs',
-]
-
-pacman = [
-  'chezmoi',
-  'git',
-  'base-devel',
-  'fakeroot',
-  'gcc',
-  'cmake',
-  'lsix',
-  'ueberzugpp',
-  'eza',
-  'grc',
-  'zellij',
-  'ranger',
-  'vim',
-  'neovim',
-  'python',
-  'go',
-  'nodejs',
-  'npm',
-  'jdk-openjdk',
-]
-
-# Manjaro Linux ----------------------------------------------------------------
 [packages.linux.manjaro]
 pacman_force = [
   'archlinux-keyring',
@@ -68,13 +36,11 @@ pacman_force = [
 pacman = [
   'chezmoi',
   'yay',
-  'git',
   'base-devel',
   'fakeroot',
   'gcc',
   'cmake',
   'lsix',
-  'ueberzugpp',
   'eza',
   'grc',
   'zellij',

.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl

@@ -1,20 +1,7 @@
 {{ if eq .chezmoi.os "linux" -}}
 
 
-{{/* ==== Arch Linux / Manjaro ========================================== */ -}}
 {{ if eq .chezmoi.osRelease.id "manjaro" -}}
-
-{{/* ---- 整理待安裝清單 -------------------------------------------------- */ -}}
-{{- $pacman_force := .packages.linux.manjaro.pacman_force -}}
-{{- $pacmanInstall := .packages.linux.manjaro.pacman -}}
-{{- $aurInstall := .packages.linux.manjaro.aur -}}
-
-{{- if not .noGUI -}}
-{{- $pacmanInstall := concat .packages.linux.manjaro.pacman .packages.linux.manjaro.pacman_gui -}}
-{{- $aurInstall := concat .packages.linux.manjaro.aur .packages.linux.manjaro.aur_gui -}}
-{{- end -}}
-
-{{/* ---- 安裝腳本 ------------------------------------------------------- */ -}}
 {{- /* https://github.com/mriehl/dotfiles/blob/master/run_onchange_packages.sh.tmpl */ -}}
 #!/usr/bin/env bash
 
@@ -47,7 +34,15 @@ wait_for_pacman_unlock() {
   echo "✅ 鎖定解除，繼續執行。"
 }
 
-pacmanForce_packages=( {{ $pacman_force | quoteList | join " " }})
+pacmanForce_packages=( {{.packages.linux.manjaro.pacman_force | quoteList | join " " }})
+
+{{- $pacmanInstall := .packages.linux.manjaro.pacman -}}
+{{- $aurInstall := .packages.linux.manjaro.aur -}}
+{{ if not .noGUI }}
+{{- $pacmanInstall := concat .packages.linux.manjaro.pacman .packages.linux.manjaro.pacman_gui -}}
+{{- $aurInstall := concat .packages.linux.manjaro.aur .packages.linux.manjaro.aur_gui -}}
+{{ end }}
+
 pacman_packages=( {{ $pacmanInstall | quoteList | join " " }} )
 aur_packages=( {{ $aurInstall | quoteList | join " " }})
 
@@ -106,4 +101,5 @@ if [[ ${#to_install_aur[@]} -gt 0 ]]; then
 fi
 {{ end -}}
 
+
 {{ end -}}