NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-10-31 02:52:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git/gitsigns: migrate to setupOpts (#524)
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Details
Set up binary cache / cachix (maximal) (push) Waiting to run
Details
Set up binary cache / cachix (nix) (push) Waiting to run
Details
Validate flake & check documentation / Validate Flake Documentation (docs) (push) Waiting to run
Details
Validate flake & check documentation / Validate Flake Documentation (docs-html) (push) Waiting to run
Details
Validate flake & check documentation / Validate Flake Documentation (docs-json) (push) Waiting to run
Details
Validate flake & check documentation / Validate Flake Documentation (docs-manpages) (push) Waiting to run
Details
Validate flake & check documentation / Validate hyperlinks in documentation sources (push) Waiting to run
Details
Validate flake & check formatting / Validate Flake (push) Waiting to run
Details
Validate flake & check formatting / Formatting via Alejandra (push) Waiting to run
Details
Build and deploy documentation / Check latest commit (push) Waiting to run
Details
Build and deploy documentation / publish (push) Blocked by required conditions
Details
Check for typos in the source tree / check-typos (push) Waiting to run
Details

Browse source 
* git/gitsigns: add `setupOpts` module option for user-specified setup table

* docs: update v0.8 release notes
This commit is contained in:
raf 2025-01-06 03:54:38 +03:00 • committed by GitHub
commit 9888a277ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/release-notes/rl-0.8.md
View file

@ -13,6 +13,9 @@
- Add [render-markdown.nvim] under - Add [render-markdown.nvim] under
`languages.markdown.extensions.render-markdown-nvim` `languages.markdown.extensions.render-markdown-nvim`
- Implement [](#opt-vim.git.gitsigns.setupOpts) for user-specified setup table
in gitsigns configuration.
[amadaluzia](https://github.com/amadaluzia): [amadaluzia](https://github.com/amadaluzia):
[haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim

3
modules/plugins/git/gitsigns/config.nix
View file

@ -7,6 +7,7 @@
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault; inherit (lib.nvim.binds) addDescriptionsToMappings mkSetExprBinding mkSetLuaBinding pushDownDefault;
inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.lua) toLuaObject;
cfg = config.vim.git.gitsigns; cfg = config.vim.git.gitsigns;
@ -70,7 +71,7 @@ in {
}; };
pluginRC.gitsigns = entryAnywhere '' pluginRC.gitsigns = entryAnywhere ''
require('gitsigns').setup{} require('gitsigns').setup(${toLuaObject cfg.setupOpts})
''; '';
}; };
} }

2
modules/plugins/git/gitsigns/gitsigns.nix
View file

@ -6,6 +6,7 @@
inherit (lib.options) mkEnableOption; inherit (lib.options) mkEnableOption;
inherit (lib.modules) mkRenamedOptionModule; inherit (lib.modules) mkRenamedOptionModule;
inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.nvim.types) mkPluginSetupOption;
in { in {
imports = [ imports = [
(mkRenamedOptionModule ["vim" "git" "gitsigns" "codeActions" "vim" "gitsigns" "codeActions"] ["vim" "git" "gitsigns" "codeActions" "enable"]) (mkRenamedOptionModule ["vim" "git" "gitsigns" "codeActions" "vim" "gitsigns" "codeActions"] ["vim" "git" "gitsigns" "codeActions" "enable"])
@ -13,6 +14,7 @@ in {
options.vim.git.gitsigns = { options.vim.git.gitsigns = {
enable = mkEnableOption "gitsigns" // {default = config.vim.git.enable;}; enable = mkEnableOption "gitsigns" // {default = config.vim.git.enable;};
setupOpts = mkPluginSetupOption "gitsigns" {};
codeActions.enable = mkEnableOption "gitsigns codeactions through null-ls"; codeActions.enable = mkEnableOption "gitsigns codeactions through null-ls";