diff --git a/run_onchange_after_install_main_deps.sh.tmpl b/run_onchange_after_install_main_deps.sh.tmpl
index bcfbaa7..18741c8 100644
--- a/run_onchange_after_install_main_deps.sh.tmpl
+++ b/run_onchange_after_install_main_deps.sh.tmpl
@@ -444,12 +444,18 @@ cat ~/.ssh/authorized_keys.old <(echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdqI
 
 if [ "$SKIP_NVIM_BOOTSTRAP" -eq 0 ]; then
 new_line "Waiting for neovim plugins and lsm compilations..."
-STRIP_ANSI="sed -e s/$(printf '\033')\[[0-9;]*[a-zA-Z]//g -e s/$(printf '\r')//g"
-TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":Lazy! sync" -c "sleep 10" -c "qa" 2>&1|$STRIP_ANSI|pad
-TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":lua pcall(vim.cmd, 'MasonUpdate')" -c "sleep 5" -c "qa" 2>&1|$STRIP_ANSI|pad
-TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":lua pcall(vim.cmd, 'MasonInstall lua-language-server')" -c "sleep 5" -c "qa" 2>&1|$STRIP_ANSI|pad
-TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":lua pcall(vim.cmd, 'MasonInstall rust-analyzer')" -c "sleep 5" -c "qa" 2>&1|$STRIP_ANSI|pad
-TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":TSUpdate" -c "sleep 5" -c "qa" 2>&1|$STRIP_ANSI|pad
+nvim_run() {
+  local wait=${1:-5}; shift
+  TERM=dumb ${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless \
+    -c "sleep 1" "$@" -c "sleep $wait" -c "qa" 2>&1 \
+    | sed -e "s/$(printf '\033')\[[0-9;]*[a-zA-Z]//g" -e "s/$(printf '\r')//g" \
+    | pad
+}
+nvim_run 10 -c ":Lazy! sync"
+nvim_run 5  -c ":lua pcall(vim.cmd, 'MasonUpdate')"
+nvim_run 5  -c ":lua pcall(vim.cmd, 'MasonInstall lua-language-server')"
+nvim_run 5  -c ":lua pcall(vim.cmd, 'MasonInstall rust-analyzer')"
+nvim_run 5  -c ":TSUpdate"
 fi
 
 {{ if eq .chezmoi.os "linux" -}}