From fc8c549c9807dcf2cebe3d62b33564ffc930ddfe Mon Sep 17 00:00:00 2001
From: Raoul Branten <raoul@electude.nl>
Date: Wed, 22 Oct 2025 14:05:57 +0200
Subject: [PATCH] Update keymaps

---
 lua/config/keymaps.lua           | 69 ++++++++++++++++++++++----------
 lua/config/lazy.lua              |  9 ++++-
 lua/config/plugin/init.lua       |  3 --
 lua/config/plugin/lsp_config.lua | 13 ------
 lua/config/plugin/telescope.lua  | 25 +++++++-----
 lua/plugins/init.lua             | 65 ++++++++++++++++++++++++++----
 6 files changed, 128 insertions(+), 56 deletions(-)
 delete mode 100644 lua/config/plugin/lsp_config.lua

diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 5338f44..c05f01b 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -1,22 +1,19 @@
 local wk = require("which-key")
-local builtin = require('telescope.builtin')
+local telescope = require('telescope.builtin')
+local marks = require('marks')
 
 -- the leader key is <space>
-
--- telescope
 wk.add({
+    -- Telescope
     { "<leader>f", group = "Telescope" },
-    { "<leader>ff", builtin.find_files, desc = "Find files", mode = "n" },
-    { "<leader>fg", builtin.live_grep, desc = "Live grep", mode ="n"},
-    { "<leader>fb", builtin.buffers, desc = "Find in buffers", mode ="n"},
-    { "<leader>fc", builtin.current_buffer_fuzzy_find, desc = "Find in current buffer", mode ="n"},
-    { "<leader>fh", builtin.help_tags, desc = "Find in help tags", mode ="n"},
-    { "<leader>fm", builtin.marks, desc = "Find in marks", mode ="n"},
-    { "<leader>fr", builtin.resume, desc = "Resume last find", mode ="n"},
-})
-
--- lspsaga
-wk.add({
+    { "<leader>ff", telescope.find_files, desc = "Find files", mode = "n" },
+    { "<leader>fg", telescope.live_grep, desc = "Live grep", mode ="n"},
+    { "<leader>fb", telescope.buffers, desc = "Find in buffers", mode ="n"},
+    { "<leader>fc", telescope.current_buffer_fuzzy_find, desc = "Find in current buffer", mode ="n"},
+    { "<leader>fh", telescope.help_tags, desc = "Find in help tags", mode ="n"},
+    { "<leader>fm", telescope.marks, desc = "Find in marks", mode ="n"},
+    { "<leader>fr", telescope.resume, desc = "Resume last find", mode ="n"},
+    -- LspSaga
     { "<leader>l", group = "Lspsaga" },
     { "<leader>lc", "<cmd>Lspsaga code_action<cr>", desc = "Code Action", mode ="n"},
     { "<leader>lo", "<cmd>Lspsaga outline<cr>", desc = "Outline", mode ="n"},
@@ -26,11 +23,43 @@ wk.add({
     { "<leader>lp", "<cmd>Lspsaga preview_definition<cr>", desc = "Preview Definition", mode ="n"},
     { "<leader>ls", "<cmd>Lspsaga signature_help<cr>", desc = "Signature Help", mode ="n"},
     { "<leader>lw", "<cmd>Lspsaga show_workspace_diagnostics<cr>", desc = "Show Workspace Diagnostics", mode ="n"},
+    -- UndoTree
+    { "<leader>u", group = "UndoTree" },
+    { "<leader>uu", "<cmd>lua require('undotree').toggle()<cr>", desc="Toggle undo tree", mode ="n"},
+    -- TagBar 
+    { "<leader><F8>", "<cmd>:TagbarToggle fj<cr>", desc="Toggle tagbar", mode ="n"},
+    -- Custom
+    { "<leader>n", "<cmd>:noh<cr>", desc="Remove highlight", mode = "n"},
+    -- Jump to definition in new tab
+    { "<leader><F5>", "<cmd>tab split | lua vim.lsp.buf.definition()<cr>", desc="Definition in new tab", mode = "n"},
+    -- See error in diagnostic window
+    { "<leader>e", "<cmd>lua vim.diagnostic.open_float()<CR>", desc="See diagnostic", mode = "n"},
+    -- Closing stuff
+    { "<leader>Z", group = "Closing"},
+    { "<leader>ZZ", "<cmd>wq!<cr>", desc = "Write en close", mode = "n"},
+    { "<leader>ZQ", "<cmd>q!<cr>", desc = "Close without write", mode = "n"},
+    -- Marks
+    { "<leader>m", group = "Marks"},
+    { "<leader>mx", marks.set, desc = "Set mark [x]", mode = "n"},
+    { "<leader>m,", marks.set_next, desc = "Set the next available alphabetical (lowercase) mark", mode = "n"},
+    { "<leader>m;", marks.toggle, desc = "Toggle the next available mark at the current line", mode = "n"},
+    { "<leader>dmx", marks.delete, desc = "Delete mark x", mode = "n"},
+    { "<leader>dm-", marks.delete_line, desc = "Delete all marks on the current line", mode = "n"},
+    { "<leader>dm<space>", marks.delete_buf, desc = "Delete all marks in the current buffer", mode = "n"},
+    { "<leader>m]", marks.next, desc = "Move to next mark", mode = "n"},
+    { "<leader>m[", marks.prev, desc = "Move to previous mark", mode = "n"},
+    { "<leader>m:", marks.preview, desc = "Preview mark. This will prompt you for a specific mark to preview; press <cr> to preview the next mark.", mode = "n"},
+    { "<leader>m[0-9]", marks.set_bookmark, desc = "Add a bookmark from bookmark group[0-9].", mode = "n"},
+    { "<leader>dm[0-9]", marks.delete_bookmark, desc = "Delete all bookmarks from bookmark group[0-9].", mode = "n"},
+    { "<leader>m}", marks.next_bookmark, desc = "Move to the next bookmark having the same type as the bookmark under the cursor. Works across buffers.", mode = "n"},
+    { "<leader>m{", marks.prev_bookmark, desc = "Move to the previous bookmark having the same type as the bookmark under the cursor. Works across buffers.", mode = "n"},
+    { "<leader>dm=", marks.delete_bookmark, desc = "Delete the bookmark under the cursor.", mode = "n"},
+    -- Git
+    { "<leader>h", group = "Git"},
+    -- Diagnostics
+    { "<leader>h", group = "Code Diagnostics"},
 })
 
--- clear searchterm
-vim.keymap.set('n', '<F5>', ':noh<CR>')
-
 -- prevent using arrow keys or mouse
 vim.keymap.set('n', '<Left>', ':echoe "Yo retard use h"<CR>')
 vim.keymap.set('n', '<Right>', ':echoe "Yo retard use l"<CR>')
@@ -44,14 +73,12 @@ vim.keymap.set('n', '*', '*```<CR>')
 -- show lsp floating tooltip
 vim.keymap.set('n', '<c-k>', ':lua vim.lsp.buf.hover()<CR>')
 
--- toggle tagbar plugin
-vim.keymap.set('n', '<F8>', ':TagbarToggle fj<CR>')
 
 -- tab navigation using <TAB>
 vim.keymap.set('n', '<Tab>', ':tabnext<CR>')
 vim.keymap.set('n', '<S-Tab>', ':tabprevious<CR>')
--- quick close tab
-vim.keymap.set('n', '<C-w>', ':tabclose<CR>')
+-- quick close tab USE <leader>ZQ
+--vim.keymap.set('n', '<C-w>', ':tabclose<CR>')
 
 -- jump to definition in new tab
 vim.keymap.set('n', '<C-]>', '<cmd>tab split | lua vim.lsp.buf.definition()<CR>', {})
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 92d6151..76e0a07 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -29,7 +29,12 @@ require("lazy").setup({
     },
     -- Configure any other settings here. See the documentation for more details.
     -- colorscheme that will be used when installing plugins.
-    install = { colorscheme = { "habamax" } },
+    install = { 
+        colorscheme = { "habamax" } 
+    },
     -- automatically check for plugin updates
-    checker = { enabled = true },
+    checker = { 
+        enabled = true,
+        notify = false,
+    },
 })
diff --git a/lua/config/plugin/init.lua b/lua/config/plugin/init.lua
index 614489c..ecc7ef9 100644
--- a/lua/config/plugin/init.lua
+++ b/lua/config/plugin/init.lua
@@ -14,7 +14,4 @@ require("config.plugin.vim-indentwise")
 require("config.plugin.indent-blankline")
 require("config.plugin.scrollbar")
 require("config.plugin.lspsaga")
-
 require("config.plugin.gruvbox")
---require("config.plugin.lsp_config")
---require("config.plugin.catppuccin")
diff --git a/lua/config/plugin/lsp_config.lua b/lua/config/plugin/lsp_config.lua
deleted file mode 100644
index e0989bc..0000000
--- a/lua/config/plugin/lsp_config.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-require("mason").setup()
-require("mason-lspconfig").setup({
-})
---require("lspconfig").phpactor.setup({
-vim.lsp.config.phpactor.setup({
-    on_attach = on_attach,
-    init_options = {
-        ["language_server_phpstan.enabled"] = false,
-        ["language_server_psalm.enabled"] = false,
-    }
-})
-
---require("lspconfig").sumneko_lua.setup {}
diff --git a/lua/config/plugin/telescope.lua b/lua/config/plugin/telescope.lua
index e8a2532..a23ac81 100644
--- a/lua/config/plugin/telescope.lua
+++ b/lua/config/plugin/telescope.lua
@@ -1,10 +1,15 @@
-local builtin = require('telescope.builtin')
-
--- The leader key is space
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-vim.keymap.set('n', '<leader>fc', builtin.current_buffer_fuzzy_find, {})
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
-vim.keymap.set('n', '<leader>fm', builtin.marks, {})
-vim.keymap.set('n', '<leader>fr', builtin.resume, {})
+local telescope = require('telescope')
+telescope.setup({
+    pickers = {
+        live_grep = {
+            file_ignore_patterns = { '.git' },
+            additional_args = function(_)
+                return { "--hidden" }
+            end
+        },
+        find_files = {
+            file_ignore_patterns = { '.git' },
+            hidden = true
+        }
+    }
+})
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index c27c054..4b34277 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -59,16 +59,60 @@ return {
     {
         "lukas-reineke/indent-blankline.nvim",
         main = "ibl",
-        commit = "29be0919b91fb59eca9e90690d76014233392bef",
+        --commit = "29be0919b91fb59eca9e90690d76014233392bef",
     },
-    --# lsp, the lazy way
+    -- lsp stuff
     {
-        "dundalek/lazy-lsp.nvim",
-        dependencies = { "neovim/nvim-lspconfig" },
-        config = function()
-            require("lazy-lsp").setup {}
-        end
+    "mason-org/mason.nvim",
+    opts = {}
     },
+    {
+        "mason-org/mason-lspconfig.nvim",
+        opts = {},
+        dependencies = {
+            { "mason-org/mason.nvim", opts = {} },
+            "neovim/nvim-lspconfig",
+        },
+    },
+    -- show warning and errors
+    {
+        "folke/trouble.nvim",
+        opts = {}, -- for default options, refer to the configuration section for custom setup.
+        cmd = "Trouble",
+        keys = {
+            {
+                "<leader>xx",
+                "<cmd>Trouble diagnostics toggle<cr>",
+                desc = "Diagnostics (Trouble)",
+            },
+            {
+                "<leader>xX",
+                "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+                desc = "Buffer Diagnostics (Trouble)",
+            },
+            {
+                "<leader>cs",
+                "<cmd>Trouble symbols toggle focus=false<cr>",
+                desc = "Symbols (Trouble)",
+            },
+            {
+                "<leader>cl",
+                "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+                desc = "LSP Definitions / references / ... (Trouble)",
+            },
+            {
+                "<leader>xL",
+                "<cmd>Trouble loclist toggle<cr>",
+                desc = "Location List (Trouble)",
+            },
+            {
+                "<leader>xQ",
+                "<cmd>Trouble qflist toggle<cr>",
+                desc = "Quickfix List (Trouble)",
+            },
+        },
+    },
+
     -- Add scrollbar
     'petertriho/nvim-scrollbar',
     -- Show shortcut keys
@@ -146,6 +190,13 @@ return {
             require'alpha'.setup(require'alpha.themes.dashboard'.config)
         end,
     },
+    -- AI
+--    {
+--        "supermaven-inc/supermaven-nvim",
+--        config = function()
+--            require("supermaven-nvim").setup({})
+--        end,
+--    },
 }
 --"williamboman/mason.nvim",
 --"williamboman/mason-lspconfig.nvim",