NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-01-08 11:47:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

plugins/comments: move to new explicit lib format

Browse source
This commit is contained in:
raf 2024-02-23 18:58:21 +03:00
commit 9462a11037
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
2 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

75
modules/plugins/comments/comment-nvim/config.nix
View file

@ -3,48 +3,53 @@
lib, lib,
... ...
}: let }: let
inherit (lib) mkIf mkMerge mkExprBinding mkBinding nvim; inherit (lib.options) mkIf;
inherit (lib.modules) mkMerge;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.binds) mkExprBinding mkBinding;
cfg = config.vim.comments.comment-nvim; cfg = config.vim.comments.comment-nvim;
self = import ./comment-nvim.nix { self = import ./comment-nvim.nix {inherit lib;};
inherit lib; inherit (self.options.vim.comments.comment-nvim) mappings;
};
mappings = self.options.vim.comments.comment-nvim.mappings;
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim.startPlugins = [ vim = {
"comment-nvim" startPlugins = [
]; "comment-nvim"
];
vim.maps.normal = mkMerge [ maps = {
(mkBinding cfg.mappings.toggleOpLeaderLine "<Plug>(comment_toggle_linewise)" mappings.toggleOpLeaderLine.description) normal = mkMerge [
(mkBinding cfg.mappings.toggleOpLeaderBlock "<Plug>(comment_toggle_blockwise)" mappings.toggleOpLeaderBlock.description) (mkBinding cfg.mappings.toggleOpLeaderLine "<Plug>(comment_toggle_linewise)" mappings.toggleOpLeaderLine.description)
(mkBinding cfg.mappings.toggleOpLeaderBlock "<Plug>(comment_toggle_blockwise)" mappings.toggleOpLeaderBlock.description)
(mkExprBinding cfg.mappings.toggleCurrentLine '' (mkExprBinding cfg.mappings.toggleCurrentLine ''
function() function()
return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_linewise_current)' return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_linewise_current)'
or '<Plug>(comment_toggle_linewise_count)' or '<Plug>(comment_toggle_linewise_count)'
end end
'' ''
mappings.toggleCurrentLine.description) mappings.toggleCurrentLine.description)
(mkExprBinding cfg.mappings.toggleCurrentBlock '' (mkExprBinding cfg.mappings.toggleCurrentBlock ''
function() function()
return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_blockwise_current)' return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_blockwise_current)'
or '<Plug>(comment_toggle_blockwise_count)' or '<Plug>(comment_toggle_blockwise_count)'
end end
'' ''
mappings.toggleCurrentBlock.description) mappings.toggleCurrentBlock.description)
]; ];
vim.maps.visualOnly = mkMerge [ visualOnly = mkMerge [
(mkBinding cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description) (mkBinding cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
(mkBinding cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description) (mkBinding cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
]; ];
};
vim.luaConfigRC.comment-nvim = nvim.dag.entryAnywhere '' luaConfigRC.comment-nvim = entryAnywhere ''
require('Comment').setup({ require('Comment').setup({
mappings = { basic = false, extra = false, }, mappings = { basic = false, extra = false, },
}) })
''; '';
};
}; };
} }

2
modules/plugins/comments/comment-nvim/default.nix
View file

@ -1,4 +1,4 @@
_: { {
imports = [ imports = [
./config.nix ./config.nix
./comment-nvim.nix ./comment-nvim.nix