NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-06-14 00:26:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

treewide: migrate to vim.keymaps

Browse source
This commit is contained in:
Ching Pei Yang 2026-06-12 14:44:46 +02:00 • committed by Ching Pei Yang
commit 55a96f83b4
13 changed files with 218 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/plugins/lsp/nvim-docs-view/config.nix
View file

@ -4,15 +4,14 @@
options,
...
}: let
inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
inherit (lib.modules) mkIf;
inherit (lib.nvim.binds) mkKeymap;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.lua) toLuaObject;
cfg = config.vim.lsp.nvim-docs-view;
mappingDefinitions = options.vim.lsp.nvim-docs-view.mappings;
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
inherit (options.vim.lsp.nvim-docs-view) mappings;
in {
config = mkIf cfg.enable {
vim = {
@ -23,9 +22,9 @@ in {
require("docs-view").setup ${toLuaObject cfg.setupOpts}
'';
maps.normal = mkMerge [
(mkSetBinding mappings.viewToggle "<cmd>DocsViewToggle<CR>")
(mkSetBinding mappings.viewUpdate "<cmd>DocsViewUpdate<CR>")
keymaps = [
(mkKeymap "n" cfg.mappings.viewToggle "<cmd>DocsViewToggle<CR>" {desc = mappings.viewToggle.description;})
(mkKeymap "n" cfg.mappings.viewUpdate "<cmd>DocsViewUpdate<CR>" {desc = mappings.viewUpdate.description;})
];
};
};

11
modules/plugins/lsp/otter/config.nix
View file

@ -4,22 +4,21 @@
options,
...
}: let
inherit (lib.modules) mkIf mkMerge;
inherit (lib.modules) mkIf;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
inherit (lib.nvim.binds) mkKeymap;
cfg = config.vim.lsp;
mappingDefinitions = options.vim.lsp.otter-nvim.mappings;
mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
inherit (options.vim.lsp.otter-nvim) mappings;
in {
config = mkIf (cfg.enable && cfg.otter-nvim.enable) {
vim = {
startPlugins = ["otter-nvim"];
maps.normal = mkMerge [
(mkSetBinding mappings.toggle "<cmd>lua require'otter'.activate()<CR>")
keymaps = [
(mkKeymap "n" cfg.otter-nvim.mappings.toggle "<cmd>lua require'otter'.activate()<CR>" {desc = mappings.toggle.description;})
];
pluginRC.otter-nvim = entryAnywhere ''