From b86f268e9a6c0afe63f0288777b4d108e5aa3ade Mon Sep 17 00:00:00 2001
From: Andreas Tsouchlos <an.tsouchlos@gmail.com>
Date: Thu, 4 Apr 2024 15:40:57 +0200
Subject: [PATCH] Change remaps

---
 .config/nvim/lua/plugins/auto_session.lua | 14 +++-
 .config/nvim/lua/plugins/doge.lua         |  4 +
 .config/nvim/lua/plugins/harpoon.lua      |  4 +-
 .config/nvim/lua/plugins/lsp.lua          | 93 +++++++++++------------
 .config/nvim/lua/plugins/nvim_tree.lua    |  6 +-
 .config/nvim/lua/plugins/telescope.lua    | 10 +--
 .config/nvim/lua/plugins/trouble.lua      | 24 ++++--
 .config/nvim/lua/plugins/undotree.lua     |  6 +-
 .config/nvim/lua/remap.lua                |  8 +-
 9 files changed, 95 insertions(+), 74 deletions(-)

diff --git a/.config/nvim/lua/plugins/auto_session.lua b/.config/nvim/lua/plugins/auto_session.lua
index f2767b4..f3a9b8f 100644
--- a/.config/nvim/lua/plugins/auto_session.lua
+++ b/.config/nvim/lua/plugins/auto_session.lua
@@ -8,8 +8,12 @@ return {
         init = function()
             vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
 
-            vim.keymap.set('n', '<leader><C-s>', '<cmd>SessionSave<CR>')
-            vim.keymap.set('n', '<leader><C-d>', '<cmd>SessionDelete<CR>')
+            vim.keymap.set('n', '<leader>ss', '<cmd>SessionSave<CR>', {
+                desc = "Save"
+            })
+            vim.keymap.set('n', '<leader>sd', '<cmd>SessionDelete<CR>', {
+                desc = "Delete"
+            })
         end,
         opts = {
             log_level = "error",
@@ -27,11 +31,13 @@ return {
             'nvim-telescope/telescope.nvim'
         },
         init = function()
-            vim.keymap.set('n', '<leader>p', function() require('session-lens').search_session() end)
+            vim.keymap.set('n', '<leader>sf', function() require('session-lens').search_session() end, {
+                desc = "Find"
+            })
         end,
         config = function()
             require('session-lens').setup({
-                prompt_title = 'Projects'
+                prompt_title = 'Sessions'
             })
         end
     }
diff --git a/.config/nvim/lua/plugins/doge.lua b/.config/nvim/lua/plugins/doge.lua
index d09f3eb..25c22c7 100644
--- a/.config/nvim/lua/plugins/doge.lua
+++ b/.config/nvim/lua/plugins/doge.lua
@@ -3,9 +3,13 @@ return {
         'kkoomen/vim-doge',
         build = ':call doge#install()',
         init = function()
+            vim.g.doge_enable_mappings = 0
             vim.g.doge_doc_standard_cpp = 'doxygen_cpp_comment_slash'
             vim.g.doge_mapping_comment_jump_forward = '<c-j>'
             vim.g.doge_mapping_comment_jump_backward = '<c-k>'
+
+            vim.keymap.set('n', '<leader>gd', '<Plug>(doge-generate)', { silent = true, desc = "Generate doc"})
+            -- nmap <silent> <Leader>d <Plug>(doge-generate)
         end
     }
 }
diff --git a/.config/nvim/lua/plugins/harpoon.lua b/.config/nvim/lua/plugins/harpoon.lua
index 219f708..c0f4f08 100644
--- a/.config/nvim/lua/plugins/harpoon.lua
+++ b/.config/nvim/lua/plugins/harpoon.lua
@@ -8,8 +8,8 @@ return {
             }
         },
         init = function()
