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

add helm and yaml

Browse source
This commit is contained in:
sjcobb 2025-06-15 22:32:34 +01:00
commit 171d96077e
2 changed files with 59 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

68
modules/plugins/languages/helm.nix
View file

@ -4,44 +4,37 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames head;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.meta) getExe;
inherit (lib.types) enum either listOf package str; inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.helm; cfg = config.vim.languages.helm;
yamlCfg = config.vim.languages.yaml; yamlCfg = config.vim.languages.yaml;
helmCmd = defaultServers = ["helm-ls"];
if isList cfg.lsp.package
then cfg.lsp.package
else ["${cfg.lsp.package}/bin/helm_ls" "serve"];
yamlCmd =
if isList yamlCfg.lsp.package
then builtins.elemAt yamlCfg.lsp.package 0
else "${yamlCfg.lsp.package}/bin/yaml-language-server";
defaultServer = "helm-ls";
servers = { servers = {
helm-ls = { helm-ls = {
package = pkgs.helm-ls; enable = true;
lspConfig = '' cmd = [(getExe pkgs.helm-ls) "serve"];
lspconfig.helm_ls.setup { filetypes = ["helm" "yaml.helm-values"];
capabilities = capabilities, root_markers = ["Chart.yaml"];
on_attach = default_on_attach, capabilities = {
cmd = ${expToLua helmCmd}, didChangeWatchedFiles = {
dynamicRegistration = true;
};
};
# TODO: Reconsider this? Not sure if that necessary.
settings = { settings = {
['helm-ls'] = { helm-ls = {
yamlls = { yamlls = {
path = "${yamlCmd}" path = (head yamlCfg.lsp.servers).cmd;
} };
} };
} };
}
'';
}; };
}; };
in { in {
@ -55,17 +48,10 @@ in {
lsp = { lsp = {
enable = mkEnableOption "Helm LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "Helm LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
server = mkOption {
description = "Helm LSP server to use"; description = "Helm LSP server to use";
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServers;
};
package = mkOption {
description = "Helm LSP server package";
type = either package (listOf str);
default = servers.${cfg.lsp.server}.package;
}; };
}; };
}; };
@ -77,8 +63,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.helm-lsp = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
}) })
{ {

60
modules/plugins/languages/yaml.nix
View file

@ -7,10 +7,10 @@
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.meta) getExe;
inherit (lib.types) enum either listOf package str; inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.yaml; cfg = config.vim.languages.yaml;
@ -25,23 +25,22 @@
end'' end''
else "on_attach = default_on_attach"; else "on_attach = default_on_attach";
defaultServer = "yaml-language-server"; defaultServers = ["yaml-language-server"];
servers = { servers = {
yaml-language-server = { yaml-language-server = {
package = pkgs.nodePackages.yaml-language-server; enable = true;
lspConfig = '' cmd = [(getExe pkgs.nodePackages.yaml-language-server) "--stdio"];
filetypes = ["yaml" "yaml.docker-compose" "yaml.gitlab" "yaml.helm-values"];
root_markers = [".git"];
lspconfig.yamlls.setup { on_attach = onAttach;
capabilities = capabilities, # -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting
${onAttach}, settings = {
cmd = ${ redhat = {
if isList cfg.lsp.package telemetry = {
then expToLua cfg.lsp.package enabled = false;
else ''{"${cfg.lsp.package}/bin/yaml-language-server", "--stdio"}'' };
}, };
} };
'';
}; };
}; };
in { in {
@ -55,18 +54,11 @@ in {
}; };
lsp = { lsp = {
enable = mkEnableOption "YAML LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "Yaml LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
server = mkOption { description = "Yaml LSP server to use";
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServers;
description = "YAML LSP server to use";
};
package = mkOption {
type = either package (listOf str);
default = servers.${cfg.lsp.server}.package;
description = "YAML LSP server package";
}; };
}; };
}; };
@ -78,8 +70,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.yaml-lsp = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
}) })
]); ]);
} }