diff --git a/home/.chezmoiscripts/run_once_after_30-install-lvim.sh.tmpl b/home/.chezmoiscripts/run_once_after_30-install-lvim.sh.tmpl index f03b742..1f953ca 100644 --- a/home/.chezmoiscripts/run_once_after_30-install-lvim.sh.tmpl +++ b/home/.chezmoiscripts/run_once_after_30-install-lvim.sh.tmpl @@ -2,11 +2,11 @@ # include lib . ${CHEZMOI_WORKING_TREE}/scripts/utils.sh -. ${HOME}/.asdf/asdf.sh # LVim version lvim_version="1.4" + {{- if (and (ne .hasNVim false) (ne .hasLVim false)) }} log "Begin LVim installation" 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 1160553..62e5443 100644 --- a/home/.chezmoiscripts/run_once_onchange_10-install-packages.sh.tmpl +++ b/home/.chezmoiscripts/run_once_onchange_10-install-packages.sh.tmpl @@ -6,6 +6,7 @@ # args args="--base --zsh" + {{- if (ne .hasNVim false) }} args="${args} --nvim" {{- end }} diff --git a/home/dot_zshenv b/home/dot_zshenv index cbea5bc..5dd216e 100644 --- a/home/dot_zshenv +++ b/home/dot_zshenv @@ -23,7 +23,7 @@ export TERMINAL=alacritty export GEM_HOME="$(${HOME}/.asdf/shims/gem env user_gemhome)" export PATH="$PATH:$GEM_HOME/bin" export MYVIMRC="${HOME}/.vimrc" -export PASSWORD_STORE_DIR="${HOME}/Private/.password-store" +export PASSWORD_STORE_DIR="${HOME}/.password-store" export PASSWORD_STORE_ENABLE_EXTENSIONS=True export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus export ZK_NOTEBOOK_DIR="${HOME}/Notes"