diff --git a/.omz-plugins/themes/agnoster-repopath.zsh-theme b/.omz-plugins/themes/agnoster-repopath.zsh-theme index f866178..5fd9b01 100644 --- a/.omz-plugins/themes/agnoster-repopath.zsh-theme +++ b/.omz-plugins/themes/agnoster-repopath.zsh-theme @@ -91,8 +91,8 @@ prompt_end() { # Context: user@hostname (who am I and where am I) prompt_context() { if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then - prompt_segment black default "%(!.%{%F{yellow}%}.)%n" -# prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m" +# prompt_segment black default "%(!.%{%F{yellow}%}.)%n" + prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m" fi } diff --git a/.ssh/known_hosts b/.ssh/known_hosts index 8b5568b..cc75ebf 100644 --- a/.ssh/known_hosts +++ b/.ssh/known_hosts @@ -18,3 +18,4 @@ |1|bxtf4G72Msif8ZiwDWgCWi9KiqM=|d3/z+NbKzwm4Pmsx5Kcd+IdG8x8= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIxcGWZQBeM9F/SY1BjZEjRIEm86cqHjJh94Ief8iJeR |1|k2kN7i/CvyhzjH7qgwTdygaMoQk=|0EuRpcnPtxFwpd3On2lzk9e755E= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJRA7oun9bD1wEkBJfl/2J4+Ed9C/8gQMRTV+j4Azv/yzGqg+oBlWYrXWXy5kSjSu8nau46BbutfVzpGILPRHiz9gOnaghPr/38dc0NIkuGCDAu9zCCenU298ha6oBiQYMBv9sVIMegKMZSk+OBog1mvmAKDawJ6PSJNTnUWMKsiC31ilnJN5kR05BawIQ4VicDt5/UziJ53KGxXMzxoDyTh0Pk6wtBbY2XTrvX0P1qE8p/0eYIYodo0Xs2NpuEHuYXwLS/cDClK6/hBS5s1ealepwbemvdqa1PZNeZGgnroBLToGxoCwabWg/a2gT+frFcUYegofqEyHWSSInmvfDqRs8OhQPl+VHmOCCseKRuxjjd7qluylsazbzaUDZhfoB2oD63OSZOLzUnbAV9z1tjZU+cqaPRJF5Yzr6jCwFdHEVFw3t8eHs0mMTtUmKuyg+RTQQ3PwHx84oEq3rtgLk89ZtsHr86CanFaZePMl2y8Fs9ySz2ID/NzEVIzYDUOU= |1|Y82Ni1xJKiWseF6GvHObDW7rWME=|kMsRZ0pfJjkAicqsFZidahaqJsU= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJWeZR8Kw1Dgm/ve5J1zQH+LjtzCl/R9lBc6vh+O5s2XoKT7+7k+MBAaUFFCA+AqyHB7xvvrvDyAZkZOace0zkA= +|1|c5zKAhroCCfl7B83jdeRdfcH6UQ=|7nATofZSgWQZg5HtR8+Xkiq590Q= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIvRMu9Ir59qeuS7WZr+gMu8fOz+1gx642ukY8k8T+pI0MHR/3gKNGgsUT8ccbHQvplK8XiujQ5Qtv3GoQqJSjk= diff --git a/.ssh/known_hosts.old b/.ssh/known_hosts.old index cc365f0..8b5568b 100644 --- a/.ssh/known_hosts.old +++ b/.ssh/known_hosts.old @@ -16,3 +16,5 @@ >>>>>>> Stashed changes |1|7VtgMeEonexq0vMPp4Cai2NXbBk=|3zl4oXSwzYPVVh+6L7csAddjUWI= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOcp/+jhkNiyH6Pul4dHvG38sp3RNFZdODMS5U+HX3c2 |1|bxtf4G72Msif8ZiwDWgCWi9KiqM=|d3/z+NbKzwm4Pmsx5Kcd+IdG8x8= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIxcGWZQBeM9F/SY1BjZEjRIEm86cqHjJh94Ief8iJeR +|1|k2kN7i/CvyhzjH7qgwTdygaMoQk=|0EuRpcnPtxFwpd3On2lzk9e755E= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJRA7oun9bD1wEkBJfl/2J4+Ed9C/8gQMRTV+j4Azv/yzGqg+oBlWYrXWXy5kSjSu8nau46BbutfVzpGILPRHiz9gOnaghPr/38dc0NIkuGCDAu9zCCenU298ha6oBiQYMBv9sVIMegKMZSk+OBog1mvmAKDawJ6PSJNTnUWMKsiC31ilnJN5kR05BawIQ4VicDt5/UziJ53KGxXMzxoDyTh0Pk6wtBbY2XTrvX0P1qE8p/0eYIYodo0Xs2NpuEHuYXwLS/cDClK6/hBS5s1ealepwbemvdqa1PZNeZGgnroBLToGxoCwabWg/a2gT+frFcUYegofqEyHWSSInmvfDqRs8OhQPl+VHmOCCseKRuxjjd7qluylsazbzaUDZhfoB2oD63OSZOLzUnbAV9z1tjZU+cqaPRJF5Yzr6jCwFdHEVFw3t8eHs0mMTtUmKuyg+RTQQ3PwHx84oEq3rtgLk89ZtsHr86CanFaZePMl2y8Fs9ySz2ID/NzEVIzYDUOU= +|1|Y82Ni1xJKiWseF6GvHObDW7rWME=|kMsRZ0pfJjkAicqsFZidahaqJsU= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJWeZR8Kw1Dgm/ve5J1zQH+LjtzCl/R9lBc6vh+O5s2XoKT7+7k+MBAaUFFCA+AqyHB7xvvrvDyAZkZOace0zkA= diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 0730ffb..fbbea51 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,7 +1,8 @@ #!/bin/bash # MANUALLY: need /etc/sudoers edited to add myself to sudoers -# ALSO: need to manually edit /etc/apt/sources.list to change to testing +# ALSO: need to manually edit /etc/apt/sources.list to add testing +# TODO: write a script that will automatically do that, even if it has to be run as sudo # ALSO ALSO: run this manually, its weird to automate for some reason # bash -ci \"$(wget -qO - 'https://shlink.makedeb.org/install')\" @@ -23,7 +24,7 @@ echo "deb [signed-by=/usr/share/keyrings/mullvad-keyring.asc arch=$( dpkg --prin sudo apt update && sudo apt upgrade -y # apt -sudo apt install -y autorandr i3 polybar lightdm-gtk-greeter lightdm flatpak yadm git python3 pipx alacritty i3lock-fancy network-manager-applet rofi dunst htop wget keepassxc-full net-tools vim mullvad-vpn flameshot caffeine pasystray tmux plasma-discover-backend-flatpak zsh autorandr kdeconnect fwupd numlockx +sudo apt install -y autorandr i3 polybar lightdm-gtk-greeter lightdm flatpak yadm git python3 pipx alacritty i3lock-fancy network-manager-applet rofi dunst htop wget keepassxc-full net-tools vim mullvad-vpn flameshot caffeine pasystray tmux plasma-discover-backend-flatpak zsh autorandr kdeconnect fwupd numlockx neofetch # chsh chsh melissa -s /bin/zsh @@ -38,15 +39,16 @@ yadm submodule update --init --recursive flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo # flatpak installs -flatpak install com.discordapp.Discord com.spotify.Client mo.kozec.syncthingtk org.jitsi.jitsi-meet org.signal.Signal org.telegram.desktop us.zoom.Zoom +flatpak install com.discordapp.Discord com.spotify.Client me.kozec.syncthingtk org.jitsi.jitsi-meet org.signal.Signal org.telegram.desktop us.zoom.Zoom # am wget -q https://raw.githubusercontent.com/ivan-hc/AM/main/AM-INSTALLER && chmod a+x ./AM-INSTALLER && ./AM-INSTALLER && rm ./AM-INSTALLER -# cargo installs -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -rustup default stable -cargo install cargo-update neofetch +# this is both broken at the moment and doesn't matter all that much because I'm not currently using cargo for anything. +# # cargo installs +# curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh +# rustup default stable +# cargo install cargo-update # pipx pipx install topgrade termdown