From 856b064a19f8bbac70b45cba8f91ee2be1043a65 Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Thu, 27 Mar 2025 20:07:51 +0100
Subject: [PATCH] language/go: migrate to conform/nvim-lint
---
modules/plugins/languages/go.nix | 34 ++++++++------------------------
1 file changed, 8 insertions(+), 26 deletions(-)
diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix
index 3ac9ae77..9f8bca3c 100644
--- a/modules/plugins/languages/go.nix
+++ b/modules/plugins/languages/go.nix
@@ -38,36 +38,15 @@
formats = {
gofmt = {
package = pkgs.go;
- nullConfig = ''
- table.insert(
- ls_sources,
- null_ls.builtins.formatting.gofmt.with({
- command = "${cfg.format.package}/bin/gofmt",
- })
- )
- '';
+ config.command = "${cfg.format.package}/bin/gofmt";
};
gofumpt = {
package = pkgs.gofumpt;
- nullConfig = ''
- table.insert(
- ls_sources,
- null_ls.builtins.formatting.gofumpt.with({
- command = "${cfg.format.package}/bin/gofumpt",
- })
- )
- '';
+ config.command = getExe cfg.format.package;
};
golines = {
package = pkgs.golines;
- nullConfig = ''
- table.insert(
- ls_sources,
- null_ls.builtins.formatting.golines.with({
- command = "${cfg.format.package}/bin/golines",
- })
- )
- '';
+ config.command = "${cfg.format.package}/bin/golines";
};
};
@@ -153,8 +132,11 @@ in {
})
(mkIf cfg.format.enable {
- vim.lsp.null-ls.enable = true;
- vim.lsp.null-ls.sources.go-format = formats.${cfg.format.type}.nullConfig;
+ vim.formatter.conform-nvim = {
+ enable = true;
+ setupOpts.formatters_by_ft.go = [cfg.format.type];
+ setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config;
+ };
})
(mkIf cfg.dap.enable {