mappings.lua

@@ -1,12 +1,14 @@
 ---@type MappingsTable
 local M = {
+  n = {
+    ["<C-s>"] = "",
+  },
 }
 
 M.disabled = {
   n = {
     ["<leader>h"] = "",
     ["<C-a>"] = "",
-    ["<C-s>"] = "",
   },
 }
 

plugins.lua

@@ -47,9 +47,59 @@ local plugins = {
     end,
   },
   {
-    "ggandor/leap.nvim",
+    -- NOTE: This is leap for selecting things!
+    "ggandor/flit.nvim",
     config = function()
-      require("leap").create_default_mappings()
+      require("flit").setup {
+        keys = { f = "f", F = "F", t = "t", T = "T" },
+        -- A string like "nv", "nvo", "o", etc.
+        labeled_modes = "nvo",
+        multiline = true,
+        -- Like `leap`s similar argument (call-specific overrides).
+        -- E.g.: opts = { equivalence_classes = {} }
+        opts = {},
+      }
+    end,
+    enabled = true,
+  },
+  {
+    "ggandor/leap.nvim",
+		-- stylua: ignore
+		keys = {
+			{ 'gl',          '<Plug>(leap-forward-to)',  mode = { 'n', 'x', 'o' }, desc = 'Leap forward to' },
+			{ 'gL',          '<Plug>(leap-backward-to)', mode = { 'n', 'x', 'o' }, desc = 'Leap backward to' },
+			{ '<leader>wgl', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' }, desc = 'Leap to windows' },
+		},
+    config = function()
+      local leap = require "leap"
+      leap.opts.case_sensitive = false
+      leap.opts.safe_labels = { "f", "n", "u", "t", "g", "ö", "w", "b", "m" }
+      leap.opts.labels = {
+        "a",
+        "s",
+        "f",
+        "n",
+        "j",
+        "k",
+        "r",
+        "e",
+        "r",
+        "m",
+        "ö",
+        "b",
+        "v",
+        "u",
+        "z",
+        "w",
+        "2",
+        "3",
+        "4",
+        "5",
+        "6",
+        "7",
+        "8",
+        "9",
+      }
     end,
   },
 }