1 files changed, 47 insertions, 4 deletions

diff --git a/common/nixvim.nix b/common/nixvim.nix
index 7dccfab..b74e6d4 100644
--- a/common/nixvim.nix
+++ b/common/nixvim.nix
@@ -200,6 +200,47 @@ in
           };
         }
 
+        # Leap
+
+        {
+          key = "<Space>";
+          mode = ["n" "x" "o"];
+          action = "<Plug>(leap-forward)";
+          options.desc = "Leap forward to";
+        }
+
+        {
+          key = "<C-Space>";
+          mode = ["n" "x" "o"];
+          action = "<Plug>(leap-backward)";
+          options.desc = "Leap backward to";
+        }
+
+        {
+          key = "g<Space>";
+          mode = ["n" "x" "o"];
+          action = "<Plug>(leap-from-window)";
+          options.desc = "Leap from window";
+        }
+
+        {
+          key = "gnn";
+          mode = ["n" "x" "o"];
+          action.__raw = ''
+            function()
+              require('leap.treesitter').select()
+            end
+          '';
+          options.desc = "Start incremental selection";
+        }
+
+        {
+          key = "gnN";
+          mode = ["n" "x" "o"];
+          action = "V<cmd>lua require('leap.treesitter').select()<cr>";
+          options.desc = "Start linewise incremental selection";
+        }
+
         # Toggle options
         (toggle "c" "cursorline")
         (toggle "C" "cursorcolumn")
@@ -332,6 +373,11 @@ in
 
       lastplace.enable = true;
 
+      leap = {
+        enable = true;
+        addDefaultMappings = false;
+      };
+
       lualine = {
         enable = true;
         iconsEnabled = false;
@@ -505,10 +551,7 @@ in
         enable = true;
         nixvimInjections = true;
 
-        settings = {
-          incremental_selection.enable = true;
-          indent.enable = true;
-        };
+        settings.indent.enable = true;
       };
 
       treesitter-context = {