diff --git a/dot_config/fish/conf.d/30-go.fish b/dot_config/fish/conf.d/30-go.fish
index 30f1439..43376ff 100644
--- a/dot_config/fish/conf.d/30-go.fish
+++ b/dot_config/fish/conf.d/30-go.fish
@@ -1,5 +1,8 @@
 #!/usr/bin/env fish
 
+set -Ux GOPATH "$XDG_DATA_HOME/go"
+set -Ux GOMODCACHE "$XDG_CACHE_HOME/go/mod"
+
 if command -v go &>/dev/null
-    fish_add_path "$HOME/go/bin"
+    fish_add_path "$XDG_DATA_HOME/go/bin"
 end