diff --git a/.chezmoidata/packages.toml b/.chezmoidata/packages.toml
index 7041acd..9c2e10c 100644
--- a/.chezmoidata/packages.toml
+++ b/.chezmoidata/packages.toml
@@ -46,17 +46,22 @@ pacman = [
   'zellij',
   'ranger',
   'vim',
-  'gvim',
   'neovim',
-  'neovide',
   'python',
   'go',
   'nodejs',
   'npm',
   'jdk-openjdk',
 ]
+pacman_gui = [
+  'gvim',
+  'neovide',
+]
 
 aur = [
+]
+
+aur_gui = [
   'alacritty-sixel-git',
   'winscp',
 ]
diff --git a/.chezmoiignore b/.chezmoiignore
index 6c1ac1b..2df89e3 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -15,7 +15,7 @@ dconf.ini
 .gvimrc
 
 {{/* ---- 有視窗應用程式 -------------------------------------------------- */ -}}
-{{ else}}
+{{ else }}
 
 {{/* ---- 處理特定os專用  */ -}}
 {{ if ne .chezmoi.os "darwin" }}
diff --git a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
index bdc0339..cce5488 100644
--- a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
+++ b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
@@ -35,8 +35,16 @@ wait_for_pacman_unlock() {
 }
 
 pacmanForce_packages=( {{.packages.linux.manjaro.pacman_force | quoteList | join " " }})
-pacman_packages=( {{.packages.linux.manjaro.pacman | quoteList | join " " }})
-aur_packages=( {{.packages.linux.manjaro.aur | 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 " " }})
 
 installed_packages=($(pacman -Qq))