NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-26 15:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lsp/null-lsp: allow null-ls options to be configured

Browse source 
This should probably still be converted to setupOpts. Missing docs
This commit is contained in:
raf 2024-05-16 19:09:20 +03:00
parent 74c94b8a54
commit eefc7a9d1d
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
2 changed files with 51 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/plugins/lsp/null-ls/config.nix
View file

@ -5,6 +5,7 @@
}: let }: let
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.attrsets) mapAttrs; inherit (lib.attrsets) mapAttrs;
inherit (lib.trivial) boolToString;
inherit (lib.nvim.dag) entryAnywhere entryAfter entryBetween; inherit (lib.nvim.dag) entryAnywhere entryAfter entryBetween;
cfg = config.vim.lsp; cfg = config.vim.lsp;
@ -12,27 +13,37 @@ in {
config = mkIf cfg.null-ls.enable (mkMerge [ config = mkIf cfg.null-ls.enable (mkMerge [
{ {
vim = { vim = {
lsp.enable = true; startPlugins = [
startPlugins = ["none-ls"]; "none-ls"
"plenary-nvim"
];
luaConfigRC.null_ls-setup = entryAnywhere '' # null-ls implies LSP already being set up
# since it will hook into LSPs to receive information
lsp.enable = true;
luaConfigRC = {
# early setup for null-ls
null_ls-setup = entryAnywhere ''
local null_ls = require("null-ls") local null_ls = require("null-ls")
local null_helpers = require("null-ls.helpers") local null_helpers = require("null-ls.helpers")
local null_methods = require("null-ls.methods") local null_methods = require("null-ls.methods")
local ls_sources = {} local ls_sources = {}
''; '';
luaConfigRC.null_ls = entryAfter ["null_ls-setup" "lsp-setup"] '' # null-ls setup
null_ls = entryAfter ["null_ls-setup" "lsp-setup"] ''
require('null-ls').setup({ require('null-ls').setup({
debug = false, debug = ${boolToString cfg.null-ls.debug},
diagnostics_format = "[#{m}] #{s} (#{c})", diagnostics_format = "${cfg.null-ls.diagnostics_format}",
debounce = 250, debounce = ${toString cfg.null-ls.debounce},
default_timeout = 5000, default_timeout = ${toString cfg.null-ls.default_timeout},
sources = ls_sources, sources = ls_sources,
on_attach = default_on_attach on_attach = default_on_attach
}) })
''; '';
}; };
};
} }
{ {
vim.luaConfigRC = mapAttrs (_: v: (entryBetween ["null_ls"] ["null_ls-setup"] v)) cfg.null-ls.sources; vim.luaConfigRC = mapAttrs (_: v: (entryBetween ["null_ls"] ["null_ls-setup"] v)) cfg.null-ls.sources;

24
modules/plugins/lsp/null-ls/null-ls.nix
View file

@ -1,10 +1,32 @@
{lib, ...}: let {lib, ...}: let
inherit (lib.options) mkEnableOption mkOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) attrsOf str; inherit (lib.types) attrsOf str int;
inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.types) luaInline;
in { in {
options.vim.lsp.null-ls = { options.vim.lsp.null-ls = {
enable = mkEnableOption "null-ls, also enabled automatically"; enable = mkEnableOption "null-ls, also enabled automatically";
debug = mkEnableOption "debugging information for `null-ls";
diagnostics_format = mkOption {
type = luaInline;
default = mkLuaInline "[#{m}] #{s} (#{c})";
description = "Diagnostic output format for null-ls";
};
debounce = mkOption {
type = int;
default = 250;
description = "Default debounce";
};
default_timeout = mkOption {
type = int;
default = 5000;
description = "Default timeout value, in miliseconds";
};
sources = mkOption { sources = mkOption {
description = "null-ls sources"; description = "null-ls sources";
type = attrsOf str; type = attrsOf str;