From 3bf30d35e57cf92c1b66b9abe16a86730b54c564 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 30 Mar 2025 05:08:01 +0300 Subject: [PATCH 1/8] visuals/nvim-scrollbar: add fastaction popups to ignored fts --- modules/plugins/visuals/nvim-scrollbar/config.nix | 3 +-- modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/plugins/visuals/nvim-scrollbar/config.nix b/modules/plugins/visuals/nvim-scrollbar/config.nix index 1d0ebc76..ce00d699 100644 --- a/modules/plugins/visuals/nvim-scrollbar/config.nix +++ b/modules/plugins/visuals/nvim-scrollbar/config.nix @@ -12,8 +12,7 @@ in { config = mkIf cfg.enable { vim = { startPlugins = ["nvim-scrollbar"]; - - pluginRC.cursorline = entryAnywhere '' + pluginRC.nvim-scrollbar = entryAnywhere '' require("scrollbar").setup(${toLuaObject cfg.setupOpts}) ''; }; diff --git a/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix b/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix index bdf48cb4..5a3f3084 100644 --- a/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix +++ b/modules/plugins/visuals/nvim-scrollbar/scrollbar-nvim.nix @@ -13,7 +13,7 @@ in { setupOpts = mkPluginSetupOption "scrollbar-nvim" { excluded_filetypes = mkOption { type = listOf str; - default = ["prompt" "TelescopePrompt" "noice" "noice" "NvimTree" "neo-tree" "alpha" "notify" "Navbuddy"]; + default = ["prompt" "TelescopePrompt" "noice" "NvimTree" "neo-tree" "alpha" "notify" "Navbuddy" "fastaction_popup"]; description = "Filetypes to hide the scrollbar on"; }; }; From 85fd92b0571dc414b57c84f24b61c912b937b540 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 29 Mar 2025 20:50:14 +0300 Subject: [PATCH 2/8] lsp/null-ls: convert to new setupOpts format; get rid of prelude DAG --- modules/plugins/lsp/null-ls/config.nix | 40 +++------- modules/plugins/lsp/null-ls/null-ls.nix | 99 +++++++++++++++++++------ 2 files changed, 85 insertions(+), 54 deletions(-) diff --git a/modules/plugins/lsp/null-ls/config.nix b/modules/plugins/lsp/null-ls/config.nix index 549ef0b7..eb06870f 100644 --- a/modules/plugins/lsp/null-ls/config.nix +++ b/modules/plugins/lsp/null-ls/config.nix @@ -4,13 +4,12 @@ ... }: let inherit (lib.modules) mkIf mkMerge; - inherit (lib.attrsets) mapAttrs; - inherit (lib.trivial) boolToString; - inherit (lib.nvim.dag) entryAnywhere entryAfter entryBetween; + inherit (lib.nvim.lua) toLuaObject; + inherit (lib.nvim.dag) entryAfter; - cfg = config.vim.lsp; + cfg = config.vim.lsp.null-ls; in { - config = mkIf cfg.null-ls.enable (mkMerge [ + config = mkIf cfg.enable (mkMerge [ { vim = { startPlugins = [ @@ -18,35 +17,14 @@ in { "plenary-nvim" ]; - # null-ls implies LSP already being set up - # since it will hook into LSPs to receive information + # null-ls implies that LSP is already being set up + # as it will hook into LSPs to receive information. lsp.enable = true; - pluginRC = { - # early setup for null-ls - null_ls-setup = entryAnywhere '' - local null_ls = require("null-ls") - local null_helpers = require("null-ls.helpers") - local null_methods = require("null-ls.methods") - local ls_sources = {} - ''; - - # null-ls setup - null_ls = entryAfter ["null_ls-setup" "lsp-setup"] '' - require('null-ls').setup({ - debug = ${boolToString cfg.null-ls.debug}, - diagnostics_format = "${cfg.null-ls.diagnostics_format}", - debounce = ${toString cfg.null-ls.debounce}, - default_timeout = ${toString cfg.null-ls.default_timeout}, - sources = ls_sources, - on_attach = default_on_attach - }) - ''; - }; + pluginRC.null_ls = entryAfter ["lsp-setup"] '' + require('null-ls').setup(${toLuaObject cfg.setupOpts}) + ''; }; } - { - vim.pluginRC = mapAttrs (_: v: (entryBetween ["null_ls"] ["null_ls-setup"] v)) cfg.null-ls.sources; - } ]); } diff --git a/modules/plugins/lsp/null-ls/null-ls.nix b/modules/plugins/lsp/null-ls/null-ls.nix index 37305540..3a10bac7 100644 --- a/modules/plugins/lsp/null-ls/null-ls.nix +++ b/modules/plugins/lsp/null-ls/null-ls.nix @@ -1,34 +1,87 @@ {lib, ...}: let - inherit (lib.options) mkEnableOption mkOption; - inherit (lib.types) attrsOf str int; + inherit (lib.options) mkOption mkEnableOption; + inherit (lib.types) attrsOf str int nullOr; + inherit (lib.generators) mkLuaInline; + inherit (lib.nvim.types) luaInline mkPluginSetupOption; + inherit (lib.nvim.config) batchRenameOptions; + + migrationTable = { + debug = "debug"; + diagnostics_format = "diagnostics_format"; + debounce = "debounce"; + default_timeout = "default_timeout"; + sources = "sources"; + }; + + renamedSetupOpts = + batchRenameOptions + ["vim" "lsp" "null-ls"] + ["vim" "lsp" "null-ls" "setupOpts"] + migrationTable; in { + imports = renamedSetupOpts; + options.vim.lsp.null-ls = { - enable = mkEnableOption "null-ls, also enabled automatically"; + enable = mkEnableOption '' + null-ls, plugin to use Neovim as a language server to inject LSP diagnostics, + code actions, and more via Lua. + ''; - debug = mkEnableOption "debugging information for `null-ls"; + setupOpts = mkPluginSetupOption "null-ls" { + debug = mkEnableOption '' + debugging information for null-ls. - diagnostics_format = mkOption { - type = str; - default = "[#{m}] #{s} (#{c})"; - description = "Diagnostic output format for null-ls"; - }; + Displays all possible log messages and writes them to the null-ls log, + which you can view with the command `:NullLsLog` + ''; - debounce = mkOption { - type = int; - default = 250; - description = "Default debounce"; - }; + diagnostics_format = mkOption { + type = str; + default = "[#{m}] #{s} (#{c})"; + description = '' + Sets the default format used for diagnostics. null-ls will replace th + e following special components with the relevant diagnostic information: - default_timeout = mkOption { - type = int; - default = 5000; - description = "Default timeout value, in milliseconds"; - }; + * `#{m}`: message + * `#{s}`: source name (defaults to null-ls if not specified) + * `#{c}`: code (if available) + ''; + }; - sources = mkOption { - description = "null-ls sources"; - type = attrsOf str; - default = {}; + debounce = mkOption { + type = int; + default = 250; + description = '' + Amount of time between the last change to a buffer and the next `textDocument/didChange` notification. + ''; + }; + + default_timeout = mkOption { + type = int; + default = 5000; + description = '' + Amount of time (in milliseconds) after which built-in sources will time out. + + :::{.note} + Built-in sources can define their own timeout period and users can override + the timeout period on a per-source basis + ::: + ''; + }; + + sources = mkOption { + type = nullOr (attrsOf luaInline); + default = null; + description = "Sources for null-ls to register"; + }; + + on_attach = mkOption { + type = nullOr luaInline; + default = mkLuaInline "on_attach"; + description = '' + Defines an on_attach callback to run whenever null-ls attaches to a buffer. + ''; + }; }; }; } From c716e67d8369bc9a5a03346b0c6bff9c795addbe Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 29 Mar 2025 20:50:34 +0300 Subject: [PATCH 3/8] git/gitsigns: switch to new null-ls sources API --- modules/plugins/git/gitsigns/config.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/plugins/git/gitsigns/config.nix b/modules/plugins/git/gitsigns/config.nix index 9aee73b7..99927546 100644 --- a/modules/plugins/git/gitsigns/config.nix +++ b/modules/plugins/git/gitsigns/config.nix @@ -5,6 +5,7 @@ }: let inherit (builtins) toJSON; inherit (lib.modules) mkIf mkMerge; + inherit (lib.generators) mkLuaInline; inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault; inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.lua) toLuaObject; @@ -32,6 +33,7 @@ in { return '' end '') + (mkSetExprBinding gsMappings.previousHunk '' function() if vim.wo.diff then return ${toJSON gsMappings.previousHunk.value} end @@ -77,13 +79,12 @@ in { } (mkIf cfg.codeActions.enable { - vim.lsp.null-ls.enable = true; - vim.lsp.null-ls.sources.gitsigns-ca = '' - table.insert( - ls_sources, - null_ls.builtins.code_actions.gitsigns - ) - ''; + vim.lsp.null-ls = { + enable = true; + setupOpts.sources.gitsigns-ca = mkLuaInline '' + require("null-ls").builtins.code_actions.gitsigns + ''; + }; }) ]); } From 5715e3956b2d6e1d706d71d2e830020d14a83c2d Mon Sep 17 00:00:00 2001 From: alfarel Date: Fri, 28 Mar 2025 11:04:20 -0400 Subject: [PATCH 4/8] fix(formatter/conform-nvim): allow disabling format on/after save --- docs/release-notes/rl-0.8.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index fe3e3166..5d0e1dbe 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -235,8 +235,9 @@ [alfarel](https://github.com/alfarelcynthesis): -- Add missing `yazi.nvim` dependency (`snacks.nvim`). +[conform.nvim]: https://github.com/stevearc/conform.nvim +- Add missing `yazi.nvim` dependency (`snacks.nvim`). - Add [mkdir.nvim](https://github.com/jghauser/mkdir.nvim) plugin for automatic creation of parent directories when editing a nested file. - Add [nix-develop.nvim](https://github.com/figsoda/nix-develop.nvim) plugin for @@ -248,6 +249,8 @@ [friendly-snippets](https://github.com/rafamadriz/friendly-snippets) so blink.cmp can source snippets from it. - Fix [blink.cmp] breaking when built-in sources were modified. +- Fix [conform.nvim] not allowing disabling formatting on and after save. + Use `null` value to disable them if conform is enabled. [TheColorman](https://github.com/TheColorman): From ae082b7704d8254995f8a3a96dbeafce9b2c08d4 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 31 Mar 2025 03:22:25 +0300 Subject: [PATCH 5/8] diagnostics/nvim-lint: enable autocmd only if nvim-lint is enabled --- modules/plugins/diagnostics/nvim-lint/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/diagnostics/nvim-lint/config.nix b/modules/plugins/diagnostics/nvim-lint/config.nix index cf9c45e2..b284270b 100644 --- a/modules/plugins/diagnostics/nvim-lint/config.nix +++ b/modules/plugins/diagnostics/nvim-lint/config.nix @@ -31,7 +31,7 @@ in { ''; }; }) - (mkIf cfg.lint_after_save { + (mkIf (cfg.enable && cfg.lint_after_save) { vim = { augroups = [{name = "nvf_nvim_lint";}]; autocmds = [ From a7f791174ecc576cac57c9125def70b00a17f21d Mon Sep 17 00:00:00 2001 From: tebuevd <3241533+tebuevd@users.noreply.github.com> Date: Sun, 30 Mar 2025 20:04:48 -0700 Subject: [PATCH 6/8] Merge pull request #760 from tebuevd/fix-telescope-pickers-config telescope: correctly nest pickers under setupOpts --- docs/release-notes/rl-0.8.md | 8 ++++++++ modules/plugins/utility/telescope/telescope.nix | 11 ++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 5d0e1dbe..dc4a6fe8 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -283,3 +283,11 @@ [Sc3l3t0n](https://github.com/Sc3l3t0n): - Add F# support under `vim.languages.fsharp`. + +[tebuevd](https://github.com/tebuevd): + +- Fix `pickers` configuration for `telescope` by nesting it under `setupOpts` +- Fix `find_command` configuration for `telescope` by nesting it under + `setupOpts.pickers.find_files` +- Update default `telescope.setupOpts.pickers.find_files.find_command` to only + include files (and therefore exclude directories from results) diff --git a/modules/plugins/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix index 0665eb11..beacc990 100644 --- a/modules/plugins/utility/telescope/telescope.nix +++ b/modules/plugins/utility/telescope/telescope.nix @@ -8,6 +8,12 @@ inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.types) mkPluginSetupOption luaInline; setupOptions = { + pickers.find_files.find_command = mkOption { + description = "cmd to use for finding files"; + type = either (listOf str) luaInline; + default = ["${pkgs.fd}/bin/fd" "--type=file"]; + }; + defaults = { vimgrep_arguments = mkOption { description = '' @@ -27,11 +33,6 @@ "--no-ignore" ]; }; - pickers.find_command = mkOption { - description = "cmd to use for finding files"; - type = either (listOf str) luaInline; - default = ["${pkgs.fd}/bin/fd"]; - }; prompt_prefix = mkOption { description = "Shown in front of Telescope's prompt"; type = str; From 80ac1cbc7b8446ad3232a30b92d3f2edb68cdeb2 Mon Sep 17 00:00:00 2001 From: Venkatesan Ravi Date: Sun, 30 Mar 2025 20:07:18 -0700 Subject: [PATCH 7/8] languages/lua: add luacheck and stylua support (#763) * Add lint(luacheck), format(stylua) support for lua * fix comments for PR#763 * Update rl-0.8.md --------- Co-authored-by: raf --- docs/release-notes/rl-0.8.md | 4 ++ modules/plugins/languages/lua.nix | 67 ++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index dc4a6fe8..8e3d93e0 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -284,6 +284,10 @@ - Add F# support under `vim.languages.fsharp`. +[venkyr77](https://github.com/venkyr77): + +- Add lint (luacheck) and formatting (stylua) support for Lua. + [tebuevd](https://github.com/tebuevd): - Fix `pickers` configuration for `telescope` by nesting it under `setupOpts` diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix index 4ad49784..d5be4905 100644 --- a/modules/plugins/languages/lua.nix +++ b/modules/plugins/languages/lua.nix @@ -4,16 +4,30 @@ lib, ... }: let + inherit (builtins) attrNames; inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.lists) isList; - inherit (lib.types) either listOf package str; - inherit (lib.nvim.types) mkGrammarOption; + inherit (lib.types) bool either enum listOf package str; + inherit (lib.nvim.types) diagnostics mkGrammarOption; inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.dag) entryBefore; cfg = config.vim.languages.lua; + defaultFormat = "stylua"; + formats = { + stylua = { + package = pkgs.stylua; + }; + }; + + defaultDiagnosticsProvider = ["luacheck"]; + diagnosticsProviders = { + luacheck = { + package = pkgs.luajitPackages.luacheck; + }; + }; in { imports = [ (lib.mkRemovedOptionModule ["vim" "languages" "lua" "lsp" "neodev"] '' @@ -39,6 +53,34 @@ in { lazydev.enable = mkEnableOption "lazydev.nvim integration, useful for neovim plugin developers"; }; + + format = { + enable = mkOption { + type = bool; + default = config.vim.languages.enableFormat; + description = "Enable Lua formatting"; + }; + type = mkOption { + type = enum (attrNames formats); + default = defaultFormat; + description = "Lua formatter to use"; + }; + + package = mkOption { + type = package; + default = formats.${cfg.format.type}.package; + description = "Lua formatter package"; + }; + }; + + extraDiagnostics = { + enable = mkEnableOption "extra Lua diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; + types = diagnostics { + langDesc = "Lua"; + inherit diagnosticsProviders; + inherit defaultDiagnosticsProvider; + }; + }; }; config = mkMerge [ @@ -74,6 +116,27 @@ in { }) ''; }) + + (mkIf cfg.format.enable { + vim.formatter.conform-nvim = { + enable = true; + setupOpts.formatters_by_ft.lua = [cfg.format.type]; + setupOpts.formatters.${cfg.format.type} = { + command = getExe cfg.format.package; + }; + }; + }) + + (mkIf cfg.extraDiagnostics.enable { + vim.diagnostics.nvim-lint = { + enable = true; + linters_by_ft.lua = cfg.extraDiagnostics.types; + linters = mkMerge (map (name: { + ${name}.cmd = getExe diagnosticsProviders.${name}.package; + }) + cfg.extraDiagnostics.types); + }; + }) ])) ]; } From c688311e37681065fea68b2e86e0d7598ebbfd25 Mon Sep 17 00:00:00 2001 From: Venkatesan Ravi Date: Mon, 31 Mar 2025 21:01:51 +0000 Subject: [PATCH 8/8] Add toggleFormatOnSave capability to conform --- .../formatter/conform-nvim/conform-nvim.nix | 99 ++++++++++++------- modules/plugins/lsp/config.nix | 6 +- 2 files changed, 67 insertions(+), 38 deletions(-) diff --git a/modules/plugins/formatter/conform-nvim/conform-nvim.nix b/modules/plugins/formatter/conform-nvim/conform-nvim.nix index 28fd2efe..a7e1e4af 100644 --- a/modules/plugins/formatter/conform-nvim/conform-nvim.nix +++ b/modules/plugins/formatter/conform-nvim/conform-nvim.nix @@ -1,11 +1,9 @@ -{ - config, - lib, - ... -}: let +{lib, ...}: let + inherit (lib.generators) mkLuaInline; inherit (lib.options) mkOption mkEnableOption; - inherit (lib.types) attrs nullOr; - inherit (lib.nvim.types) mkPluginSetupOption; + inherit (lib.types) attrs either nullOr; + inherit (lib.nvim.lua) toLuaObject; + inherit (lib.nvim.types) luaInline mkPluginSetupOption; in { options.vim.formatter.conform-nvim = { enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]"; @@ -29,33 +27,68 @@ in { description = "Default values when calling `conform.format()`"; }; - format_on_save = mkOption { - type = nullOr attrs; - default = - if config.vim.lsp.formatOnSave - then { - lsp_format = "fallback"; - timeout_ms = 500; - } - else null; - description = '' - Table that will be passed to `conform.format()`. If this - is set, Conform will run the formatter on save. - ''; - }; + format_on_save = let + defaultFormatOnSaveOpts = { + lsp_format = "fallback"; + timeout_ms = 500; + }; + in + mkOption { + type = nullOr (either attrs luaInline); + default = + mkLuaInline + # lua + '' + function() + if (not vim.g.formatsave) or (vim.b.disableFormatSave) then + return + else + return ${toLuaObject defaultFormatOnSaveOpts} + end + end + ''; + description = '' + Table or function(lualinline) that will be passed to `conform.format()`. If this + is set, Conform will run the formatter on save. - format_after_save = mkOption { - type = nullOr attrs; - default = - if config.vim.lsp.formatOnSave - then {lsp_format = "fallback";} - else null; - description = '' - Table that will be passed to `conform.format()`. If this - is set, Conform will run the formatter asynchronously after - save. - ''; - }; + Note: + - When config.vim.lsp.formatOnSave is set to true, internally + vim.g.formatsave is set to true. + - vim.b.disableFormatSave initally equals !config.vim.lsp.formatOnSave. + - vim.b.disableFormatSave is toggled using the + mapping from config.vim.lsp.mappings.toggleFormatOnSave. + ''; + }; + + format_after_save = let + defaultFormatAfterSaveOpts = {lsp_format = "fallback";}; + in + mkOption { + type = nullOr (either attrs luaInline); + default = + mkLuaInline + # lua + '' + function() + if (not vim.g.formatsave) or (vim.b.disableFormatSave) then + return + else + return ${toLuaObject defaultFormatAfterSaveOpts} + end + end + ''; + description = '' + Table or function(luainline) that will be passed to `conform.format()`. If this + is set, Conform will run the formatter asynchronously after save. + + Note: + - When config.vim.lsp.formatOnSave is set to true, internally + vim.g.formatsave is set to true. + - vim.b.disableFormatSave initally equals !config.vim.lsp.formatOnSave. + - vim.b.disableFormatSave is toggled using the + mapping from config.vim.lsp.mappings.toggleFormatOnSave. + ''; + }; }; }; } diff --git a/modules/plugins/lsp/config.nix b/modules/plugins/lsp/config.nix index 0fa16e47..63407138 100644 --- a/modules/plugins/lsp/config.nix +++ b/modules/plugins/lsp/config.nix @@ -93,11 +93,7 @@ in { }) end '' - else " - vim.lsp.buf.format({ - bufnr = bufnr, - }) - " + else "" } end, })