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/sql: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-11 16:42:05 +02:00
commit 7ecf68cb29
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/plugins/languages/sql.nix
View file

@ -6,33 +6,19 @@
}: let }: let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib) genAttrs;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum package str; inherit (lib.types) enum package str listOf;
inherit (lib.nvim.types) diagnostics deprecatedSingleOrListOf; inherit (lib.nvim.types) diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.generators) mkLuaInline;
cfg = config.vim.languages.sql; cfg = config.vim.languages.sql;
sqlfluffDefault = pkgs.sqlfluff; sqlfluffDefault = pkgs.sqlfluff;
sqruffDefault = pkgs.sqruff; sqruffDefault = pkgs.sqruff;
defaultServers = ["sqls"]; defaultServers = ["sqls"];
servers = { servers = ["sqls"];
sqls = {
enable = true;
cmd = [(getExe pkgs.sqls)];
filetypes = ["sql" "mysql"];
root_markers = ["config.yml"];
settings = {};
on_attach = mkLuaInline ''
function(client, bufnr)
client.server_capabilities.execute_command = true
require'sqls'.setup{}
end
'';
};
};
defaultFormat = ["sqlfluff"]; defaultFormat = ["sqlfluff"];
formats = { formats = {
@ -97,7 +83,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.sql.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "SQL LSP server to use"; description = "SQL LSP server to use";
}; };
@ -142,14 +128,12 @@ in {
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim = { vim = {
startPlugins = ["sqls-nvim"]; lsp = {
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
lsp.servers = servers = genAttrs cfg.lsp.servers (_: {
mapListToAttrs (n: { filetypes = ["sql" "mysql" "msql" "plsql"];
name = n; });
value = servers.${n}; };
})
cfg.lsp.servers;
}; };
}) })