From 8a6ecfe7b9314cff556467cf31b59a999c1a1c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukpank@o2.pl>
Date: Tue, 11 Mar 2025 22:07:03 +0100
Subject: [PATCH] nvim: remap leap and oil, move leap to editing

---
 nvim/.config/nvim/lua/lupan/remap.lua     |  2 --
 nvim/.config/nvim/lua/plugins/editing.lua | 14 ++++++++++++++
 nvim/.config/nvim/lua/plugins/init.lua    | 16 +---------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/nvim/.config/nvim/lua/lupan/remap.lua b/nvim/.config/nvim/lua/lupan/remap.lua
index 9a3b72f..9d0c8f6 100644
--- a/nvim/.config/nvim/lua/lupan/remap.lua
+++ b/nvim/.config/nvim/lua/lupan/remap.lua
@@ -10,8 +10,6 @@ key('v', '<Space>', '<Nop>', { silent = true })
 key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
-key("n", "<leader>dd", "<cmd>Oil<CR>", { desc = "[D]isplay [d]irectory" })
-key("n", "<leader>df", "<cmd>Oil --float<CR>", { desc = "[D]isplay directory [f]loat" })
 key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" })
 
 -- tabs
diff --git a/nvim/.config/nvim/lua/plugins/editing.lua b/nvim/.config/nvim/lua/plugins/editing.lua
index 34f1a89..4ca5455 100644
--- a/nvim/.config/nvim/lua/plugins/editing.lua
+++ b/nvim/.config/nvim/lua/plugins/editing.lua
@@ -33,4 +33,18 @@ return {
     lazy = false,
     opts = { keymaps = { useDefaults = true } },
   },
+
+  {
+    'ggandor/leap.nvim',
+    opts = {
+      safe_labels = {},
+    },
+    dependencies = {
+      "tpope/vim-repeat",
+    },
+    keys = {
+      { '\\', '<Plug>(leap)',             mode = { 'n', 'x', 'o' } },
+      { 'gs', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' } },
+    }
+  },
 }
diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua
index 75f1f83..496e1ff 100644
--- a/nvim/.config/nvim/lua/plugins/init.lua
+++ b/nvim/.config/nvim/lua/plugins/init.lua
@@ -5,20 +5,6 @@ return {
     lazy = true,
   },
 
-  {
-    'ggandor/leap.nvim',
-    opts = {
-      safe_labels = {},
-    },
-    dependencies = {
-      "tpope/vim-repeat",
-    },
-    keys = {
-      { 'gs', '<Plug>(leap)',             mode = { 'n', 'x', 'o' } },
-      { 'gS', '<Plug>(leap-from-window)', mode = { 'n', 'x', 'o' } },
-    }
-  },
-
   {
     "folke/trouble.nvim",
     dependencies = { "nvim-tree/nvim-web-devicons" },
@@ -32,7 +18,7 @@ return {
       delete_to_trash = true,
     },
     keys = {
-      { "-", "<cmd>Oil<CR>", desc = "Open parent directory" },
+      { "<leader>-", "<cmd>Oil --float<CR>", desc = "Open parent directory" },
     },
   },