dot_config/nvim/init.lua

@@ -1,3 +1,2 @@
 require("settings")
-require("keymap")
 require("config.lazy")

dot_config/nvim/lua/keymap.lua

@@ -1,32 +0,0 @@
-local function map(mode, lhs, rhs, desc, opts)
-  local options = { noremap = true, silent = true }
-  if opts then
-    options = vim.tbl_extend("force", options, opts)
-  end
-  vim.keymap.set(mode, lhs, rhs, vim.tbl_extend("force", options, { desc = desc }))
-end
-
--- Buffer navigation
-map("n", "<S-h>", "<cmd>bp<cr>", "")
-map("n", "<S-k>", "<cmd>bn<cr>", "")
-map("n", "<leader>bb", "<cmd>e #<cr>", "Switch to other buffer")
-map("n", "<leader>`", "<cmd>e #<cr>", "Switch to other buffer")
-map("n", "<leader>bd", "<cmd>bd<cr>", "Delete buffer")
-map("n", "<leader>bp", "<cmd>bp<cr>", "Previous buffer")
-map("n", "<leader>bn", "<cmd>bn<cr>", "Next buffer")
-
--- Better indentation
-map("v", "<", "<gv")
-map("v", ">", ">gv")
-
--- Lazy
-map("n", "<leader>l", "<cmd>Lazy<cr>", "Lazy")
-
--- Mason
-map("n", "<leader>cm", "<cmd>Mason<cr>", "Mason")
-
--- Clear search on escape
-map({ "i", "n", "s" }, "<esc>", function()
-  vim.cmd("noh")
-  return "<esc>"
-end, "", { expr = true })

dot_config/nvim/lua/plugins/mini.lua

@@ -25,6 +25,33 @@ return {
     "echasnovski/mini.bracketed",
     opts = {},
   },
+  {
+    -- Faster and better which-key
+    "echasnovski/mini.clue",
+    opts = {
+      triggers = {
+        { mode = "n", keys = "<leader>" },
+        { mode = "x", keys = "<leader>" },
+
+        { mode = "n", keys = "g" },
+        { mode = "x", keys = "g" },
+
+        { mode = "n", keys = "`" },
+        { mode = "x", keys = "`" },
+        { mode = "n", keys = "'" },
+        { mode = "x", keys = "'" },
+
+        { mode = "n", keys = "<C-w>" },
+
+        { mode = "n", keys = "z" },
+        { mode = "x", keys = "z" },
+      },
+
+      window = {
+        delay = 400,
+      },
+    },
+  },
   {
     -- Label jumping for visible characters
     "echasnovski/mini.jump2d",

dot_config/nvim/lua/plugins/telescope.lua

@@ -24,21 +24,6 @@ return {
         "<cmd>Telescope current_buffer_fuzzy_find<cr>",
         desc = "Search in buffer",
       },
-      {
-        "<leader>cd",
-        "<cmd>Telescope diagnostics bufnr=0<cr>",
-        desc = "List diagnostics",
-      },
-      {
-        "<leader>sp",
-        "<cmd>Telescope live_grep<cr>",
-        desc = "Search in project",
-      },
-      {
-        "<leader>bb",
-        "<cmd>Telescope buffers<cr>",
-        desc = "Find buffer",
-      },
     },
   },
   {

dot_config/nvim/lua/plugins/which-key.lua

@@ -1,19 +0,0 @@
--- Configuration for which-key
-
-return {
-  {
-    "folke/which-key.nvim",
-    event = "VeryLazy",
-    opts = {
-      preset = "helix",
-      spec = {
-        { "<leader>f", group = "file" },
-        { "<leader>b", group = "buffer" },
-        { "<leader>c", group = "code" },
-        { "<leader>g", group = "vc" },
-        { "<leader>s", group = "search" },
-        { "<leader>,", group = "vim" },
-      },
-    },
-  },
-}