From 8ce1ff5a7df267724376a11da7f3a493ab923b55 Mon Sep 17 00:00:00 2001 From: Jeff LANCE Date: Mon, 26 Feb 2024 23:18:22 +0100 Subject: [PATCH] Up. --- .../run_onchange_50-install-zsh.sh.tmpl | 2 +- .../run_onchange_80-install-lvim.sh.tmpl | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl b/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl index 7dcb120..c53d8bd 100644 --- a/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl +++ b/home/.chezmoiscripts/run_onchange_50-install-zsh.sh.tmpl @@ -42,7 +42,7 @@ ZIMDIR=${HOME}/.zim {{- if ne .chezmoi.username "root" }} DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing zsh {{- else }} - DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing zsh + DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends --ignore-missing zsh {{- end }} curl -sS https://starship.rs/install.sh | sh diff --git a/home/.chezmoiscripts/run_onchange_80-install-lvim.sh.tmpl b/home/.chezmoiscripts/run_onchange_80-install-lvim.sh.tmpl index 20baaac..6a0d402 100644 --- a/home/.chezmoiscripts/run_onchange_80-install-lvim.sh.tmpl +++ b/home/.chezmoiscripts/run_onchange_80-install-lvim.sh.tmpl @@ -48,17 +48,11 @@ echo -e "\033[0;32m>>>>> Begin LVim installation <<<<<\033[0m" {{- end}} ## Install packages - for package in ${packages[@]}; do - if [ "$(yay -Qq $package 2> /dev/null)" != $package ]; then - echo "installing packages" - - {{- if ne .chezmoi.username "root" }} - DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing $package - {{- else }} - DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing $package - {{- end }} - fi - done + {{- if ne .chezmoi.username "root" }} + DEBIAN_FRONTEND=noninteractive sudo -E apt-get install --yes --no-install-recommends --ignore-missing neovim python3-pynvim npm + {{- else }} + DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends --ignore-missing neovim python3-pynvim npm + {{- end }} {{- end }}