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

Merge 9e31b131a7 into 8b98f07862

Browse source
This commit is contained in:
Alfarel 2025-09-03 16:56:19 -07:00 • committed by GitHub
commit 4cd13450b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@
helm-ls = { helm-ls = {
yamlls = { yamlls = {
# TODO: Determine if this is a good enough solution # TODO: Determine if this is a good enough solution
path = (head yamlCfg.lsp.servers).cmd; path = config.vim.lsp.servers.${head yamlCfg.lsp.servers}.cmd;
}; };
}; };
}; };

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

@ -5,6 +5,7 @@
... ...
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.generators) mkLuaInline;
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
@ -14,16 +15,17 @@
cfg = config.vim.languages.yaml; cfg = config.vim.languages.yaml;
onAttach = on_attach = mkLuaInline (
if config.vim.languages.helm.lsp.enable if config.vim.languages.helm.lsp.enable && config.vim.languages.helm.enable
then '' then ''
on_attach = function(client, bufnr) function(client, bufnr)
local filetype = vim.bo[bufnr].filetype local filetype = vim.bo[bufnr].filetype
if filetype == "helm" then if filetype == "helm" then
client.stop() client.stop()
end end
end'' end''
else "on_attach = default_on_attach"; else "default_on_attach"
);
defaultServers = ["yaml-language-server"]; defaultServers = ["yaml-language-server"];
servers = { servers = {
@ -32,7 +34,7 @@
cmd = [(getExe pkgs.yaml-language-server) "--stdio"]; cmd = [(getExe pkgs.yaml-language-server) "--stdio"];
filetypes = ["yaml" "yaml.docker-compose" "yaml.gitlab" "yaml.helm-values"]; filetypes = ["yaml" "yaml.docker-compose" "yaml.gitlab" "yaml.helm-values"];
root_markers = [".git"]; root_markers = [".git"];
on_attach = onAttach; inherit on_attach;
# -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting # -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting
settings = { settings = {
redhat = { redhat = {