NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-10-31 11:02:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

language/typst: migrate to conform/nvim-lint

Browse source
This commit is contained in:
Ching Pei Yang 2025-03-28 12:16:07 +01:00
commit d45763f7e2
No known key found for this signature in database
GPG key ID: B3841364253DC4C8
1 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,6 @@
inherit (lib.lists) isList; inherit (lib.lists) isList;
inherit (lib.types) nullOr enum either attrsOf listOf package str; inherit (lib.types) nullOr enum either attrsOf listOf package str;
inherit (lib.attrsets) attrNames; inherit (lib.attrsets) attrNames;
inherit (lib.generators) mkLuaInline;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.nvim.lua) expToLua toLuaObject; inherit (lib.nvim.lua) expToLua toLuaObject;
inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption; inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
@ -61,26 +60,10 @@
formats = { formats = {
typstfmt = { typstfmt = {
package = pkgs.typstfmt; package = pkgs.typstfmt;
nullConfig = ''
table.insert(
ls_sources,
null_ls.builtins.formatting.typstfmt.with({
command = "${cfg.format.package}/bin/typstfmt",
})
)
'';
}; };
# https://github.com/Enter-tainer/typstyle # https://github.com/Enter-tainer/typstyle
typstyle = { typstyle = {
package = pkgs.typstyle; package = pkgs.typstyle;
nullConfig = ''
table.insert(
ls_sources,
null_ls.builtins.formatting.typstfmt.with({
command = "${cfg.format.package}/bin/typstyle",
})
)
'';
}; };
}; };
in { in {
@ -176,8 +159,13 @@ in {
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {
vim.lsp.null-ls.enable = true; vim.formatter.conform-nvim = {
vim.lsp.null-ls.sources.typst-format = formats.${cfg.format.type}.nullConfig; enable = true;
setupOpts.formatters_by_ft.typst = [cfg.format.type];
setupOpts.formatters.${cfg.format.type} = {
command = getExe cfg.format.package;
};
};
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {