NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-01-13 22:17:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages: allow listOf format.type

Browse source
This commit is contained in:
Ching Pei Yang 2025-08-23 16:04:51 +02:00
commit 7bbc3b536f
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
24 changed files with 312 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/plugins/languages/rust.nix
View file

@ -11,16 +11,17 @@
inherit (lib.lists) isList;
inherit (lib.attrsets) attrNames;
inherit (lib.types) bool package str listOf either enum;
inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
inherit (lib.nvim.lua) expToLua toLuaObject;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption singleOrListOf mkPluginSetupOption;
inherit (lib.nvim.dag) entryAfter entryAnywhere;
cfg = config.vim.languages.rust;
defaultFormat = "rustfmt";
defaultFormat = ["rustfmt"];
formats = {
rustfmt = {
package = pkgs.rustfmt;
command = getExe pkgs.rustfmt;
};
};
in {
@ -69,15 +70,9 @@ in {
type = mkOption {
description = "Rust formatter to use";
type = enum (attrNames formats);
type = singleOrListOf (enum (attrNames formats));
default = defaultFormat;
};
package = mkOption {
description = "Rust formatter package";
type = package;
default = formats.${cfg.format.type}.package;
};
};
dap = {
@ -127,9 +122,14 @@ in {
(mkIf cfg.format.enable {
vim.formatter.conform-nvim = {
enable = true;
setupOpts.formatters_by_ft.rust = [cfg.format.type];
setupOpts.formatters.${cfg.format.type} = {
command = getExe cfg.format.package;
setupOpts = {
formatters_by_ft.rust = cfg.format.type;
formatters =
mapListToAttrs (name: {
inherit name;
value = formats.${name};
})
cfg.format.type;
};
};
})