diff --git a/base/bashrc b/base/bashrc
index aca944c..5f54f03 100644
--- a/base/bashrc
+++ b/base/bashrc
@@ -3,9 +3,6 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
-export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
-# shellcheck source=scripts/shared.sh
-# source "$DOTFILES/scripts/shared.sh"
 
 # Explicitly set XDG folders
 # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -18,7 +15,14 @@ export XDG_BIN_HOME="$HOME/.local/bin"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_RUNTIME_DIR="$HOME/.local/run"
 
+# Paths
+export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
+
+# shellcheck source=scripts/shared.sh
+# source "$DOTFILES/scripts/shared.sh"
+
 source "$DOTFILES/config/exports"
+source "$DOTFILES/config/alias"
 
 # shellcheck source=../config/fzf/fzf.bash
 [ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&
diff --git a/base/zshrc b/base/zshrc
index 90fe9dd..35e253f 100755
--- a/base/zshrc
+++ b/base/zshrc
@@ -1,7 +1,20 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
+export DOTFILES="$HOME/.dotfiles"
+
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
+
+export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
 
 source "$DOTFILES/config/exports"
 source "$DOTFILES/config/alias"
diff --git a/config/exports b/config/exports
index 77c7b10..a1c3c72 100755
--- a/config/exports
+++ b/config/exports
@@ -60,4 +60,3 @@ function have_brew
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"
 
-x-have nvim && export EDITOR="nvim"