Use APT to install the rust toolchain

.bashrc

@@ -125,7 +125,6 @@ fi
 
 # Hook up direnv
 eval "$(direnv hook bash)"
-. "$HOME/.cargo/env"
 
 # Tell GPG in where to open the pinentry dialog
 GPG_TTY="$(tty)"

.config/setup/01-install-packages.sh

@@ -9,6 +9,8 @@ black \
 bluez \
 borgbackup \
 build-essential \
+cargo \
+cargo-doc \
 curl \
 direnv \
 docker.io \
@@ -51,6 +53,8 @@ python3-pylsp-rope \
 python3.12-venv \
 qtwayland5 \
 reuse \
+rust-doc \
+rust-llvm \
 shellcheck \
 slurp \
 software-properties-common \

.config/setup/21-install-rustup.sh

@@ -1,3 +0,0 @@
-#! /usr/bin/sh
-
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

.local/bin/upgrade

@@ -22,6 +22,5 @@ pipx_update() {
 
 apt_update
 pipx_update
-rustup update
 cargo_update
 ghup

.profile

@@ -21,6 +21,10 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
+if [ -d "$HOME/.cargo/bin" ] ; then
+    PATH="$HOME/.cargo/bin:$PATH"
+fi
+
 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/.local/bin" ] ; then
     PATH="$HOME/.local/bin:$PATH"
@@ -37,7 +41,6 @@ export BORG_REPO="/media/backup/"
 export BORG_PASSCOMMAND="cat ${HOME}/.keys/borg-passphrase.txt"
 export PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
 export XDG_CURRENT_DESKTOP="sway"
-. "$HOME/.cargo/env"
 
 # If running from tty1 start sway inside a zellij session
 [ "$(tty)" = "/dev/tty1" ] && exec zellij --layout sway --session sway