2 files changed, 5 insertions, 2 deletions
diff --git a/zsh/env b/zsh/env
index f6df33a..83e4f8b 100644
--- a/zsh/env
+++ b/zsh/env
@@ -24,3 +24,6 @@ esac
 setopt EXTENDED_GLOB
 
 source_if_exists zsh/env
+
+export CARGO_HOME=${XDG_DATA_HOME}/cargo
+export RUSTUP_HOME=${XDG_DATA_HOME}/rustup
diff --git a/zsh/profile b/zsh/profile
index 7c70bb4..66ceab0 100644
--- a/zsh/profile
+++ b/zsh/profile
@@ -2,8 +2,8 @@
 
 () {
   local dir
-  for dir in ~/{.local/bin,bin} ${GOPATH:-~/go}/bin; do
-    [[ -d ${dir} ]] && path=(${dir} ${path})
+  for dir in ~/.local ${CARGO_HOME} ${GOPATH}; do
+    [[ -d ${dir}/bin ]] && path=(${dir}/bin ${path})
   done
 }