diff --git a/fish/.config/fish/conf.d/setup.fish b/fish/.config/fish/conf.d/setup.fish
index b160b41..e5e9831 100644
--- a/fish/.config/fish/conf.d/setup.fish
+++ b/fish/.config/fish/conf.d/setup.fish
@@ -1,5 +1,5 @@
 function __fish_setup_on_tty_login --description "Set up environment on tty login"
-    for extra_path in ~/.{local,nix-profile,cargo,cabal,ghcup}/bin
+    for extra_path in ~/.{local,nix-profile,cargo,cabal,ghcup,go}/bin
         if test -d "$extra_path"
             set -gxp PATH "$extra_path"
         end
@@ -37,6 +37,11 @@ function __fish_setup_on_tty_login --description "Set up environment on tty logi
     # Needed for work
     set -gx ENV qa-tunnel
 
+    if test -d {$HOME}/.go
+        set -gx GOBIN {$HOME}/.go/bin
+        set -gx GOPATH {$HOME}/.go
+    end
+
     # Required for all environment variables to be set correctly, especially
     # in tmux session service.
     dbus-update-activation-environment --systemd --all