diff --git a/plugins/lsp/language-servers/default.nix b/plugins/lsp/language-servers/default.nix
index b52b315e..11f98ce4 100644
--- a/plugins/lsp/language-servers/default.nix
+++ b/plugins/lsp/language-servers/default.nix
@@ -244,6 +244,12 @@ with lib; let
       name = "gopls";
       description = "gopls for Go";
     }
+    {
+      name = "golangci-lint-ls";
+      description = "golangci-lint-ls for Go";
+      serverName = "golangci_lint_ls";
+      package = pkgs.golangci-lint-langserver;
+    }
     {
       name = "graphql";
       description = "graphql for GraphQL";
diff --git a/tests/test-sources/plugins/lsp/_lsp.nix b/tests/test-sources/plugins/lsp/_lsp.nix
index 0b9d238d..29e161e4 100644
--- a/tests/test-sources/plugins/lsp/_lsp.nix
+++ b/tests/test-sources/plugins/lsp/_lsp.nix
@@ -108,6 +108,7 @@
           futhark-lsp.enable = true;
           gleam.enable = true;
           gopls.enable = true;
+          golangci-lint-ls.enable = true;
           graphql.enable = true;
           helm-ls.enable = true;
           hls.enable = true;