From 43b99474e69458a6f6446a74992a7424cdc47e7a Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 29 Mar 2025 20:50:34 +0300 Subject: [PATCH] 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 + ''; + }; }) ]); }