From 42835e82536dbd1d480ab559012a9e8a703929e4 Mon Sep 17 00:00:00 2001
From: insects <mail@liv.nrw>
Date: Mon, 14 Apr 2025 17:18:36 +0200
Subject: [PATCH 1/2] nvim: replace mini.clue with which-key

---
 dot_config/nvim/lua/plugins/mini.lua      | 27 -----------------------
 dot_config/nvim/lua/plugins/which-key.lua | 19 ++++++++++++++++
 2 files changed, 19 insertions(+), 27 deletions(-)
 create mode 100644 dot_config/nvim/lua/plugins/which-key.lua

diff --git a/dot_config/nvim/lua/plugins/mini.lua b/dot_config/nvim/lua/plugins/mini.lua
index ef55d61..86ed57d 100644
--- a/dot_config/nvim/lua/plugins/mini.lua
+++ b/dot_config/nvim/lua/plugins/mini.lua
@@ -25,33 +25,6 @@ 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",
diff --git a/dot_config/nvim/lua/plugins/which-key.lua b/dot_config/nvim/lua/plugins/which-key.lua
new file mode 100644
index 0000000..5e4d8be
--- /dev/null
+++ b/dot_config/nvim/lua/plugins/which-key.lua
@@ -0,0 +1,19 @@
+-- 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" },
+      },
+    },
+  },
+}

From 4726c1720a1695783a42142a0cf45b6ec0b42e00 Mon Sep 17 00:00:00 2001
From: insects <mail@liv.nrw>
Date: Mon, 14 Apr 2025 17:18:44 +0200
Subject: [PATCH 2/2] nvim: add way more keymaps

---
 dot_config/nvim/init.lua                  |  1 +
 dot_config/nvim/lua/keymap.lua            | 32 +++++++++++++++++++++++
 dot_config/nvim/lua/plugins/telescope.lua | 15 +++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 dot_config/nvim/lua/keymap.lua

diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua
index c6b0eb8..832052d 100644
--- a/dot_config/nvim/init.lua
+++ b/dot_config/nvim/init.lua
@@ -1,2 +1,3 @@
 require("settings")
+require("keymap")
 require("config.lazy")
diff --git a/dot_config/nvim/lua/keymap.lua b/dot_config/nvim/lua/keymap.lua
new file mode 100644
index 0000000..f22beac
--- /dev/null
+++ b/dot_config/nvim/lua/keymap.lua
@@ -0,0 +1,32 @@
+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 })
diff --git a/dot_config/nvim/lua/plugins/telescope.lua b/dot_config/nvim/lua/plugins/telescope.lua
index 81b5a59..4448c6c 100644
--- a/dot_config/nvim/lua/plugins/telescope.lua
+++ b/dot_config/nvim/lua/plugins/telescope.lua
@@ -24,6 +24,21 @@ 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",
+      },
     },
   },
   {