From d5eb3e87ed34f4b097c87ca60867e5781d7f322e Mon Sep 17 00:00:00 2001 From: n3oney Date: Tue, 2 May 2023 21:58:06 +0200 Subject: [PATCH] feat: add hop keybindings --- modules/utility/motion/hop/config.nix | 9 ++++++--- modules/utility/motion/hop/hop.nix | 15 ++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/utility/motion/hop/config.nix b/modules/utility/motion/hop/config.nix index b2b1a8e5..a5aa92cd 100644 --- a/modules/utility/motion/hop/config.nix +++ b/modules/utility/motion/hop/config.nix @@ -5,13 +5,16 @@ }: with lib; let cfg = config.vim.utility.motion.hop; + + self = import ./hop.nix {inherit lib;}; + + mappingDefinitions = self.options.vim.utility.motion.hop.mappings; + mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions; in { config = mkIf cfg.enable { vim.startPlugins = ["hop-nvim"]; - vim.maps.normal."h" = { - action = " HopPattern"; - }; + vim.maps.normal = mkSetBinding mappings.hop " HopPattern"; vim.luaConfigRC.hop-nvim = nvim.dag.entryAnywhere '' require('hop').setup() diff --git a/modules/utility/motion/hop/hop.nix b/modules/utility/motion/hop/hop.nix index d3e3c2f4..c57dc7a2 100644 --- a/modules/utility/motion/hop/hop.nix +++ b/modules/utility/motion/hop/hop.nix @@ -1,13 +1,10 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.vim.utility.motion.hop; -in { +{lib, ...}: +with lib; { options.vim.utility.motion.hop = { + mappings = { + hop = mkMappingOption "Jump to occurences [hop.nvim]" "h"; + }; + enable = mkEnableOption "Enable Hop.nvim plugin (easy motion)"; }; }