diff --git a/fish/dot-config/environment.sh b/fish/dot-config/environment.sh
new file mode 100644
index 0000000..5eebca7
--- /dev/null
+++ b/fish/dot-config/environment.sh
@@ -0,0 +1,4 @@
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
diff --git a/fish/dot-config/fish/config.fish b/fish/dot-config/fish/config.fish
index 873b398..b5caa44 100644
--- a/fish/dot-config/fish/config.fish
+++ b/fish/dot-config/fish/config.fish
@@ -1,7 +1,7 @@
-set -U fish_greeting
+source ~/.config/environment.sh
 
 if status is-interactive
-    # Commands to run in interactive sessions can go here
+    set -g fish_greeting
 
     # Aliases
     alias cat="bat"