yuan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix linux install script: arch vim 和 gvim 是衝突只能選一邊

Browse Source
This commit is contained in:
Yuan Chiu 2025-05-03 21:21:06 +08:00
parent 4fb0f59a3f
commit def97cc705
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.chezmoidata/packages.toml
View File

@ -75,10 +75,11 @@ pacman = [
'grc', 'grc',
'zellij', 'zellij',
'ranger', 'ranger',
'vim',
'neovim', 'neovim',
] ]
pacman_nogui = [
'vim',
]
pacman_gui = [ pacman_gui = [
'gvim', 'gvim',
'neovide', 'neovide',
@ -117,7 +118,6 @@ pacman = [
'grc', 'grc',
'zellij', 'zellij',
'ranger', 'ranger',
'vim',
'neovim', 'neovim',
'python', 'python',
'go', 'go',
@ -125,6 +125,9 @@ pacman = [
'npm', 'npm',
'jdk-openjdk', 'jdk-openjdk',
] ]
pacman_nogui = [
'vim',
]
pacman_gui = [ pacman_gui = [
'gvim', 'gvim',
'neovide', 'neovide',

8
.chezmoiscripts/run_onchange_before_linux-install-packages.sh.tmpl
View File

@ -62,7 +62,9 @@ rm -rf lazygit.tar.gz lazygit
{{- $pacman_force := .packages.linux.arch.pacman_force -}} {{- $pacman_force := .packages.linux.arch.pacman_force -}}
{{- $pacmanInstall := .packages.linux.arch.pacman -}} {{- $pacmanInstall := .packages.linux.arch.pacman -}}
{{- $aurInstall := .packages.linux.arch.aur -}} {{- $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 -}} {{- $pacmanInstall = concat .packages.linux.arch.pacman .packages.linux.arch.pacman_gui -}}
{{- $aurInstall = concat .packages.linux.arch.aur .packages.linux.arch.aur_gui -}} {{- $aurInstall = concat .packages.linux.arch.aur .packages.linux.arch.aur_gui -}}
{{- end -}} {{- end -}}
@ -71,7 +73,9 @@ rm -rf lazygit.tar.gz lazygit
{{- $pacman_force = .packages.linux.manjaro.pacman_force -}} {{- $pacman_force = .packages.linux.manjaro.pacman_force -}}
{{- $pacmanInstall = .packages.linux.manjaro.pacman -}} {{- $pacmanInstall = .packages.linux.manjaro.pacman -}}
{{- $aurInstall = .packages.linux.manjaro.aur -}} {{- $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 -}} {{- $pacmanInstall = concat .packages.linux.manjaro.pacman .packages.linux.manjaro.pacman_gui -}}
{{- $aurInstall = concat .packages.linux.manjaro.aur .packages.linux.manjaro.aur_gui -}} {{- $aurInstall = concat .packages.linux.manjaro.aur .packages.linux.manjaro.aur_gui -}}
{{- end -}} {{- end -}}