From 91130385edea1ebc46c955999f428a21df9976de Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 24 Jul 2024 19:55:49 -0500 Subject: [PATCH] plugins/treesitter: support unsetting keymaps --- plugins/languages/treesitter/treesitter.nix | 8 ++++++-- .../plugins/languages/treesitter/treesitter.nix | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/plugins/languages/treesitter/treesitter.nix b/plugins/languages/treesitter/treesitter.nix index 01257f01..73dad3cb 100644 --- a/plugins/languages/treesitter/treesitter.nix +++ b/plugins/languages/treesitter/treesitter.nix @@ -118,7 +118,11 @@ helpers.neovim-plugin.mkNeovimPlugin config { keymaps = let - mkKeymap = default: helpers.defaultNullOpts.mkStr default "Key shortcut"; + mkKeymap = + default: + helpers.defaultNullOpts.mkNullableWithRaw ( + with types; either str bool + ) default "Key shortcut or false to unset."; in { init_selection = mkKeymap "gnn"; @@ -190,7 +194,7 @@ helpers.neovim-plugin.mkNeovimPlugin config { enable = true; keymaps = { - init_selection = "gnn"; + init_selection = false; node_decremental = "grm"; node_incremental = "grn"; scope_incremental = "grc"; diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter.nix b/tests/test-sources/plugins/languages/treesitter/treesitter.nix index 00f5a226..d3776d7a 100644 --- a/tests/test-sources/plugins/languages/treesitter/treesitter.nix +++ b/tests/test-sources/plugins/languages/treesitter/treesitter.nix @@ -120,4 +120,18 @@ ]; }; }; + + disable-init-selection = { + plugins.treesitter = { + enable = true; + + settings = { + incremental_selection = { + enable = true; + + keymaps.init_selection = false; + }; + }; + }; + }; }