anton/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix fixes

Browse Source
This commit is contained in:
Anton Volnuhin 2023-05-30 09:06:45 +03:00
parent fc634f9b5f
commit 0cb28836c1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
private_dot_config/private_fish/config.fish
View File

@ -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

9
run_onchange_before_install_main_deps.sh.tmpl
View File

@ -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)