diff --git a/modules/plugins/languages/rust.nix b/modules/plugins/languages/rust.nix index aea10687..2181623a 100644 --- a/modules/plugins/languages/rust.nix +++ b/modules/plugins/languages/rust.nix @@ -5,6 +5,7 @@ ... }: let inherit (builtins) attrNames; + inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.options) mkOption mkEnableOption; inherit (lib.strings) optionalString; @@ -21,14 +22,6 @@ formats = { rustfmt = { package = pkgs.rustfmt; - nullConfig = '' - table.insert( - ls_sources, - null_ls.builtins.formatting.rustfmt.with({ - command = "${cfg.format.package}/bin/rustfmt", - }) - ) - ''; }; }; in { @@ -128,8 +121,13 @@ in { }) (mkIf cfg.format.enable { - vim.lsp.null-ls.enable = true; - vim.lsp.null-ls.sources.rust-format = formats.${cfg.format.type}.nullConfig; + vim.formatter.conform-nvim = { + enable = true; + setupOpts.formatters_by_ft.rust = [cfg.format.type]; + setupOpts.formatters.${cfg.format.type} = { + command = getExe cfg.format.package; + }; + }; }) (mkIf (cfg.lsp.enable || cfg.dap.enable) {