-            vim.keymap.set("n", "<C-e>", function() require("harpoon.ui").toggle_quick_menu() end)
-            vim.keymap.set("n", "<leader>a", function() require("harpoon.mark").add_file() end)
+            vim.keymap.set("n", "<C-e>", function() require("harpoon.ui").toggle_quick_menu() end, {desc = "Toggle harpoon ui"})
+            vim.keymap.set("n", "<leader>a", function() require("harpoon.mark").add_file() end, {desc = "Add to harpoon list"})
 
             vim.keymap.set("n", "<C-h>", function() require("harpoon.ui").nav_file(1) end)
             vim.keymap.set("n", "<C-t>", function() require("harpoon.ui").nav_file(2) end)
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index fae126d..2942f7d 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -37,26 +37,14 @@ return {
 
                 cmp.setup({
                     sources = {
-                        {
-                            name = 'path'
-                        },
-                        {
-                            name = 'nvim_lsp'
-                        },
-                        {
-                            name = 'nvim_lua'
-                        },
-                        {
-                            name = 'luasnip',
-                            keyword_length = 2
-                        },
-                        {
-                            name = 'buffer',
-                            keyword_length = 3
-                        },
-                        {
-                            name = 'nvim_lsp_signature_help'
-                        }
+                        -- LuaFormatter off
+                        { name = 'path' },
+                        { name = 'nvim_lsp' },
+                        { name = 'nvim_lua' },
+                        { name = 'luasnip', keyword_length = 2 },
+                        { name = 'buffer', keyword_length = 3 },
+                        { name = 'nvim_lsp_signature_help' }
+                        -- LuaFormatter on
                     },
                     formatting = lsp_zero.cmp_format(),
                     mapping = cmp.mapping.preset.insert({
@@ -73,15 +61,12 @@ return {
                 })
 
                 cmp.setup.filetype('gitcommit', {
-                    sources = cmp.config.sources({
-                        {
-                            name = 'git'
-                        }
-                    }, {
-                        {
-                            name = 'buffer'
-                        }
-                    })
+                    -- LuaFormatter off
+                    sources = cmp.config.sources(
+                        { { name = 'git' } },
+                        { { name = 'buffer' } }
+                    )
+                    -- LuaFormatter on
                 })
 
                 cmp.setup.cmdline({
@@ -126,31 +111,34 @@ return {
             dependencies = {
                 'hrsh7th/cmp-nvim-lsp',
                 'williamboman/mason-lspconfig.nvim',
-                'folke/trouble.nvim' -- required for the current config
+                "folke/trouble.nvim"
             },
             config = function()
                 local lsp_zero = require('lsp-zero')
                 lsp_zero.extend_lspconfig()
 
                 lsp_zero.on_attach(function(client, bufnr)
-                    local opts = {
-                        buffer = bufnr,
-                        remap = false
-                    }
-
-                    vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-                    vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-                    vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-                    vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
-                    vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
-                    vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
-                    vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-                    -- vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
-                    vim.keymap.set("n", "<leader>vrr", "<cmd>Trouble lsp_references<CR>", opts)
-                    vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
-                    vim.keymap.set("i", "<C-p>", function() vim.lsp.buf.signature_help() end, opts)
-                    vim.keymap.set("n", "<M-cr>", function() vim.lsp.buf.code_action() end, opts)
-                    vim.keymap.set("i", "<M-cr>", function() vim.lsp.buf.code_action() end, opts)
+                    vim.keymap.set("n", "<leader>ld", function() vim.lsp.buf.definition() end, {
+                        desc = "Go to definition"
+                    })
+                    vim.keymap.set("n", "<leader>lh", function() vim.lsp.buf.hover() end, {
+                        desc = "Hover"
+                    })
+                    vim.keymap.set("n", "<leader>lr", ":Trouble lsp_references<CR>", {
+                        desc = "Show references"
+                    })
+                    vim.keymap.set("n", "<leader>ln", function() vim.lsp.buf.rename() end, {
+                        desc = "Rename"
+                    })
+                    vim.keymap.set("n", "<leader>ls", function() vim.lsp.buf.signature_help() end, {
+                        desc = "Signature help"
+                    })
+                    vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
+                        desc = "Code actions"
+                    })
+                    vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, {
+                        desc = "Code actions"
+                    })
                 end)
 
                 require('mason-lspconfig').setup({
@@ -172,8 +160,17 @@ return {
                 require('lspconfig')['clangd'].setup {
                     cmd = {
                         "clangd",
+                        "--background-index",
+                        "--clang-tidy",
+                        "--completion-style=bundled",
+                        "--cross-file-rename",
+                        "--header-insertion=iwyu",
+                        -- Required for embedded system compilers
                         "--query-driver=/**/*g++",
                         "--offset-encoding=utf-16"
+                        -- "-j=8",
+                        -- "--malloc-trim",
+                        -- "--pch-storage=memory"
                     }
                 }
             end
diff --git a/.config/nvim/lua/plugins/nvim_tree.lua b/.config/nvim/lua/plugins/nvim_tree.lua
index 0f84478..675c6ef 100644
--- a/.config/nvim/lua/plugins/nvim_tree.lua
+++ b/.config/nvim/lua/plugins/nvim_tree.lua
@@ -7,7 +7,11 @@ return {
         },
         init = function()
             vim.opt.termguicolors = true
-            vim.keymap.set('n', '<leader>t', '<cmd>NvimTreeToggle<cr>', {noremap = true, silent = true})
+            vim.keymap.set('n', '<leader>e', '<cmd>NvimTreeToggle<cr>', {
+                noremap = true,
+                silent = true,
+                desc = "Explorer"
+            })
         end,
         config = function() require("nvim-tree").setup() end
     }
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index d94f589..a3dd144 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -36,14 +36,14 @@ return {
         cmd = "Telescope",
         init = function()
             -- LuaFormatter off
-            vim.keymap.set('n', '<leader>ff', function() require("telescope.builtin").find_files() end,{desc = "Telescope find files"})
-            vim.keymap.set('n', '<leader>fg', function() require("telescope.builtin").live_grep() end,{desc = "Telescope live grep"})
+            vim.keymap.set('n', '<leader>ff', function() require("telescope.builtin").find_files() end,{desc = "Files"})
+            vim.keymap.set('n', '<leader>fg', function() require("telescope.builtin").live_grep() end,{desc = "grep"})
             vim.keymap.set('n', '<leader>fa', function()
                 require("telescope.builtin").find_files({hidden = true})
-            end, {desc = "Telescope find all files"})
+            end, {desc = "All files"})
 
-            vim.keymap.set('n', '<leader>fb', function() require("telescope.builtin").buffers() end, {desc = "Telescope buffers"})
-            vim.keymap.set('n', '<leader>fh', function() require("telescope.builtin").help_tags() end, {desc = "Telescope help tags"})
+            vim.keymap.set('n', '<leader>fb', function() require("telescope.builtin").buffers() end, {desc = "Buffers"})
+            vim.keymap.set('n', '<leader>fh', function() require("telescope.builtin").help_tags() end, {desc = "Help tags"})
             -- LuaFormatter on
         end
     }
diff --git a/.config/nvim/lua/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua
index 3a25b39..c024486 100644
--- a/.config/nvim/lua/plugins/trouble.lua
+++ b/.config/nvim/lua/plugins/trouble.lua
@@ -19,12 +19,24 @@ return {
             "TroubleRefresh"
         },
         init = function()
-            vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end)
-            vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end)
-            vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end)
-            vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end)
-            vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end)
-            vim.keymap.set("n", "gR", function() require("trouble").toggle("lsp_references") end)
+            vim.keymap.set("n", "<leader>xx", function() require("trouble").toggle() end, {
+                desc = "Toggle"
+            })
+            vim.keymap.set("n", "<leader>xw", function() require("trouble").toggle("workspace_diagnostics") end, {
+                desc = "Workspace diagnostics"
+            })
+            vim.keymap.set("n", "<leader>xd", function() require("trouble").toggle("document_diagnostics") end, {
+                desc = "Document diagnostics"
+            })
+            vim.keymap.set("n", "<leader>xq", function() require("trouble").toggle("quickfix") end, {
+                desc = "Quickfix"
+            })
+            vim.keymap.set("n", "<leader>xl", function() require("trouble").toggle("loclist") end, {
+                desc = "Loclist"
+            })
+            -- vim.keymap.set("n", "<leader>xr", function() require("trouble").toggle("lsp_references") end, {
+            --     desc = "LSP references"
+            -- })
         end,
         config = function()
             local trouble_provider = require("trouble.providers.telescope")
