diff --git a/.profile b/.profile index 0c3aa6a..ab8e33d 100644 --- a/.profile +++ b/.profile @@ -1,5 +1,6 @@ # Fig pre block. Keep at the top of this file. [[ -f "$HOME/.fig/shell/profile.pre.bash" ]] && builtin source "$HOME/.fig/shell/profile.pre.bash" + # Load profiles from /etc/profile.d if test -d $HOME/.profile.d/; then for profile in $HOME/.profile.d/*.sh; do @@ -7,9 +8,7 @@ if test -d $HOME/.profile.d/; then done unset profile fi -<<<<<<< Updated upstream -======= # Fig post block. Keep at the bottom of this file. [[ -f "$HOME/.fig/shell/profile.post.bash" ]] && builtin source "$HOME/.fig/shell/profile.post.bash" ->>>>>>> Stashed changes +. "$HOME/.cargo/env" diff --git a/linux/.zshenv b/linux/.zshenv index 8a213e5..a5c6ce7 100644 --- a/linux/.zshenv +++ b/linux/.zshenv @@ -16,3 +16,4 @@ unset appendpath #THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! export SDKMAN_DIR="$HOME/.sdkman" [[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" +. "$HOME/.cargo/env" diff --git a/linux/.zshrc b/linux/.zshrc index 1d68f3d..9c5e547 100644 --- a/linux/.zshrc +++ b/linux/.zshrc @@ -93,10 +93,12 @@ plugins=( minikube mvn pep8 + poetry pip profiles pylint python + rustup themes tmux web-search