From 0b1ba8a03ce04e49d264a624908789187ef6a3dc Mon Sep 17 00:00:00 2001 From: Anton Volnuhin Date: Tue, 21 May 2024 17:11:54 +0300 Subject: [PATCH] ubuntu20 fixes to be sure fish and neovim installed independently --- run_onchange_after_install_main_deps.sh.tmpl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/run_onchange_after_install_main_deps.sh.tmpl b/run_onchange_after_install_main_deps.sh.tmpl index 0e972a3..88e93e1 100644 --- a/run_onchange_after_install_main_deps.sh.tmpl +++ b/run_onchange_after_install_main_deps.sh.tmpl @@ -1,10 +1,10 @@ #!/usr/bin/env bash #Config -STEPS=15 +STEPS=16 PAD_LEN=4 -BASE_PACKAGES="gnupg curl wget git gcc pipx" -ACT_PACKAGES="ripgrep unzip htop fzf bat gawk jq nnn tmux mc nethogs ngrep mtr" +BASE_PACKAGES="gnupg curl wget git ncurses direnv" +ACT_PACKAGES="ripgrep unzip htop fzf bat gawk jq nnn tmux mc nethogs ngrep mtr pipx gcc" #Colors Green='\033[0;32m' # Green @@ -194,7 +194,9 @@ new_line "via NIX" {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} new_line "via APT" - sudo apt-get install fish neovim $ACT_PACKAGES libpam-ssh-agent-auth -y 2>&1|pad + sudo apt-get install fish -y 2>&1|pad + sudo apt-get install neovim -y 2>&1|pad + sudo apt-get install $ACT_PACKAGES libpam-ssh-agent-auth -y 2>&1|pad new_line "via NIX" nix-env -iA nixpkgs.neovim nixpkgs.jump nixpkgs.skim nixpkgs.du-dust nixpkgs.atuin 2>&1|pad @@ -229,7 +231,7 @@ fish -c "set -Ux tide_context_always_display true" new_line "Executing neovim :Lazy sync..." timeout 30s nvim --headless "+Lazy! sync" +qa 2>&1|pad -timeout 15s nvim --headless ":MasonUpdate" +qa 2>&1|pad +timeout 20s nvim --headless ":MasonUpdate" +qa 2>&1|pad new_line "Change default shell to fish for user $USER"