From 771c6fd9dc7cb4899589870e4d30e440441fb818 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <truoff@brandwatch.com>
Date: Fri, 28 Apr 2023 11:14:28 +0200
Subject: [PATCH] update keymaps to something more sane

---
 BINDINGS.md                    | 25 ++++++++++++++-----------
 after/plugin/keymaps.lua       |  7 ++-----
 after/plugin/telescope.lua     | 23 ++++++++---------------
 after/plugin/whichkey.lua      | 11 +++++------
 init.lua                       | 32 ++++++++++++++++----------------
 lua/custom/plugins/trouble.lua |  2 +-
 6 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/BINDINGS.md b/BINDINGS.md
index e6a4bb7..1c1d72f 100644
--- a/BINDINGS.md
+++ b/BINDINGS.md
@@ -4,21 +4,24 @@ jk                    <ESC>
 # n(ormal)
 
 <leader>,             vim.cmd.w
+<leader><             noautocmd vim.cmd.w
 <leader>x             source buffer
 
 <leader><space>       telescope.builtin.buffers
-<leader>/             telescope.builtin.current_buffer_fuzzy_finder
+<leader>*             telescope.builtin.grep_string
+<leader>/             telescope.builtin.live_grep
 
-<leader>sf            telescope.builtin.find_files
-<leader>sh            telescope.builtin.help_tags
-<leader>sw            telescope.builtin.grep_string
-<leader>sg            telescope.builtin.live_grep
-<leader>so            telescope.builtin.oldfiles
-<leader>sd            telescope.builtin.diagnostics
-<leader>sk            telescope.builtin.keymaps
+<leader>ff            telescope.builtin.find_files
+<leader>fh            telescope.builtin.help_tags
+<leader>fk            telescope.builtin.keymaps
+<leader>fo            telescope.builtin.oldfiles
+<leader>fr            telescope.builtin.resume
 
-<leader>rn            vim.lsp.buf.rename
-<leader>ca            vim.lsp.buf.code_action
+<leader>ha            harpoon add
+<leader>hq            harpoon quick menu
+
+<leader>r             vim.lsp.buf.rename
+<leader>a             vim.lsp.buf.code_action
 
 gd                    vim.lsp.buf.definition
 gD                    vim.lsp.buf.declaration
@@ -46,7 +49,7 @@ K                     vim.lsp.buf.hover
 <C-k>                 vim.lsp.buf.signature_help
 
 
-<C-space>         treesitter incremental selection
+<C-space>             treesitter incremental selection
 
 [d                    vim.diagnostic.goto_prev
 ]d                    vim.diagnostic.goto_next
diff --git a/after/plugin/keymaps.lua b/after/plugin/keymaps.lua
index 41df1ba..59d06ef 100644
--- a/after/plugin/keymaps.lua
+++ b/after/plugin/keymaps.lua
@@ -3,6 +3,7 @@ vim.keymap.set('t', 'jk', [[<C-\><C-n>]])
 
 -- quick write
 vim.keymap.set('n', '<leader>,', '<Cmd>w<CR>', { desc = 'write' })
+vim.keymap.set('n', '<leader><', '<Cmd>noautocmd w<CR>', { desc = 'write noautocmd' })
 
 -- quick config
 vim.keymap.set('n', '<leader>C', '<Cmd>e $MYVIMRC<CR>', { desc = '[C]onfig' })
