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

convert vala module

Browse source
This commit is contained in:
sjcobb 2025-07-11 14:14:03 +01:00
commit ea2094b89d
1 changed files with 45 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

73
modules/plugins/languages/vala.nix
View file

@ -7,17 +7,19 @@
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;
inherit (lib.generators) mkLuaInline;
cfg = config.vim.languages.vala; cfg = config.vim.languages.vala;
defaultServer = "vala_ls"; defaultServers = ["vala_ls"];
servers = { servers = {
vala_ls = { vala_ls = {
package = pkgs.symlinkJoin { enable = true;
cmd = [(getExe (pkgs.symlinkJoin {
name = "vala-language-server-wrapper"; name = "vala-language-server-wrapper";
paths = [pkgs.vala-language-server]; paths = [pkgs.vala-language-server];
buildInputs = [pkgs.makeBinaryWrapper]; buildInputs = [pkgs.makeBinaryWrapper];
@ -25,18 +27,35 @@
wrapProgram $out/bin/vala-language-server \ wrapProgram $out/bin/vala-language-server \
--prefix PATH : ${pkgs.uncrustify}/bin --prefix PATH : ${pkgs.uncrustify}/bin
''; '';
}; }))];
internalFormatter = true; filetypes = ["vala" "genie"];
lspConfig = '' root_dir = mkLuaInline ''
lspconfig.vala_ls.setup { function(bufnr, on_dir)
capabilities = capabilities; local meson_matcher = function(path)
on_attach = default_on_attach; local pattern = 'meson.build'
cmd = ${ local f = vim.fn.glob(table.concat({ path, pattern }, '/'))
if isList cfg.lsp.package if f == ''' then
then expToLua cfg.lsp.package return nil
else ''{"${cfg.lsp.package}/bin/vala-language-server"}'' end
}, for line in io.lines(f) do
} -- skip meson comments
if not line:match '^%s*#.*' then
local str = line:gsub('%s+', ''')
if str ~= ''' then
if str:match '^project%(' then
return path
else
break
end
end
end
end
end
local fname = vim.api.nvim_buf_get_name(bufnr)
local root = vim.iter(vim.fs.parents(fname)):find(meson_matcher)
on_dir(root or vim.fs.dirname(vim.fs.find('.git', { path = fname, upward = true })[1]))
end
''; '';
}; };
}; };
@ -51,16 +70,10 @@ in {
lsp = { lsp = {
enable = mkEnableOption "Vala LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "Vala LSP support" // {default = config.vim.lsp.enable;};
server = mkOption { servers = mkOption {
description = "Vala LSP server to use"; description = "Vala LSP server to use";
type = enum (attrNames servers); type = listOf (enum (attrNames servers));
default = defaultServer; default = defaultServers;
};
package = mkOption {
description = "Vala LSP server package, or the command to run as a list of strings";
type = either package (listOf str);
default = servers.${cfg.lsp.server}.package;
}; };
}; };
}; };
@ -72,8 +85,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.vala_ls = servers.${cfg.lsp.server}.lspConfig; mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
}) })
]); ]);
} }