NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-27 11:55:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Snoweuph 2026-04-11 16:14:39 +02:00
commit 1ebef354a5
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
2 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/plugins/languages/hcl.nix
View file

@ -6,30 +6,17 @@
}: let
inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.hcl;
defaultServers = ["tofuls-hcl"];
servers = {
terraformls-hcl = {
enable = true;
cmd = [(getExe pkgs.terraform-ls) "serve"];
filetypes = ["hcl"];
root_markers = [".git"];
};
tofuls-hcl = {
enable = true;
cmd = [(getExe pkgs.tofu-ls) "serve"];
filetypes = ["hcl"];
root_markers = [".terraform" ".git"];
};
# TODO: package nomad-lsp and offer as an option here too
};
defaultServers = ["tofu-ls"];
servers = ["terraform-ls" "tofu-ls"];
defaultFormat = ["hclfmt"];
formats = {
@ -64,7 +51,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable";
};
servers = mkOption {
type = listOf (enum (attrNames servers));
type = listOf (enum servers);
default = defaultServers;
description = "HCL LSP server to use";
};
@ -116,13 +103,11 @@ in {
})
(mkIf cfg.lsp.enable {
vim = {
lsp.servers =
mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
vim.lsp = {
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
servers = genAttrs cfg.lsp.servers (_: {
filetypes = ["hcl"];
});
};
})