diff --git a/dot_bashrc b/dot_bashrc
index dbb51e2..a6c0b9e 100644
--- a/dot_bashrc
+++ b/dot_bashrc
@@ -15,6 +15,9 @@ alias update="paru; paru -c"
 alias l="ls --ignore-glob '$([ -f .hidden ] && cat .hidden | tr '\n' '|')'"
 
 
+# XDG stuff
+export HISTFILE="${XDG_STATE_HOME}"/bash/history
+
 # Helpful tool: https://bash-prompt-generator.org
 # On github: https://github.com/Scriptim/bash-prompt-generator
 PS1='[\u@\h \w]\$ '
diff --git a/dot_config/environment.d/xdg.conf b/dot_config/environment.d/xdg.conf
index ba5108d..c003408 100644
--- a/dot_config/environment.d/xdg.conf
+++ b/dot_config/environment.d/xdg.conf
@@ -12,5 +12,11 @@ GOPATH=$XDG_DATA_HOME/go
 GTK2_RC_FILES=$XDG_CONFIG_HOME/gtk-2.0/gtkrc
 NUGET_PACKAGES=$XDG_CACHE_HOME/NuGetPackages
 _JAVA_OPTIONS=-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java
-RENPY_PATH_TO_SAVES=$XDG_DATA_HOME
-WINEPREFIX=$XDG_DATA_HOME/wine
\ No newline at end of file
+RENPY_PATH_TO_SAVES=$XDG_DATA_HOME/renpy
+WINEPREFIX=$XDG_DATA_HOME/wine
+ZDOTDIR=$XDG_CONFIG_HOME/zsh
+TEXMFVAR=$XDG_CACHE_HOME/texlive/texmf-var
+LEIN_HOME=$XDG_DATA_HOME/lein
+JULIA_DEPOT_PATH=$XDG_DATA_HOME/julia:$JULIA_DEPOT_PATH
+XCURSOR_PATH=/usr/share/icons:$XDG_DATA_HOME/icons
+ANDROID_USER_HOME=$XDG_DATA_HOME/android
\ No newline at end of file
diff --git a/dot_zshrc b/dot_zshrc
index e1306f7..a433ee2 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -68,6 +68,16 @@ alias .status="chezmoi git status"
 alias .diff="chezmoi git diff"
 alias .update="chezmoi update"
 
+# XDG zsh stuff
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+export HISTFILE="$XDG_STATE_HOME"/zsh/history
+
+# XDG aliases
+alias wget="wget --hsts-file='$XDG_DATA_HOME/wget-hsts'"
+alias yarn="yarn --use-yarnrc '$XDG_CONFIG_HOME/yarn/config'"
+alias units="units --history '$XDG_DATA_HOME/units_history'"
+alias nvidia-settings="nvidia-settings --config='$XDG_CONFIG_HOME/nvidia/settings'"
+alias adb="HOME='$XDG_DATA_HOME/android' adb"
 
 # Helpful tool: https://zsh-prompt-generator.site/
 # On github: https://github.com/k-yokoishi/zsh-prompt-generator