diff --git a/fish/.config/fish/conf.d/setup.fish b/fish/.config/fish/conf.d/setup.fish
index d303354..41da796 100644
--- a/fish/.config/fish/conf.d/setup.fish
+++ b/fish/.config/fish/conf.d/setup.fish
@@ -1,4 +1,9 @@
 function __fish_setup_on_tty_login --description "Set up environment on tty login"
+  set -qx XDG_CONFIG_HOME; or set -Ux XDG_CONFIG_HOME $HOME/.config
+  set -qx XDG_CACHE_HOME; or set -Ux XDG_CACHE_HOME $HOME/.cache
+  set -qx XDG_DATA_HOME; or set -Ux XDG_DATA_HOME $HOME/.local/share
+  set -qx XDG_STATE_HOME; or set -Ux XDG_STATE_HOME $HOME/.local/state
+
   for extra_path in ~/.{local,nix-profile,cargo,cabal,ghcup}/bin
     if test -d "$extra_path"
       set -gxp PATH "$extra_path"