From e0bcd93bea016dd8caf20495783cd1b3220bf08b Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Thu, 27 Mar 2025 20:14:05 +0100 Subject: [PATCH] language/nim: migrate to conform/nvim-lint --- modules/plugins/languages/nim.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/plugins/languages/nim.nix b/modules/plugins/languages/nim.nix index f218038e..69288223 100644 --- a/modules/plugins/languages/nim.nix +++ b/modules/plugins/languages/nim.nix @@ -6,6 +6,7 @@ }: let inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption; + inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.lists) isList; inherit (lib.types) enum either listOf package str; @@ -38,14 +39,9 @@ formats = { nimpretty = { package = pkgs.nim; - nullConfig = '' - table.insert( - ls_sources, - null_ls.builtins.formatting.nimpretty.with({ - command = "${pkgs.nim}/bin/nimpretty", - }) - ) - ''; + config = { + command = "${cfg.format.package}/bin/nimpretty"; + }; }; }; in { @@ -110,8 +106,11 @@ in { }) (mkIf cfg.format.enable { - vim.lsp.null-ls.enable = true; - vim.lsp.null-ls.sources.nim-format = formats.${cfg.format.type}.nullConfig; + vim.formatter.conform-nvim = { + enable = true; + setupOpts.formatters_by_ft.nim = [cfg.format.type]; + setupOpts.formatters.${cfg.format.type} = formats.${cfg.format.type}.config; + }; }) ]); }