diff --git a/.config/nvim/lua/plugins/undotree.lua b/.config/nvim/lua/plugins/undotree.lua
index 8d41e6d..f587721 100644
--- a/.config/nvim/lua/plugins/undotree.lua
+++ b/.config/nvim/lua/plugins/undotree.lua
@@ -8,6 +8,10 @@ return {
             "UndotreeFocus",
             "UndotreePersistUndo"
         },
-        init = function() vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<CR>") end
+        init = function()
+            vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<CR>", {
+                desc = "Undotree"
+            })
+        end
     }
 }
diff --git a/.config/nvim/lua/remap.lua b/.config/nvim/lua/remap.lua
index c85b7ab..2a4af61 100644
--- a/.config/nvim/lua/remap.lua
+++ b/.config/nvim/lua/remap.lua
@@ -20,10 +20,4 @@ vim.keymap.set("n", "Q", "<nop>")
 vim.keymap.set("n", "q:", "<nop>")
 vim.cmd [[call nvim_create_user_command('W', 'w', {'nargs': 0})]]
 
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
-
-vim.keymap.set("n", "<leader>cb", [[:up | %bd | e#<CR>]])
-
--- vim.keymap.set('n', '<leader><C-s>', '<cmd>mksession! .nvim_session<CR>', {})
--- vim.keymap
---    .set('n', '<leader><C-l>', '<cmd>silent! source .nvim_session<CR>', {})
+-- vim.keymap.set("n", "<leader>cb", [[:up | %bd | e#<CR>]])