diff --git a/private_dot_config/private_fish/config.fish b/private_dot_config/private_fish/config.fish index a638699..5f48906 100644 --- a/private_dot_config/private_fish/config.fish +++ b/private_dot_config/private_fish/config.fish @@ -54,5 +54,8 @@ function icat kitty +kitten icat --align=left $argv end +if [ -e /home/anton/.nix-profile/etc/profile.d/nix.fish ]; . /home/anton/.nix-profile/etc/profile.d/nix.fish; end + + # The next line updates PATH for the Google Cloud SDK. if [ -f '/Users/anton/dev/google-cloud-sdk/path.fish.inc' ]; . '/Users/anton/dev/google-cloud-sdk/path.fish.inc'; end diff --git a/run_onchange_before_install_main_deps.sh.tmpl b/run_onchange_before_install_main_deps.sh.tmpl index fec067d..f5abb18 100644 --- a/run_onchange_before_install_main_deps.sh.tmpl +++ b/run_onchange_before_install_main_deps.sh.tmpl @@ -19,7 +19,7 @@ $Green########################################################################## {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} sudo apt-get update - DEBIAN_FRONTEND=noninteractive sudo apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" + sudo DEBIAN_FRONTEND=noninteractive apt-get -o "Dpkg::Options::=--force-confold" upgrade -y --allow-downgrades --allow-remove-essential --allow-change-held-packages {{ else if eq .chezmoi.osRelease.id "arch" -}} sudo pacman -Syu --noconfirm @@ -72,6 +72,7 @@ $Green########################################################################## ###############################################################################$NC" sleep 3 bash <(curl -L https://nixos.org/nix/install) --no-daemon + ~/.nix-profile/etc/profile.d/nix.sh fi {{ end -}} @@ -121,15 +122,15 @@ sleep 3 {{ if eq .chezmoi.osRelease.id "fedora" -}} sudo dnf install neovim fish $ACT_PACKAGES -y - bash -c "nix-env -iA nixpkgs.atuin nixpkgs.jump" + nix-env -iA nixpkgs.atuin nixpkgs.jump {{ else if eq .chezmoi.osRelease.id "arch" -}} sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES - bash -c "nix-env -iA nixpkgs.jump" + nix-env -iA nixpkgs.jump {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}} sudo apt install fish $ACT_PACKAGES -y - bash -c "nix-env -iA nixpkgs.neovim nixpkgs.jump" + nix-env -iA nixpkgs.neovim nixpkgs.jump if ! fish -c atuin &>/dev/null then bash <(curl https://raw.githubusercontent.com/ellie/atuin/main/install.sh)