From ac829ff2a02d66ad18924af0ba6a9bad14a5f2a9 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Tue, 27 Jun 2023 12:39:51 +0300
Subject: [PATCH] Nvim: Move some keybinds to which-key

---
 home/.config/nvim/init.lua                  |  1 -
 home/.config/nvim/lua/keybinds.lua          | 11 -----------
 home/.config/nvim/lua/plugins/init.lua      |  2 +-
 home/.config/nvim/lua/plugins/mason.lua     |  2 +-
 home/.config/nvim/lua/plugins/which-key.lua | 17 +++++++++++++++++
 5 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 home/.config/nvim/lua/keybinds.lua
 create mode 100644 home/.config/nvim/lua/plugins/which-key.lua

diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua
index 4c3c6e3..33c9203 100644
--- a/home/.config/nvim/init.lua
+++ b/home/.config/nvim/init.lua
@@ -1,4 +1,3 @@
-require("keybinds")
 require("settings")
 require("neovide")
 require("highlight_yank")
diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua
deleted file mode 100644
index 07bc29d..0000000
--- a/home/.config/nvim/lua/keybinds.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-local map = vim.keymap.set
-
--- Navigate between buffers
-map("n", "<C-N>", vim.cmd.bn, { silent = true })
-map("n", "<C-B>", vim.cmd.bp, { silent = true })
-
--- Run Neoformat
-map("n", "<M-f>", vim.cmd.Neoformat, {})
-
--- Exit terminal insert mode with esc
-map("t", "<Esc>", "<C-\\><C-n>", {})
diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua
index 1c923fd..479e6a0 100644
--- a/home/.config/nvim/lua/plugins/init.lua
+++ b/home/.config/nvim/lua/plugins/init.lua
@@ -79,7 +79,7 @@ local plugins = {
   "lambdalisue/suda.vim",
 
   -- Display possible keybinds
-  { "folke/which-key.nvim", config = true },
+  { "folke/which-key.nvim", config = require("plugins.which-key") },
 
   -- Package manager for LSP servers, DAP adapters etc.
   {
diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua
index 95d5b47..0249773 100644
--- a/home/.config/nvim/lua/plugins/mason.lua
+++ b/home/.config/nvim/lua/plugins/mason.lua
@@ -83,7 +83,7 @@ function m.map_keys()
       rn = { vim.lsp.buf.rename, "Rename symbol" },
       ca = { vim.lsp.buf.code_action, "Code action" },
       e = { vim.diagnostic.open_float, "Open diagnostics" },
-      f = { vim.lsp.buf.format, "Format" },
+      F = { vim.lsp.buf.format, "Format with LSP" },
     },
     K = { vim.lsp.buf.hover, "Hover" },
     ["["] = { d = { vim.diagnostic.goto_prev, "Previous diagnostic" } },
diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua
new file mode 100644
index 0000000..0d4bfe6
--- /dev/null
+++ b/home/.config/nvim/lua/plugins/which-key.lua
@@ -0,0 +1,17 @@
+return function()
+  local wk = require("which-key")
+  wk.setup({})
+
+  wk.register({
+    f = { "<cmd>Neoformat<CR>", "Format with Neoformat" },
+    h = { "<cmd>nohlsearch<CR>", "Turn off search highlight" },
+  }, { prefix = "<leader>" })
+
+  wk.register({
+    ["<C-n>"] = { "<cmd>bnext<CR>", "Next buffer" },
+    ["<C-b>"] = { "<cmd>bprevious<CR>", "Previous buffer" },
+  })
+
+  -- Exit terminal insert mode with esc
+  vim.keymap.set("t", "<Esc>", "<C-\\><C-n>", {})
+end