little order rehash
This commit is contained in:
parent
70ba26e313
commit
0b1af2a914
@ -91,15 +91,6 @@ pad() {
|
|||||||
|
|
||||||
|
|
||||||
print_block
|
print_block
|
||||||
new_line "Installing my authorized_keys"
|
|
||||||
|
|
||||||
mkdir ~/.ssh 2>/dev/null || true
|
|
||||||
cp ~/.ssh/authorized_keys ~/.ssh/authorized_keys.old 2>/dev/null || true
|
|
||||||
|
|
||||||
##print only unique lines
|
|
||||||
cat ~/.ssh/authorized_keys.old <(echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdqIDeRKDOh7NQDcqnmLH/6M0ys7Wt/SEnF6ZYqroiH") 2>/dev/null | awk '!seen[$1]++' > ~/.ssh/authorized_keys
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
new_line "Update caches and upgrade packages"
|
new_line "Update caches and upgrade packages"
|
||||||
|
|
||||||
@ -187,19 +178,16 @@ new_line "Install neovim, fish, atuin, jump and the rest"
|
|||||||
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
|
||||||
|
|
||||||
{{ else if eq .chezmoi.osRelease.id "fedora" -}}
|
{{ else if eq .chezmoi.osRelease.id "fedora" -}}
|
||||||
new_line "via DNF"
|
|
||||||
sudo dnf install neovim fish $ACT_PACKAGES fd-find skim pam_ssh_agent_auth -y 2>&1|pad
|
sudo dnf install neovim fish $ACT_PACKAGES fd-find skim pam_ssh_agent_auth -y 2>&1|pad
|
||||||
new_line "via NIX"
|
new_line "via NIX"
|
||||||
nix-env -iA nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit 2>&1|pad
|
nix-env -iA nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit 2>&1|pad
|
||||||
|
|
||||||
{{ else if eq .chezmoi.osRelease.id "arch" "archarm" -}}
|
{{ else if eq .chezmoi.osRelease.id "arch" "archarm" -}}
|
||||||
new_line "via Pacman"
|
|
||||||
sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim lazygit 2>&1|pad
|
sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim lazygit 2>&1|pad
|
||||||
new_line "via NIX"
|
new_line "via NIX"
|
||||||
nix-env -iA nixpkgs.jump nixpkgs.du-dust 2>&1|pad
|
nix-env -iA nixpkgs.jump nixpkgs.du-dust 2>&1|pad
|
||||||
|
|
||||||
{{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
|
{{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
|
||||||
new_line "via APT"
|
|
||||||
sudo apt-get install fish -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 neovim -y 2>&1|pad
|
||||||
sudo apt-get install $ACT_PACKAGES libpam-ssh-agent-auth -y 2>&1|pad
|
sudo apt-get install $ACT_PACKAGES libpam-ssh-agent-auth -y 2>&1|pad
|
||||||
@ -216,6 +204,18 @@ new_line "manually installing LazyGit"
|
|||||||
rm ~/lazygit.tar.gz
|
rm ~/lazygit.tar.gz
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
|
|
||||||
|
new_line "Installing my authorized_keys"
|
||||||
|
|
||||||
|
mkdir ~/.ssh 2>/dev/null || true
|
||||||
|
cp ~/.ssh/authorized_keys ~/.ssh/authorized_keys.old 2>/dev/null || true
|
||||||
|
|
||||||
|
##print only unique lines
|
||||||
|
cat ~/.ssh/authorized_keys.old <(echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdqIDeRKDOh7NQDcqnmLH/6M0ys7Wt/SEnF6ZYqroiH") 2>/dev/null | awk '!seen[$1]++' > ~/.ssh/authorized_keys
|
||||||
|
|
||||||
|
new_line "Executing neovim :Lazy sync..."
|
||||||
|
timeout 50s nvim --headless "+Lazy! sync" +qa 2>&1|pad
|
||||||
|
timeout 30s nvim --headless ":MasonUpdate" +qa 2>&1|pad
|
||||||
|
|
||||||
{{ if eq .chezmoi.os "linux" -}}
|
{{ if eq .chezmoi.os "linux" -}}
|
||||||
new_line "Setting timezone to Moscow"
|
new_line "Setting timezone to Moscow"
|
||||||
sudo timedatectl set-timezone Europe/Moscow
|
sudo timedatectl set-timezone Europe/Moscow
|
||||||
@ -235,9 +235,6 @@ new_line "Configuring tide prompt for fish"
|
|||||||
fish -c "tide configure --auto --style=Classic --prompt_colors='True color' --classic_prompt_color=Dark --show_time='24-hour format' --classic_prompt_separators=Slanted --powerline_prompt_heads=Slanted --powerline_prompt_tails=Round --powerline_prompt_style='Two lines, frame' --prompt_connection=Disconnected --powerline_right_prompt_frame=No --prompt_connection_andor_frame_color=Darkest --prompt_spacing=Sparse --icons='Few icons' --transient=No" >/dev/null
|
fish -c "tide configure --auto --style=Classic --prompt_colors='True color' --classic_prompt_color=Dark --show_time='24-hour format' --classic_prompt_separators=Slanted --powerline_prompt_heads=Slanted --powerline_prompt_tails=Round --powerline_prompt_style='Two lines, frame' --prompt_connection=Disconnected --powerline_right_prompt_frame=No --prompt_connection_andor_frame_color=Darkest --prompt_spacing=Sparse --icons='Few icons' --transient=No" >/dev/null
|
||||||
fish -c "set -Ux tide_context_always_display true"
|
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 20s nvim --headless ":MasonUpdate" +qa 2>&1|pad
|
|
||||||
|
|
||||||
|
|
||||||
new_line "Change default shell to fish for user $USER"
|
new_line "Change default shell to fish for user $USER"
|
||||||
|
Loading…
Reference in New Issue
Block a user