diff --git a/.chezmoidata/packages.toml b/.chezmoidata/packages.toml index add91c3..0ecb779 100644 --- a/.chezmoidata/packages.toml +++ b/.chezmoidata/packages.toml @@ -75,10 +75,11 @@ pacman = [ 'grc', 'zellij', 'ranger', - 'vim', 'neovim', ] - +pacman_nogui = [ + 'vim', +] pacman_gui = [ 'gvim', 'neovide', @@ -117,7 +118,6 @@ pacman = [ 'grc', 'zellij', 'ranger', - 'vim', 'neovim', 'python', 'go', @@ -125,6 +125,9 @@ pacman = [ 'npm', 'jdk-openjdk', ] +pacman_nogui = [ + 'vim', +] pacman_gui = [ 'gvim', 'neovide', diff --git a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl index b2c7fc3..32d4a1f 100644 --- a/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl +++ b/.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl @@ -62,7 +62,9 @@ rm -rf lazygit.tar.gz lazygit {{- $pacman_force := .packages.linux.arch.pacman_force -}} {{- $pacmanInstall := .packages.linux.arch.pacman -}} {{- $aurInstall := .packages.linux.arch.aur -}} -{{- if not .noGUI -}} +{{- if .noGUI -}} +{{- $pacmanInstall = concat .packages.linux.arch.pacman .packages.linux.arch.pacman_nogui -}} +{{- else -}} {{- $pacmanInstall = concat .packages.linux.arch.pacman .packages.linux.arch.pacman_gui -}} {{- $aurInstall = concat .packages.linux.arch.aur .packages.linux.arch.aur_gui -}} {{- end -}} @@ -71,7 +73,9 @@ rm -rf lazygit.tar.gz lazygit {{- $pacman_force = .packages.linux.manjaro.pacman_force -}} {{- $pacmanInstall = .packages.linux.manjaro.pacman -}} {{- $aurInstall = .packages.linux.manjaro.aur -}} -{{- if not .noGUI -}} +{{- if .noGUI -}} +{{- $pacmanInstall = concat .packages.linux.manjaro.pacman .packages.linux.manjaro.pacman_nogui -}} +{{- else -}} {{- $pacmanInstall = concat .packages.linux.manjaro.pacman .packages.linux.manjaro.pacman_gui -}} {{- $aurInstall = concat .packages.linux.manjaro.aur .packages.linux.manjaro.aur_gui -}} {{- end -}}