NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-21 14:26:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages/markdown: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-11 23:22:12 +02:00
commit 95bc599f75
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/plugins/languages/markdown.nix
View file

@ -5,6 +5,7 @@
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib) genAttrs;
inherit (lib.meta) getExe getExe'; inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.options) literalExpression mkEnableOption mkOption; inherit (lib.options) literalExpression mkEnableOption mkOption;
@ -17,28 +18,7 @@
cfg = config.vim.languages.markdown; cfg = config.vim.languages.markdown;
defaultServers = ["marksman"]; defaultServers = ["marksman"];
servers = { servers = ["marksman" "markdown-oxide" "rumdl"];
marksman = {
enable = true;
cmd = [(getExe pkgs.marksman) "server"];
filetypes = ["markdown" "mdx"];
root_markers = [".marksman.toml" ".git"];
};
markdown-oxide = {
enable = true;
cmd = [(getExe pkgs.markdown-oxide)];
filetypes = ["markdown"];
root_markers = [".git" ".obsidian" ".moxide.toml"];
};
rumdl = {
enable = true;
cmd = [(getExe pkgs.rumdl) "server"];
filetypes = ["markdown"];
root_markers = [".git" ".rumdl.toml" "rumdl.toml" ".config/rumdl.toml" "pyproject.toml"];
};
};
defaultFormat = ["deno_fmt"]; defaultFormat = ["deno_fmt"];
formats = { formats = {
@ -99,7 +79,7 @@ in {
servers = mkOption { servers = mkOption {
description = "Markdown LSP server to use"; description = "Markdown LSP server to use";
type = deprecatedSingleOrListOf "vim.language.markdown.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
}; };
}; };
@ -186,12 +166,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.servers = vim.lsp = {
mapListToAttrs (n: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
name = n; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${n}; filetypes = ["markdown" "mdx"];
}) });
cfg.lsp.servers; };
}) })
(mkIf cfg.format.enable { (mkIf cfg.format.enable {