diff --git a/roles/home/helix.nix b/roles/home/helix.nix
index 0b7ffd5..65787b8 100644
--- a/roles/home/helix.nix
+++ b/roles/home/helix.nix
@@ -29,7 +29,8 @@ in
       shellcheck
       shfmt
       gopls
-      aichat
+      golangci-lint
+      golangci-lint-langserver
     ] ++ nodePkgs;
 
     sessionVariables = {
@@ -66,6 +67,10 @@ in
         [[language]]
         name = "nix"
         formatter = { command = "nixpkgs-fmt" }
+        
+        [[language]]
+        name = "go"
+        language-servers = ["gopls", "golangci-lint-langserver"]
       '';
     };
   };