mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-12-18 00:32:22 +00:00
f9789432f9
* modules: switch to gerg's neovim-wrapper * modules: use initViml instead of writing the file * treewide: make the entire generated config lua based * docs: remove mentions of configRC * plugins/treesitter: remove vim.cmd hack * treewide: move resolveDag to lib * modules/wrapper(rc): fix typo * treewide: migrate to pluginRC for correct DAG order The "new" DAG order is as follows: - (luaConfigPre) - globalsScript - basic - theme - pluginConfigs - extraPluginConfigs - mappings - (luaConfigPost) * plugins/theme: fix theme DAG place * plugins/theme: fix fixed theme DAG place * modules/wrapper(rc): add removed option module for configRC * docs: add dag-entries chapter, add release note entry * fix: formatting CI * languages/nix: add missing `local` * docs: fix page link * docs: add mention of breaking changes at the start of the release notes * plugins/neo-tree: convert to pluginRC * modules/wrapper(rc): add back entryAnywhere * modules/wrapper(rc): expose pluginRC * apply raf patch --------- Co-authored-by: NotAShelf <raf@notashelf.dev>
51 lines
1.8 KiB
Nix
51 lines
1.8 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
...
|
|
}: let
|
|
inherit (lib.modules) mkIf mkMerge;
|
|
inherit (lib.nvim.binds) mkExprBinding mkBinding;
|
|
inherit (lib.nvim.dag) entryAnywhere;
|
|
|
|
cfg = config.vim.comments.comment-nvim;
|
|
self = import ./comment-nvim.nix {inherit lib;};
|
|
inherit (self.options.vim.comments.comment-nvim) mappings;
|
|
in {
|
|
config = mkIf cfg.enable {
|
|
vim.startPlugins = [
|
|
"comment-nvim"
|
|
];
|
|
|
|
vim.maps.normal = mkMerge [
|
|
(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 ''
|
|
function()
|
|
return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_linewise_current)'
|
|
or '<Plug>(comment_toggle_linewise_count)'
|
|
end
|
|
''
|
|
mappings.toggleCurrentLine.description)
|
|
(mkExprBinding cfg.mappings.toggleCurrentBlock ''
|
|
function()
|
|
return vim.api.nvim_get_vvar('count') == 0 and '<Plug>(comment_toggle_blockwise_current)'
|
|
or '<Plug>(comment_toggle_blockwise_count)'
|
|
end
|
|
''
|
|
mappings.toggleCurrentBlock.description)
|
|
];
|
|
|
|
vim.maps.visualOnly = mkMerge [
|
|
(mkBinding cfg.mappings.toggleSelectedLine "<Plug>(comment_toggle_linewise_visual)" mappings.toggleSelectedLine.description)
|
|
(mkBinding cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
|
|
];
|
|
|
|
vim.pluginRC.comment-nvim = entryAnywhere ''
|
|
require('Comment').setup({
|
|
mappings = { basic = false, extra = false, },
|
|
})
|
|
'';
|
|
};
|
|
}
|