From 98d3f5cac77be465a0ccccbf133e278d88617045 Mon Sep 17 00:00:00 2001
From: Oliver Hartmann <oliver.hartmann@freiewildbahn.de>
Date: Wed, 28 Dec 2022 21:40:32 +0100
Subject: [PATCH] added which-key

---
 lua/my_keymappings.lua    |  1 -
 lua/plugins/lspconfig.lua | 47 +++++++++++++++++++++++++--------------
 lua/plugins/which-key.lua |  4 ++++
 3 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 lua/plugins/which-key.lua

diff --git a/lua/my_keymappings.lua b/lua/my_keymappings.lua
index f93b93a..6ddb858 100644
--- a/lua/my_keymappings.lua
+++ b/lua/my_keymappings.lua
@@ -1,5 +1,4 @@
 local opts = { noremap = true, silent = true }
-vim.keymap.set('n', '<space>', 'nil', opts)
 
 -- Tabs
 vim.keymap.set('n', '<S-Right>', ':tabnext<CR>', opts)
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index 51f3dde..ffa4c2f 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -33,24 +33,37 @@ return {
       vim.api.nvim_buf_set_option(0, 'formatexpr', 'v:lua.vim.lsp.formatexpr()')
 
       -- Mappings.
-      local opts = { noremap = true, silent = false, buffer = bufnr }
-      vim.keymap.set('n', '<space>,', vim.diagnostic.goto_prev, opts)
-      vim.keymap.set('n', '<space>;', vim.diagnostic.goto_next, opts)
-      vim.keymap.set('n', '<space>a', vim.lsp.buf.code_action, opts)
-      vim.keymap.set('n', '<space>d', vim.lsp.buf.definition, opts)
-      vim.keymap.set('n', '<space>e', vim.lsp.buf.declaration, opts)
-      vim.keymap.set('n', '<space>h', vim.lsp.buf.hover, opts)
-      vim.keymap.set('n', '<space>c', vim.lsp.buf.outgoing_calls, opts)
-      vim.keymap.set('n', '<space>C', vim.lsp.buf.incoming_calls, opts)
-      vim.keymap.set('n', '<space>m', vim.lsp.buf.rename, opts)
+      vim.keymap.set('n', '<space>,', vim.diagnostic.goto_prev,
+        { noremap = true, silent = false, desc = 'Diag prev', buffer = bufnr })
+      vim.keymap.set('n', '<space>;', vim.diagnostic.goto_next,
+        { noremap = true, silent = false, desc = 'Diag next', buffer = bufnr })
+      vim.keymap.set('n', '<space>a', vim.lsp.buf.code_action,
+        { noremap = true, silent = false, desc = 'Code action', buffer = bufnr })
+      vim.keymap.set('n', '<space>d', vim.lsp.buf.definition,
+        { noremap = true, silent = false, desc = 'Definition', buffer = bufnr })
+      vim.keymap.set('n', '<space>e', vim.lsp.buf.declaration,
+        { noremap = true, silent = false, desc = 'Declaration', buffer = bufnr })
+      vim.keymap.set('n', '<space>h', vim.lsp.buf.hover,
+        { noremap = true, silent = false, desc = 'Hover', buffer = bufnr })
+      vim.keymap.set('n', '<space>c', vim.lsp.buf.outgoing_calls,
+        { noremap = true, silent = false, desc = 'Outgoing calls', buffer = bufnr })
+      vim.keymap.set('n', '<space>C', vim.lsp.buf.incoming_calls,
+        { noremap = true, silent = false, desc = 'Incoming calls', buffer = bufnr })
+      vim.keymap.set('n', '<space>m', vim.lsp.buf.rename,
+        { noremap = true, silent = false, desc = 'Rename', buffer = bufnr })
       local tele_builtins = require('telescope.builtin')
-      vim.keymap.set('n', '<C-t>', tele_builtins.lsp_dynamic_workspace_symbols, opts)
-      vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
-      vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
-      vim.keymap.set('n', '<space>r', tele_builtins.lsp_references, opts)
-      vim.keymap.set('n', '<A-m>', '<cmd>Telescope aerial<cr>', opts)
-      vim.keymap.set('n', '<space>v', function() tele_builtins.diagnostics({ bufnr = 0 }) end, opts)
-      vim.keymap.set('n', '<A-o>', '<cmd>ClangdSwitchSourceHeader<CR>', opts)
+      vim.keymap.set('n', '<C-t>', tele_builtins.lsp_dynamic_workspace_symbols,
+        { noremap = true, silent = false, desc = 'Workspace symbols', buffer = bufnr })
+      vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition,
+        { noremap = true, silent = false, desc = 'Type definition', buffer = bufnr })
+      vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help,
+        { noremap = true, silent = false, desc = 'Signature help', buffer = bufnr })
+      vim.keymap.set('n', '<space>r', tele_builtins.lsp_references,
+        { noremap = true, silent = false, desc = 'References', buffer = bufnr })
+      vim.keymap.set('n', '<space>v', function() tele_builtins.diagnostics({ bufnr = 0 }) end,
+        { noremap = true, silent = false, desc = 'Diagnostics', buffer = bufnr })
+      vim.keymap.set('n', '<A-o>', '<cmd>ClangdSwitchSourceHeader<CR>',
+        { noremap = true, silent = false, desc = 'Switch Source/Header', buffer = bufnr })
 
       vim.cmd([[autocmd CursorHold <buffer> lua OpenDiagFloat()]])
 
diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua
new file mode 100644
index 0000000..72c06d8
--- /dev/null
+++ b/lua/plugins/which-key.lua
@@ -0,0 +1,4 @@
+return {
+  'folke/which-key.nvim',
+  config = true
+}