diff --git a/users/refnode/common/optional/golang.nix b/users/refnode/common/optional/golang.nix
new file mode 100644
index 0000000..651d00f
--- /dev/null
+++ b/users/refnode/common/optional/golang.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  # Go development tools
+  
+  home.packages = with pkgs; [
+    # Go toolchain
+    unstable.go
+    unstable.gopls
+    unstable.goreleaser
+  ];
+}
\ No newline at end of file
diff --git a/users/refnode/default.nix b/users/refnode/default.nix
index f7cece3..b97e9fa 100644
--- a/users/refnode/default.nix
+++ b/users/refnode/default.nix
@@ -6,6 +6,7 @@
     ./common/optional/rust.nix
     ./common/optional/mailtools.nix
     ./common/optional/backup.nix
+    ./common/optional/golang.nix
   ];
 
   # specify my home-manager configs
@@ -76,9 +77,6 @@
     unstable.graphviz
     unstable.plantuml-c4
     unstable.ffmpeg_7
-    unstable.go
-    unstable.gopls
-    unstable.goreleaser
     unstable.nodejs_22
     unstable.yubikey-manager
     unstable.platformio