From 6a10aa25c39e3706dfe4edc98ebf6e36c9b57417 Mon Sep 17 00:00:00 2001
From: karitham <kar@karitham.dev>
Date: Wed, 29 Jul 2026 12:04:19 +0200
Subject: [PATCH] go: remove bundle from gotools

---
 modules/dev/editor/helix.nix | 37 ++++++++++++------------------------
 pkgs/gotools.nix             |  1 +
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/modules/dev/editor/helix.nix b/modules/dev/editor/helix.nix
index 74ded3a..caf8d7e 100644
--- a/modules/dev/editor/helix.nix
+++ b/modules/dev/editor/helix.nix
@@ -8,31 +8,18 @@
   ...
 }:
 let
-  # Remove modernize from gopls output since gotools already provides it
-  gopls-cleaned = pkgs.runCommand "gopls" { } ''
-    mkdir -p $out/bin
-    # Copy all bins except modernize
-    for bin in ${pkgs.gopls}/bin/*; do
-      if [[ "$(basename $bin)" != "modernize" ]]; then
-        ln -s $bin $out/bin/
-      fi
-    done
-  '';
-
-  global-tools =
-    with pkgs;
-    [
-      nixfmt
-      oxfmt
-      oxlint
-      typescript-go
-      golangci-lint
-      gopls-cleaned
-      sql-formatter
-      prettier
-      nufmt
-    ]
-    ++ [ self'.packages.gotools ];
+  global-tools = [
+    pkgs.nixfmt
+    pkgs.oxfmt
+    pkgs.oxlint
+    pkgs.typescript-go
+    pkgs.golangci-lint
+    pkgs.gopls
+    pkgs.sql-formatter
+    pkgs.prettier
+    pkgs.nufmt
+    self'.packages.gotools
+  ];
 
   tree-sitter-prr = pkgs.stdenv.mkDerivation {
     pname = "tree-sitter-prr";
diff --git a/pkgs/gotools.nix b/pkgs/gotools.nix
index 6c5065c..21c4c30 100644
--- a/pkgs/gotools.nix
+++ b/pkgs/gotools.nix
@@ -4,5 +4,6 @@ pkgs.gotools.overrideAttrs (_: {
     url = "https://github.com/karitham/gotools/commit/97818d312ebfc0e879de489035dee88e910fd95d.patch";
     hash = "sha256-2EYyelh/NmeO9PuCr5xlx9HhRrqfEjseXB7WLvdrJes=";
   };
+  excludedPackages = [ "cmd/bundle" ];
   vendorHash = "sha256-HpWkPsRJ0vCqJi9LoZcVbzeoPQ2B9ftZwuS1r47W7Sc=";
 })
-- 
2.51.2