diff --git a/dots/.bashrc b/dots/.bashrc
index 3e413cf..414534f 100644
--- a/dots/.bashrc
+++ b/dots/.bashrc
@@ -82,10 +82,6 @@ else
 fi
 # }}}
 
-# Go {{{
-export GOPATH="${XDG_DATA_HOME}/go"
-# }}}
-
 # Jupyter {{{
 export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab
 # }}}
diff --git a/home/modules/go/default.nix b/home/modules/go/default.nix
index f96760b..49a4816 100644
--- a/home/modules/go/default.nix
+++ b/home/modules/go/default.nix
@@ -5,18 +5,18 @@
   ...
 }:
 
-let
-  cfg = config.go;
-in
 {
   options.go = {
     enable = lib.mkEnableOption "Go";
   };
 
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      go
-      gopls
-    ];
+  config = lib.mkIf config.go.enable {
+    home = {
+      sessionVariables.GOPATH = "${config.xdg.dataHome}/go";
+      packages = with pkgs; [
+        go
+        gopls
+      ];
+    };
   };
 }