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

simplify and remove unnecessary stuff

Browse source
This commit is contained in:
sjcobb 2025-05-22 14:48:14 +01:00
commit 7ae81ca51b
3 changed files with 27 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

47
modules/neovim/init/lsp.nix
View file

@ -18,36 +18,12 @@
lspConfigurations =
mapAttrsToList (
# TODO: Determine the best thing to do about merging in lspconfig
name: value:
/*
lua
*/
''vim.lsp.config["${name}"] = ${toLuaObject value}''
name: value: ''
vim.lsp.config["${name}"] = ${toLuaObject value}
''
)
cfg.servers;
# Approach 1:
# Create function perhaps called mkLspConfig
# mkLspConfig servers;
# that expands to something like
# vim.lsp.servers = cfg.lsp.servers......
# vim.luaConfigRC.lspconfigMerge = entryAfter ["lsp-servers"] ''vim.lsp.config["${name}"] = vim.tbl_deep_extend("force", lspconfig.${name}, vim.lsp.config["${name}"])''
# Approach 2:
# lspConfigurations =
# mapAttrsToList (
# name: value: ''vim.lsp.config["${name}"] = vim.tbl_deep_extend("force", lspconfig.${name}, ${toLuaObject value})''
# )
# (filterAttrs (n: _: n != "*") cfg.servers);
# Then also need to configure global * settings
# globalConfiguration =
# mapAttrsToList (
# name: value: ''vim.lsp.config["${name}"] = ${toLuaObject value}''
# )
# (filterAttrs (n: _: n == "*") cfg.servers);
enabledServers = filterAttrs (_: u: u.enable) cfg.servers;
in {
options = {
@ -105,18 +81,13 @@ in {
}
(mkIf (cfg.servers != {}) {
vim.luaConfigRC.lsp-servers =
entryAnywhere
# Or entryAfter ["lspconfig"] if we go with the second approach
/*
lua
*/
''
${concatLines lspConfigurations}
vim.luaConfigRC.lsp-servers = entryAnywhere ''
-- Individual LSP configurations managed by nvf.
${concatLines lspConfigurations}
-- Enable configured LSPs explicitly
vim.lsp.enable(${toLuaObject (filter (name: name != "*") (attrNames enabledServers))});
'';
-- Enable configured LSPs explicitly
vim.lsp.enable(${toLuaObject (filter (name: name != "*") (attrNames enabledServers))})
'';
})
];
}