@@ -22,10 +23,6 @@ vim.keymap.set('n', ']b', '<Cmd>bnext<CR>', { desc = 'Next buffer' })
 vim.keymap.set({ 'n', 'v' }, '<leader>y', [["+y]])
 vim.keymap.set('n', '<leader>Y', [["+Y]])
 
--- telescope
-vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[R]esume' })
-vim.keymap.set('n', '<leader>sk', require('telescope.builtin').keymaps, { desc = '[k]eymaps' })
-
-vim.keymap.set('n', 'it', function()
+vim.keymap.set('n', 'tr', function()
   vim.treesitter.inspect_tree()
 end, { desc = 'Open treesitter tree for current buffer' })
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
index 1081732..909f9cc 100644
--- a/after/plugin/telescope.lua
+++ b/after/plugin/telescope.lua
@@ -1,18 +1,11 @@
 -- Enable telescope fzf native, if installed
 pcall(require('telescope').load_extension, 'fzf')
 
-vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
-vim.keymap.set('n', '<leader>/', function()
-  -- You can pass additional configuration to telescope to change theme, layout, etc.
-  require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
-    winblend = 10,
-    previewer = false,
-  })
-end, { desc = '[/] Fuzzily search in current buffer' })
-vim.keymap.set('n', '<leader>so', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-
-vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[F]iles' })
-vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[H]elp' })
-vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = 'Current [W]ord' })
-vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[G]rep' })
-vim.keymap.set('n', '<leader>sd', '<Cmd>TroubleToggle<CR>', { desc = '[D]iagnostics' })
+vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '  find buffer' })
+vim.keymap.set('n', '<leader>/', require('telescope.builtin').live_grep, { desc = 'grep' })
+vim.keymap.set('n', '<leader>*', require('telescope.builtin').grep_string, { desc = 'current word' })
+vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files, { desc = 'files' })
+vim.keymap.set('n', '<leader>fh', require('telescope.builtin').help_tags, { desc = 'help' })
+vim.keymap.set('n', '<leader>fk', require('telescope.builtin').keymaps, { desc = 'keymaps' })
+vim.keymap.set('n', '<leader>fo', require('telescope.builtin').oldfiles, { desc = 'recently opened files' })
+vim.keymap.set('n', '<leader>fr', require('telescope.builtin').resume, { desc = 'resume' })
diff --git a/after/plugin/whichkey.lua b/after/plugin/whichkey.lua
index 98f4919..3d53da3 100644
--- a/after/plugin/whichkey.lua
+++ b/after/plugin/whichkey.lua
@@ -1,10 +1,9 @@
 local wk = require 'which-key'
 wk.setup {}
 wk.register({
-  f = { name = '[F]ile' },
-  s = { name = '[S]earch' },
-  t = { name = '[T]est' },
-  w = { name = '[W]orkspace' },
-  g = { name = '[G]it' },
-  l = { name = '[L]SP' },
+  f = { name = 'find' },
+  t = { name = 'test' },
+  h = { name = 'harpoon' },
+  w = { name = 'workspace' },
+  g = { name = 'git' },
 }, { prefix = '<leader>' })
diff --git a/init.lua b/init.lua
index b1b0ae6..dede155 100644
--- a/init.lua
+++ b/init.lua
@@ -302,8 +302,8 @@ require('nvim-treesitter.configs').setup {
 }
 
 -- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'previous diagnostic message' })
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'next diagnostic message' })
 -- vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
 -- vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
 
@@ -324,27 +324,27 @@ local on_attach = function(_, bufnr)
     vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
   end
 
-  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-  nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
+  nmap('<leader>r', vim.lsp.buf.rename, 'rename')
+  nmap('<leader>c', vim.lsp.buf.code_action, 'code action')
 
-  nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition')
-  nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-  nmap('gI', vim.lsp.buf.implementation, '[G]oto [I]mplementation')
-  nmap('gt', vim.lsp.buf.type_definition, 'Type [D]efinition')
-  nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-  nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+  nmap('gd', vim.lsp.buf.definition, 'definition')
+  nmap('gr', require('telescope.builtin').lsp_references, 'referenced')
+  nmap('gI', vim.lsp.buf.implementation, 'implementation')
+  nmap('gt', vim.lsp.buf.type_definition, 'type definition')
+  nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, 'document symbols')
+  nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'workspace symbols')
 
   -- See `:help K` for why this keymap
-  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
-  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+  nmap('K', vim.lsp.buf.hover, 'hover documentation')
+  nmap('<C-k>', vim.lsp.buf.signature_help, 'signature documentation')
 
   -- Lesser used LSP functionality
-  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
+  nmap('gD', vim.lsp.buf.declaration, 'declaration')
+  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, 'add folder')
+  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, 'remove folder')
   nmap('<leader>wl', function()
     print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, '[W]orkspace [L]ist Folders')
+  end, 'list folders')
 
   -- Create a command `:Format` local to the LSP buffer
   -- vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
diff --git a/lua/custom/plugins/trouble.lua b/lua/custom/plugins/trouble.lua
index d55eed9..3b8a490 100644
--- a/lua/custom/plugins/trouble.lua
+++ b/lua/custom/plugins/trouble.lua
@@ -3,6 +3,6 @@ return {
   dependencies = { 'nvim-tree/nvim-web-devicons' },
   opts = {},
   keys = {
-    { '<leader>d', '<cmd>TroubleToggle<cr>', desc = 'Diagnosis list' },
+    { '<leader>d', '<cmd>TroubleToggle<cr>', desc = 'diagnostic quickfix' },
   },
 }