NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-01-05 02:07:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/v0.6' into which-key-categories

Browse source
This commit is contained in:
Frothy 2024-02-26 13:27:17 -05:00
commit a738083c2f
58 changed files with 524 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/git/config.nix
View file

@ -4,11 +4,15 @@
...
}: let
inherit (builtins) toJSON;
inherit (lib) addDescriptionsToMappings mkIf mkMerge mkSetExprBinding mkSetLuaBinding nvim pushDownDefault;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding;
inherit (lib.nvim.dag) entryAnywhere;
# TODO: move this to its own module
inherit (lib) pushDownDefault;
cfg = config.vim.git;
self = import ./git.nix {inherit lib;};
self = import ./git.nix {inherit lib config;};
gsMappingDefinitions = self.options.vim.git.gitsigns.mappings;
gsMappings = addDescriptionsToMappings cfg.gitsigns.mappings gsMappingDefinitions;
@ -65,7 +69,7 @@ in {
"<leader>g" = "+Gitsigns";
};
vim.luaConfigRC.gitsigns = nvim.dag.entryAnywhere ''
vim.luaConfigRC.gitsigns = entryAnywhere ''
require('gitsigns').setup{}
'';
}