improve OpenBSD installer output and fix neovim headless errors
- Add -v flag to pkg_add calls for verbose download/install progress - Wrap Mason commands in pcall() to handle plugin not yet loaded - Increase nvim headless timeout to 120s (ARM64 is slower) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
d59f8f3e1b
commit
07d0caa733
@ -201,7 +201,7 @@ new_line "Update caches and upgrade packages"
|
|||||||
|
|
||||||
{{ else if eq .chezmoi.os "openbsd" -}}
|
{{ else if eq .chezmoi.os "openbsd" -}}
|
||||||
|
|
||||||
$SUDO pkg_add -u 2>&1|pad
|
$SUDO pkg_add -uv 2>&1|pad
|
||||||
|
|
||||||
{{ else if eq .chezmoi.os "darwin" -}}
|
{{ else if eq .chezmoi.os "darwin" -}}
|
||||||
if ! command -v brew >/dev/null 2>&1; then
|
if ! command -v brew >/dev/null 2>&1; then
|
||||||
@ -235,7 +235,7 @@ new_line "Install base packages"
|
|||||||
|
|
||||||
{{ else if eq .chezmoi.os "openbsd" -}}
|
{{ else if eq .chezmoi.os "openbsd" -}}
|
||||||
|
|
||||||
$SUDO pkg_add $BASE_PACKAGES py3-pipx direnv 2>&1|pad
|
$SUDO pkg_add -v $BASE_PACKAGES py3-pipx direnv 2>&1|pad
|
||||||
|
|
||||||
{{ else if eq .chezmoi.os "darwin" -}}
|
{{ else if eq .chezmoi.os "darwin" -}}
|
||||||
brew install -q $BASE_PACKAGES python pipx direnv goku 2>&1|pad
|
brew install -q $BASE_PACKAGES python pipx direnv goku 2>&1|pad
|
||||||
@ -392,7 +392,7 @@ $SUDO pkg install --yes $ACT_PACKAGES neovim fish atuin lazygit fd-find pam_ssh_
|
|||||||
|
|
||||||
{{ else if eq .chezmoi.os "openbsd" -}}
|
{{ else if eq .chezmoi.os "openbsd" -}}
|
||||||
|
|
||||||
$SUDO pkg_add neovim fish%main fd ripgrep unzip-- htop fzf bat gawk jq nnn-- mc ngrep mtr-- gcc%11 2>&1|pad
|
$SUDO pkg_add -v neovim fish%main fd ripgrep unzip-- htop fzf bat gawk jq nnn-- mc ngrep mtr-- gcc%11 2>&1|pad
|
||||||
|
|
||||||
{{ else if eq .chezmoi.os "darwin" -}}
|
{{ else if eq .chezmoi.os "darwin" -}}
|
||||||
brew install -q fish neovim $ACT_PACKAGES atuin jump fd sk dust lazygit 2>&1|pad
|
brew install -q fish neovim $ACT_PACKAGES atuin jump fd sk dust lazygit 2>&1|pad
|
||||||
@ -444,11 +444,11 @@ cat ~/.ssh/authorized_keys.old <(echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdqI
|
|||||||
|
|
||||||
if [ "$SKIP_NVIM_BOOTSTRAP" -eq 0 ]; then
|
if [ "$SKIP_NVIM_BOOTSTRAP" -eq 0 ]; then
|
||||||
new_line "Waiting for neovim plugins and lsm compilations..."
|
new_line "Waiting for neovim plugins and lsm compilations..."
|
||||||
${TIMEOUT_BIN:+$TIMEOUT_BIN 60s} nvim --headless -c "sleep 1" -c ":Lazy! sync" -c "sleep 10" -c "qa" 2>&1|pad
|
${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":Lazy! sync" -c "sleep 10" -c "qa" 2>&1|pad
|
||||||
${TIMEOUT_BIN:+$TIMEOUT_BIN 60s} nvim --headless -c "sleep 1" -c ":MasonUpdate" -c "sleep 5" -c "qa" 2>&1|pad
|
${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":lua pcall(vim.cmd, 'MasonUpdate')" -c "sleep 5" -c "qa" 2>&1|pad
|
||||||
${TIMEOUT_BIN:+$TIMEOUT_BIN 60s} nvim --headless -c "sleep 1" -c ":MasonInstall lua-language-server" -c "sleep 5" -c "qa" 2>&1|pad
|
${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|pad
|
||||||
${TIMEOUT_BIN:+$TIMEOUT_BIN 60s} nvim --headless -c "sleep 1" -c ":MasonInstall rust-analyzer" -c "sleep 5" -c "qa" 2>&1|pad
|
${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|pad
|
||||||
${TIMEOUT_BIN:+$TIMEOUT_BIN 60s} nvim --headless -c "sleep 1" -c ":TSUpdate" -c "sleep 5" -c "qa" 2>&1|pad
|
${TIMEOUT_BIN:+$TIMEOUT_BIN 120s} nvim --headless -c "sleep 1" -c ":TSUpdate" -c "sleep 5" -c "qa" 2>&1|pad
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{{ if eq .chezmoi.os "linux" -}}
|
{{ if eq .chezmoi.os "linux" -}}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user