NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-08 08:25:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Snoweuph 2026-04-11 18:11:40 +02:00
commit 835d3db423
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,12 +4,10 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf; inherit (lib.types) enum listOf;
inherit (lib.meta) getExe; inherit (lib) genAttrs;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.openscad; cfg = config.vim.languages.openscad;
/* /*
@ -22,13 +20,7 @@
*/ */
defaultServers = ["openscad-lsp"]; defaultServers = ["openscad-lsp"];
servers = { servers = ["openscad-lsp"];
openscad-lsp = {
enable = true;
cmd = [(getExe pkgs.openscad-lsp) "--stdio"];
filetypes = ["openscad"];
};
};
in { in {
options.vim.languages.openscad = { options.vim.languages.openscad = {
enable = mkEnableOption "OpenSCAD language support"; enable = mkEnableOption "OpenSCAD language support";
@ -42,7 +34,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "OpenSCAD LSP server to use"; description = "OpenSCAD LSP server to use";
}; };
@ -51,12 +43,12 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
(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 = ["openscad"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }