diff --git a/home.nix b/home.nix
index d3b9c25..cc1aed6 100644
--- a/home.nix
+++ b/home.nix
@@ -14,6 +14,7 @@
     ./programs/git.nix
     ./programs/bat.nix
     ./programs/helix.nix
+    ./programs/go.nix
   ];
 
   programs.home-manager.enable = true;
diff --git a/programs/fish/conf.d/02_tooling.fish b/programs/fish/conf.d/02_tooling.fish
index d7fe5ab..c337bf8 100644
--- a/programs/fish/conf.d/02_tooling.fish
+++ b/programs/fish/conf.d/02_tooling.fish
@@ -30,10 +30,6 @@ set -x NEXT_TELEMETRY_DISABLED 1    # Next.js
 set -x CHECKPOINT_DISABLE 1         # Prisma
 set -x DISABLE_TELEMETRY YES        # diffusers
 
-# go
-set -x GOPATH "$HOME/.go"
-fish_add_path "$GOPATH/bin"
-
 # direnv
 set -x DIRENV_LOG_FORMAT ""
 
diff --git a/programs/go.nix b/programs/go.nix
new file mode 100644
index 0000000..f2b594c
--- /dev/null
+++ b/programs/go.nix
@@ -0,0 +1,6 @@
+{...}: {
+  programs.go = {
+    enable = true;
+    goPath = ".go";
+  };
+}
diff --git a/programs/zsh/envExtra.zsh b/programs/zsh/envExtra.zsh
index 405649d..2e01d95 100644
--- a/programs/zsh/envExtra.zsh
+++ b/programs/zsh/envExtra.zsh
@@ -32,10 +32,6 @@ export NEXT_TELEMETRY_DISABLED=1    # Next.js
 export CHECKPOINT_DISABLE=1         # Prisma
 export DISABLE_TELEMETRY=YES        # diffusers
 
-# go
-export GOPATH="$HOME/.go"
-export PATH="$GOPATH/bin:$PATH"
-
 # direnv
 export DIRENV_LOG_FORMAT=""