From cc2c9b948bf0f4d283275af0e90c3cc39c50d24d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 26 Nov 2025 09:13:03 +0000
Subject: [PATCH] raceless go is a nicer go

---
 flake.nix                    |  4 ++--
 pkgs/go-raceless/default.nix | 10 +++++++---
 shared/home/default.nix      |  1 +
 shared/home/dev.lua          |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5006b4d..5fc4d58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,7 +99,7 @@
         #  };
         #  deploy-rs-pkg = null;
         #})
-        (_: super: {
+        (_: super: rec {
           gamja = super.callPackage ./pkgs/gamja.nix { };
           weather = super.callPackage ./pkgs/weather { };
           nicer = super.callPackage ./pkgs/nicer.nix { };
@@ -108,7 +108,7 @@
           chronoctl = super.callPackage ./pkgs/chronoctl.nix { };
           vanta-agent = super.callPackage ./pkgs/vanta-agent.nix { };
           gcloud-wrapped = super.callPackage ./pkgs/gcloud-wrapped { };
-          go-raceless = super.callPackage ./pkgs/go-raceless { };
+          go-raceless = super.callPackage ./pkgs/go-raceless { inherit (nicer) ; };
 
           pkgs-unstable = import nixpkgs-unstable {
             inherit (super) system;
diff --git a/pkgs/go-raceless/default.nix b/pkgs/go-raceless/default.nix
index 37da7a8..f8cd471 100644
--- a/pkgs/go-raceless/default.nix
+++ b/pkgs/go-raceless/default.nix
@@ -1,4 +1,8 @@
-{ pkgs, go }:
+{
+  pkgs,
+  go,
+  nicer,
+}:
 let
   go-script = pkgs.writeShellScript "go-raceless" ''
     args=("$@")
@@ -22,11 +26,11 @@ let
         done
 
         if [[ "$found_race" == "true" ]]; then
-            exec ${go}/bin/go "''${new_args[@]}"
+            exec ${nicer}/bin/nicer ${go}/bin/go "''${new_args[@]}"
         fi
     fi
 
-    exec ${go}/bin/go "$@"
+    exec ${nicer}/bin/nicer ${go}/bin/go "$@"
   '';
 
   preservedAttrs = pkgs.lib.attrsets.getAttrs [
diff --git a/shared/home/default.nix b/shared/home/default.nix
index 5056a9e..2572b21 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -134,6 +134,7 @@ in
             builtins.readFile
               (pkgs.replaceVars ./dev.lua {
                 inherit (pkgs) ripgrep;
+                inherit (pkgs.pkgs-unstable) gopls;
               }).outPath;
         })
       ];
diff --git a/shared/home/dev.lua b/shared/home/dev.lua
index 3d19af2..c30c77e 100644
--- a/shared/home/dev.lua
+++ b/shared/home/dev.lua
@@ -3,7 +3,7 @@ require'lspconfig'.clangd.setup{
 }
 
 require'lspconfig'.gopls.setup{
-    cmd = { "nicer", "gopls" }
+    cmd = { "nicer", "@gopls@/bin/gopls" }
 }
 
 vim.api.nvim_exec([[