added topgrade last ran status

.bash_profile

@@ -9,3 +9,4 @@
 
 . "$HOME/.cargo/env"
 export BEATSABER_DIR="/home/tumble/.local/share/Steam/steamapps/common/Beat Saber"
+. "/home/tumble/.local/share/cargo/env"

.bashrc

@@ -11,25 +11,24 @@ alias youtube-dl=yt-dlp
 
 PS1='[\u@\h \W]\$ '
 
+# if [[ -d '$HOME/.cargo' ]]; then
+# 	. "$HOME/.cargo/env"
+# fi
+#
+#
+#
+# export PATH="$PATH:/home/tumble/.pyenv/bin:/home/tumble/.cargo/bin"
+
 
 
 # Python
-export PATH="$PATH:/home/tumble/.cargo/bin"
 # Ruby
-eval "$(rbenv init - bash)"
+#eval "$(rbenv init - bash)"
 
 
-export PNPM_HOME="/home/tumble/.local/share/pnpm"
-export PATH=$PATH:$PNPM_HOME
+export PNPM_HOME="$HOME/.local/share/pnpm"
+export CARGO_HOME="$HOME/.local/share/cargo"
+export RUSTUP_HOME="$HOME/.local/share/rustup"
 
 
-if [[ -d '$HOME/.cargo' ]]; then
-	. "$HOME/.cargo/env"
-fi
-
-
-
-export PATH="$PATH:/home/tumble/.pyenv/bin:/home/tumble/.cargo/bin"
-
-
-export PATH=$PATH:/home/tumble/.local/bin
+export PATH=$PATH:$CARGO_HOME/bin:$PNPM_HOME:/home/tumble/.local/bin

.config/fish/config.fish

@@ -8,12 +8,18 @@ if status is-interactive
     alias dl 'yt-dlp'
     alias youtube-dl 'yt-dlp'
 
-    # Equivalent to Bash exports
-    set -x PNPM_HOME "$HOME/.local/share/pnpm"
     
     # Ruby
-    status --is-command-substitution; and . (rbenv init -|psub)
+    #status --is-command-substitution; and . (rbenv init -|psub)
 
 
-    set -x PATH "$PATH" "$PNPM_HOME" "$HOME/.pyenv/bin"  "$HOME/.cargo/bin" "$HOME/.local/bin"
+    set -x PNPM_HOME "$HOME/.local/share/pnpm"
+    set -x CARGO_HOME "$HOME/.local/share/cargo"
+    set -x RUSTUP_HOME "$HOME/.local/share/rustup"
+
+    set -x PATH "$PATH" "$CARGO_HOME/bin" "$PNPM_HOME" "$HOME/.local/bin"
+
+    echo "Last ran 'topgrade'"
+    history topgrade -t -e | grep -E '^# (.*)'
+
 end

.local/bin/pnpm

@@ -3,8 +3,8 @@ if [ -z $PNPM_HOME ]; then
 	echo "Error: PNPM_HOME is not set, please set it in your .profile or shell rc file."
 	echo ""
 	echo "	e.g."
-	echo "		export PNPM_HOME=/home/$$USER/.local/share/pnpm"
-	echo "		export PATH=$$PATH:$PNPM_HOME"
+	echo "		export PNPM_HOME=\$HOME/.local/share/pnpm"
+	echo "		export PATH=\$PATH:\$PNPM_HOME"
 	echo ""
 	exit 1
 fi
@@ -23,14 +23,14 @@ if [ -z $PNPM_VERSION ]; then
 	PNPM_VERSION="$(printf '%s' "${version_json}" | tr '{' '\n' | awk -F '"' '/latest/ { print $4 }')"
 fi
 
-PNPM=${PNPM:=""}
+PNPM=${PNPM:="pnpm"}
 
 if [ ! `command -v $PNPM > /dev/null 2>&1` ]; then
 	PNPM=`mktemp`
-	PNPM_OS=${PNPM_OS:="linux"}
-	PNPM_ARCH=${PNPM_ARCH:="x64"}
+	OS=${OS:="linux"}
+	ARCH=${ARCH:="x64"}
 	echo "No pnpm was found, temporarily installing to ${PNPM}"
-	download "https://github.com/pnpm/pnpm/releases/download/v${PNPM_VERSION}/pnpm-${PNPM_OS}-${PNPM_ARCH}">$PNPM
+	download "https://github.com/pnpm/pnpm/releases/download/v${PNPM_VERSION}/pnpm-${OS}-${ARCH}">$PNPM
 	chmod +x $PNPM
 fi
 

.profile

@@ -14,7 +14,8 @@ else
 fi
 
 
-. "$HOME/.cargo/env"
+#. "$HOME/.cargo/env"
 
 
-export PATH=$PATH:/home/tumble/.local/share/pnpm
+#export PATH=$PATH:/home/tumble/.local/share/pnpm
+#. "/home/tumble/.local/share/cargo/env"