From d8d1bcfce33640b480ee1341a096e5b2ebd8f9ab Mon Sep 17 00:00:00 2001 From: Jeff LANCE Date: Tue, 29 Jul 2025 01:08:16 +0200 Subject: [PATCH] up --- home/.chezmoi.toml.tmpl | 4 ++-- .../run_once_onchange_10-install-packages.sh.tmpl | 3 ++- scripts/manjaro.sh | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/home/.chezmoi.toml.tmpl b/home/.chezmoi.toml.tmpl index af61a13..f7387b8 100644 --- a/home/.chezmoi.toml.tmpl +++ b/home/.chezmoi.toml.tmpl @@ -7,7 +7,7 @@ command = "meld" {{ $hasNVim := promptBool "Do i install Neovim " false}} {{ $hasLVim := promptBool "Do i install LunarVim " false }} {{ $hasLatex := promptBool "Do i install LaTeX " false }} -{{ $hasCode := promptBool "Do i install VSCode " false }} +{{ $hasVSCode := promptBool "Do i install VSCode " false }} {{ $hasQuarto := promptBool "Do i install Quarto " false }} [git] autoCommit = true @@ -16,7 +16,7 @@ autoPush = true hasNVim = {{ $hasNVim }} hasLVim = {{ $hasLVim }} hasLatex = {{ $hasLatex }} -hasCode = {{ $hasCode }} +hasVSCode = {{ $hasVSCode }} hasQuarto = {{ $hasQuarto }} email = {{ $email | quote }} signinkey = {{ $signinkey | quote }} diff --git a/home/.chezmoiscripts/run_once_onchange_10-install-packages.sh.tmpl b/home/.chezmoiscripts/run_once_onchange_10-install-packages.sh.tmpl index 1768fc3..b597ceb 100644 --- a/home/.chezmoiscripts/run_once_onchange_10-install-packages.sh.tmpl +++ b/home/.chezmoiscripts/run_once_onchange_10-install-packages.sh.tmpl @@ -19,7 +19,7 @@ args="--base --zsh" args="${args} --latex" {{- end }} -{{- if (ne .hasCode false) }} +{{- if (ne .hasVSCode false) }} args="${args} --vscode" {{- end }} @@ -27,6 +27,7 @@ args="--base --zsh" args="${args} --quarto" {{- end }} + {{ if (eq .chezmoi.os "linux") -}} {{ if (eq .chezmoi.osRelease.id "manjaro" "arch") -}} diff --git a/scripts/manjaro.sh b/scripts/manjaro.sh index 8a48142..d658299 100644 --- a/scripts/manjaro.sh +++ b/scripts/manjaro.sh @@ -12,7 +12,7 @@ usage() { echo " --zsh Install deps for zsh" echo " --latex Install deps for latex" echo " --quarto Install deps for quarto" - echo " --code Install deps for VSCode" + echo " --vscode Install deps for VSCode" } # packages to install @@ -112,7 +112,7 @@ NVIM=false LVIM=false ZSH=false LATEX=false -CODE=false +VSCODE=false QUARTO=false if [ "$#" -eq 0 ]; then @@ -127,7 +127,7 @@ while [ "$#" -gt 0 ]; do --lvim) LVIM=true ;; --zsh) ZSH=true ;; --latex) LATEX=true ;; - --vscode) CODE=true;; + --vscode) VSCODE=true;; --quarto) QUARTO=true;; *) usage @@ -144,7 +144,7 @@ main() { "$LVIM" && install_lvim "$ZSH" && install_zsh "$LATEX" && install_latex - "$CODE" && install_vscode + "$VSCODE" && install_vscode "$QUARTO" && install_quarto && configure_quarto ## Install yay