Replace on-PATH ~/.dotnet with ~/.dotnet/tools

[khome.git] / home / lib / login_variables.sh

diff --git a/home/lib/login_variables.sh b/home/lib/login_variables.sh
index a7013a5..6912423 100644 (file)
--- a/home/lib/login_variables.sh
+++ b/home/lib/login_variables.sh
@@ -1,4 +1,4 @@
-export PATH=$HOME/bin:/snap/bin:/sbin:/usr/sbin:$PATH
+export PATH=$HOME/bin:$HOME/.local/bin:$HOME/go/bin:/snap/bin:/sbin:/usr/sbin:$PATH
 export EDITOR=vim
 export VISUAL=$EDITOR
 export DIR_GITHUB="${HOME}/Archives/Software/src/repos/remote/github.com"
@@ -14,8 +14,14 @@ export NQDIR="$HOME/var/run/nq"
 mkdir -p "$NQDIR"
 
 # .Net Core
-export DOTNET_ROOT=$HOME/.dotnet
-export PATH=$PATH:$HOME/.dotnet
+DOTNET_ROOT_path=$(which dotnet)
+DOTNET_ROOT_realpath=$(realpath "$DOTNET_ROOT_path")
+DOTNET_ROOT_dirname=$(dirname "$DOTNET_ROOT_realpath")
+export DOTNET_ROOT="$DOTNET_ROOT_dirname"
+export PATH=$PATH:$HOME/.dotnet/tools
+
+# Rust / cargo
+export PATH=$PATH:$HOME/.cargo/bin
 
 # DPI
 . "$HOME/lib/login_variables_dpi.sh"