feat(nvim): keymaps tweaks, cleanup, docs

2026-01-26 11:14:08 +00:00 · 2024-09-25 14:52:56 +03:00
parent 8f96922033
commit 250e7f5666
18 changed files with 345 additions and 353 deletions
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -18,17 +18,29 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)

-require 'options'
-require 'keymaps'
+-- Add ~/.local/bin to the PATH
+vim.fn.setenv('PATH', vim.fn.expand '$HOME/.local/bin' .. ':' .. vim.fn.expand '$PATH')

-require('lazy').setup {
+require 'options'
+
+require('lazy').setup('plugins', {
  checker = {
    -- Automatically check for updates
    enabled = true,
    nofity = false,
  },
-  spec = {
-    -- Import plugins from `lua/plugins` directory
-    { import = 'plugins' },
+  change_detection = {
+    notify = false,
  },
-}
+})
+
+-- [[ Highlight on yank ]]
+-- See `:help vim.highlight.on_yank()`
+local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
+vim.api.nvim_create_autocmd('TextYankPost', {
+  callback = function()
+    vim.highlight.on_yank()
+  end,
+  group = highlight_group,
+  pattern = '*',
+})
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -1,72 +0,0 @@
-vim.api.nvim_set_keymap('i', 'jj', '<Esc>', { noremap = false })
-
-- buffers
-vim.api.nvim_set_keymap('n', '<leader>bk', ':blast<enter>', { desc = 'Buffer: Last', noremap = false })
-vim.api.nvim_set_keymap('n', '<leader>bj', ':bfirst<enter>', { desc = 'Buffer: First', noremap = false })
-vim.api.nvim_set_keymap('n', '<leader>bh', ':bprev<enter>', { desc = 'Buffer: Prev', noremap = false })
-vim.api.nvim_set_keymap('n', '<leader>bl', ':bnext<enter>', { desc = 'Buffer: Next', noremap = false })
-vim.api.nvim_set_keymap('n', '<leader>bd', ':Bdelete<enter>', { desc = 'Buffer: Delete', noremap = false })
-vim.api.nvim_set_keymap('n', '<leader>bw', ':Bwipeout<enter>', { desc = 'Buffer: Wipeout', noremap = false })
-
-- files
-vim.api.nvim_set_keymap('n', 'QQ', ':q!<enter>', { desc = 'Quickly Quit', noremap = false })
-vim.api.nvim_set_keymap('n', 'WW', ':w!<enter>', { desc = 'Force write', noremap = false })
-vim.api.nvim_set_keymap('n', 'E', '$', { noremap = false })
-vim.api.nvim_set_keymap('n', 'B', '^', { noremap = false })
-vim.api.nvim_set_keymap('n', 'tT', ':TransparentToggle<CR>', { desc = 'Toggle Transparency', noremap = true })
-vim.api.nvim_set_keymap('n', 'ss', ':noh<CR>', { noremap = true })
-
-- splits
-vim.api.nvim_set_keymap('n', '<C-W>,', ':vertical resize -10<CR>', { desc = 'V Resize -', noremap = true })
-vim.api.nvim_set_keymap('n', '<C-W>.', ':vertical resize +10<CR>', { desc = 'V Resize +', noremap = true })
-
-- Quicker close split
-vim.keymap.set('n', '<leader>qf', ':q<CR>', { desc = 'Quicker close split', silent = true, noremap = true })
-
-- Keymaps for better default experience
-- See `:help vim.keymap.set()`
-vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
-
-- Remap for dealing with word wrap
-vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-
-vim.keymap.set('n', '<leader>xe', '<cmd>GoIfErr<cr>', { desc = 'Go If Error', silent = true, noremap = true })
-
-- TIP: Disable arrow keys in normal mode
-vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
-vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
-vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
-vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
-
-- Keybinds to make split navigation easier.
--  Use CTRL+<hjkl> to switch between windows
--
--  See `:help wincmd` for a list of all window commands
-vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
-vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
-vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
-vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
-
-- Old habits
-vim.keymap.set('n', '<C-s>', '<cmd>w<CR>', { desc = 'Save file' })
-vim.keymap.set('n', '<leader>qq', '<cmd>wq!<CR>', { desc = '[qq] Quickly Quit' })
-
-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
-- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
-- is not what someone will guess without a bit more experience.
--
-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping
-- or just use <C-\><C-n> to exit terminal mode
-vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
-
-- [[ Highlight on yank ]]
-- See `:help vim.highlight.on_yank()`
-local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
-vim.api.nvim_create_autocmd('TextYankPost', {
-  callback = function()
-    vim.highlight.on_yank()
-  end,
-  group = highlight_group,
-  pattern = '*',
-})
--- a/config/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -81,5 +81,11 @@ vim.o.termguicolors = true

 -- Set spell checking
 vim.o.spell = true
+vim.o.spelllang = 'en_us'

 vim.g.loaded_perl_provider = 0
+
+-- ── Deal with word wrap ───────────────────────────────────────────────────────
+local m = vim.api.nvim_set_keymap
+m('n', 'k', "v:count == 0 ? 'gk' : 'k'", { desc = 'Move up', noremap = true, expr = true })
+m('n', 'j', "v:count == 0 ? 'gj' : 'j'", { desc = 'Move down', noremap = true, expr = true })
--- a/config/nvim/lua/plugins/cmp.lua
+++ b/config/nvim/lua/plugins/cmp.lua
@@ -31,7 +31,7 @@ return {
                help = true,
              },
            },
-          }
+          },
        },
        config = function()
          require('copilot_cmp').setup()
@@ -51,7 +51,7 @@ return {
            min_width = 40,
            max_width = 100,
            symbol_map = {
-              Copilot = ''
+              Copilot = '',
            },
          },
        },
--- a/config/nvim/lua/plugins/fzf.lua
+++ b/config/nvim/lua/plugins/fzf.lua
@@ -8,7 +8,7 @@ return {
  keys = {
    -- Stolen from https://github.com/erikw/dotfiles/blob/d68d6274d67ac47afa20b9a0b9f3b0fa54bcdaf3/.config/nvim/lua/plugins.lua
    -- Search for files in given path.
-    { '<Leader><space>', ':FZF<space>', desc = 'FZF: search for files in given path.' },
+    { '<Leader>zf', ':FZF<space>', desc = 'FZF: search for files in given path.' },
    -- Sublime-like shortcut 'go to file' ctrl+p.
    { '<C-p>', ':Files<CR>', desc = 'FZF: search for files starting at current directory.' },
    { '<Leader>zc', ':Commands<CR>', desc = 'FZF: search commands.' },
--- a/config/nvim/lua/plugins/git.lua
+++ b/config/nvim/lua/plugins/git.lua
@@ -3,6 +3,7 @@ return {
  -- https://github.com/lewis6991/gitsigns.nvim
  {
    'lewis6991/gitsigns.nvim',
+    lazy = false,
    config = function()
      require('gitsigns').setup {
        signs = {
--- a/config/nvim/lua/plugins/goto-preview.lua
+++ b/config/nvim/lua/plugins/goto-preview.lua
@@ -6,9 +6,10 @@ return {
    { 'nvim-telescope/telescope.nvim' },
  },
  keys = {
+    { 'n', 'gp', group = 'Goto Preview' },
    { 'n', 'gpd', '<cmd>lua require("goto-preview").goto_preview_definition()<CR>' },
    { 'n', 'gpi', '<cmd>lua require("goto-preview").goto_preview_implementation()<CR>' },
-    { 'n', 'gP', '<cmd>lua require("goto-preview").close_all_windows()<CR>' },
+    { 'n', 'gpP', '<cmd>lua require("goto-preview").close_all_windows()<CR>' },
  },
  config = function()
    require('goto-preview').setup {
--- a/config/nvim/lua/plugins/harpoon.lua
+++ b/config/nvim/lua/plugins/harpoon.lua
@@ -15,7 +15,7 @@ return {

      vim.keymap.set('n', '<leader>ht', function()
        harpoon.ui:toggle_quick_menu(harpoon:list())
-      end)
+      end, { desc = 'Open Harpoon Quick menu' })

      -- basic telescope configuration
      local conf = require('telescope.config').values
@@ -37,27 +37,27 @@ return {
          :find()
      end

-      vim.keymap.set('n', '<leader>xa', function()
+      vim.keymap.set('n', '<leader>hw', function()
        toggle_telescope(harpoon:list())
-      end, { desc = 'Open harpoon window' })
+      end, { desc = 'Open harpoon window with telescope' })
    end,
    keys = {
      {
-        '<leader>xa',
+        '<leader>ha',
        function()
          require('harpoon'):list():add()
        end,
        desc = 'harpoon file',
      },
      {
-        '<leader>xN',
+        '<leader>hp',
        function()
          require('harpoon'):list():prev()
        end,
        desc = 'harpoon to previous file',
      },
      {
-        '<leader>xn',
+        '<leader>hn',
        function()
          require('harpoon'):list():next()
        end,
--- a/config/nvim/lua/plugins/lazy.lua
+++ b/config/nvim/lua/plugins/lazy.lua
@@ -1,16 +1,29 @@
 return {
-  -- vscode-like pictograms for neovim lsp completion items
-  -- https://github.com/onsails/lspkind-nvim
-  { 'onsails/lspkind.nvim' },
+  -- A better annotation generator.
+  -- Supports multiple languages and annotation conventions.
+  -- https://github.com/danymat/neogen
+  {
+    'danymat/neogen',
+    version = '*',
+    keys = {
+      {
+        '<leader>cg',
+        '<cmd>lua require("neogen").generate()<CR>',
+        desc = 'Generate annotations',
+      },
+    },
+    config = function()
+      require('neogen').setup {
+        enabled = true,
+        snippet_engine = 'luasnip',
+      }
+    end,
+  },

  -- Rethinking Vim as a tool for writing
  -- https://github.com/preservim/vim-pencil
  { 'preservim/vim-pencil' },

-  -- obsession.vim: continuously updated session files
-  -- https://github.com/tpope/vim-obsession
-  { 'tpope/vim-obsession' },
-
  -- surround.vim: Delete/change/add parentheses/quotes/XML-tags/much more with ease
  -- https://github.com/tpope/vim-surround
  { 'tpope/vim-surround' },
@@ -25,11 +38,6 @@ return {
    end,
  },

-  -- LSP Configuration & Plugins
-  -- Meta type definitions for the Lua platform Luvit.
-  -- https://github.com/Bilal2453/luvit-meta
-  { 'Bilal2453/luvit-meta', lazy = true },
-
  -- Indent guides for Neovim
  -- https://github.com/lukas-reineke/indent-blankline.nvim
  {
--- a/config/nvim/lua/plugins/lsp.lua
+++ b/config/nvim/lua/plugins/lsp.lua
@@ -1,65 +1,39 @@
 -- Quickstart configs for Nvim LSP
 -- https://github.com/neovim/nvim-lspconfig
 return {
-  -- Neovim plugin to manage global and project-local settings
-  -- Should be included before LSP Config
-  -- https://github.com/folke/neoconf.nvim
-  {
-    'folke/neoconf.nvim',
-    keys = {
-      { '<leader>?c', '<cmd>Neoconf<CR>', desc = 'Neoconf: Open' },
-      { '<leader>?g', '<cmd>Neoconf global<CR>', desc = 'Neoconf: Global' },
-      { '<leader>?l', '<cmd>Neoconf local<CR>', desc = 'Neoconf: Local' },
-      { '<leader>?m', '<cmd>Neoconf lsp<CR>', desc = 'Neoconf: Show merged LSP config' },
-      { '<leader>?s', '<cmd>Neoconf show<CR>', desc = 'Neoconf: Show merged config' },
-    },
-    config = function()
-      require('neoconf').setup()
-    end,
-  },
-
  {
    'neovim/nvim-lspconfig',
+    lazy = false,
    dependencies = {
+      -- Neovim plugin to manage global and project-local settings
+      -- Should be included before LSP Config
+      -- https://github.com/folke/neoconf.nvim
+      {
+        'folke/neoconf.nvim',
+        lazy = false,
+        keys = {
+          { '<leader>?c', '<cmd>Neoconf<CR>', desc = 'Neoconf: Open' },
+          { '<leader>?g', '<cmd>Neoconf global<CR>', desc = 'Neoconf: Global' },
+          { '<leader>?l', '<cmd>Neoconf local<CR>', desc = 'Neoconf: Local' },
+          { '<leader>?m', '<cmd>Neoconf lsp<CR>', desc = 'Neoconf: Show merged LSP config' },
+          { '<leader>?s', '<cmd>Neoconf show<CR>', desc = 'Neoconf: Show merged config' },
+        },
+        config = function()
+          require('neoconf').setup()
+        end,
+      },
      -- Automatically install LSPs to stdpath for neovim
-      'williamboman/mason.nvim',
+      {
+        'williamboman/mason.nvim',
+        lazy = false,
+        run = ':call MasonUpdate',
+      },
      'williamboman/mason-lspconfig.nvim',
      'WhoIsSethDaniel/mason-tool-installer.nvim',
-      -- Useful status updates for LSP
-      {
-        'j-hui/fidget.nvim',
-        opts = {
-          notification = {
-            window = {
-              winblend = 50,
-              align = 'top',
-            },
-          },
-        },
-      },
      'b0o/schemastore.nvim',
-      {
-        -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
-        -- used for completion, annotations and signatures of Neovim apis
-        'folke/lazydev.nvim',
-        dependencies = {
-          -- `wezterm-types` provides types for the Wezterm terminal
-          {
-            'justinsgithub/wezterm-types',
-            as = 'wezterm',
-          },
-        },
-        ft = 'lua',
-        opts = {
-          library = {
-            -- Load luvit types when the `vim.uv` word is found
-            { path = 'luvit-meta/library', words = { 'vim%.uv' } },
-            -- Load wezterm types when the `wezterm` word is found
-            { path = 'wezterm-types', mods = { 'wezterm' } },
-          },
-        },
-      },
-      'folke/neoconf.nvim',
+      -- vscode-like pictograms for neovim lsp completion items
+      -- https://github.com/onsails/lspkind-nvim
+      { 'onsails/lspkind.nvim' },
    },
    keys = {
      { '<leader>do', '<cmd>lua vim.diagnostic.open_float()<CR>', desc = 'Diagnostic: Open float' },
@@ -215,7 +189,7 @@ return {
      end

      -- Turn on lsp status information
-      require('fidget').setup()
+      -- require('fidget').setup()

      -- Example custom configuration for lua
      --
--- a/config/nvim/lua/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -66,19 +66,17 @@ return {

    local wk = require 'which-key'
    wk.add {
-      -- { '<leader><space>', b.buffers, desc = '[ ] Find existing buffers' },
-      { '<leader>gR', "<cmd>lua require('telescope').extensions.git_worktree.create_git_worktree()<CR>", desc = 'Create Git worktree' },
-      { '<leader>gr', "<cmd>lua require('telescope').extensions.git_worktree.git_worktrees()<CR>", desc = 'Git worktrees' },
-      { '<leader>sS', b.git_status, desc = '' },
-      { '<leader>sd', b.diagnostics, desc = '[S]earch [D]iagnostics' },
-      { '<leader>sf', b.find_files, desc = '[S]earch [F]iles' },
-      { '<leader>sg', b.live_grep, desc = '[S]earch by [G]rep' },
+      { '<leader><space>', b.buffers, desc = '[ ] Find existing buffers' },
+      { '<leader><tab>', "<Cmd>lua require('telescope.builtin').commands()<CR>", desc = 'Telescope: Commands' },
+      { '<leader>sS', b.git_status, desc = 'Git Status' },
+      { '<leader>sd', b.diagnostics, desc = 'Search Diagnostics' },
+      { '<leader>sf', b.find_files, desc = 'Search Files' },
+      { '<leader>sg', b.live_grep, desc = 'Search by Grep' },
      { '<leader>sm', ':Telescope harpoon marks<CR>', desc = 'Harpoon Marks' },
      { '<leader>sn', "<cmd>lua require('telescope').extensions.notify.notify()<CR>", desc = 'Notify' },
-      { '<leader>so', b.oldfiles, desc = '[?] Find recently opened files' },
-      { '<leader>sw', b.grep_string, desc = '[S]earch current [W]ord' },
+      { '<leader>so', b.oldfiles, desc = 'Find recently Opened files' },
      { '<leader>st', ':TodoTelescope<CR>', desc = 'Telescope: Todo' },
-      { '<leader><tab>', "<Cmd>lua require('telescope.builtin').commands()<CR>", desc = 'Telescope: Commands' },
+      { '<leader>sw', b.grep_string, desc = 'Search current Word' },
    }

    vim.keymap.set('n', '<leader>/', function()
--- a/config/nvim/lua/plugins/treesitter.lua
+++ b/config/nvim/lua/plugins/treesitter.lua
@@ -10,6 +10,10 @@ return {
  },
  config = function()
    require('nvim-treesitter.configs').setup {
+      auto_install = true,
+      ignore_install = {},
+      sync_install = true,
+      modules = {},

      -- Add languages to be installed here that you want installed for treesitter
      ensure_installed = {
@@ -95,10 +99,10 @@ return {
        swap = {
          enable = true,
          swap_next = {
-            ['<leader>a'] = '@parameter.inner',
+            ['<leader>cn'] = '@parameter.inner',
          },
          swap_previous = {
-            ['<leader>A'] = '@parameter.inner',
+            ['<leader>cP'] = '@parameter.inner',
          },
        },
      },
--- a/config/nvim/lua/plugins/trouble.lua
+++ b/config/nvim/lua/plugins/trouble.lua
@@ -3,12 +3,12 @@ return {
  lazy = false,
  dependencies = 'nvim-tree/nvim-web-devicons',
  keys = {
-    { '<leader>xx', '<cmd>TroubleToggle<cr>', desc = 'Toggle Trouble' },
-    { '<leader>xw', '<cmd>TroubleToggle workspace_diagnostics<cr>', desc = 'Toggle Workspace Diagnostics' },
-    { '<leader>xd', '<cmd>TroubleToggle document_diagnostics<cr>', desc = 'Toggle Document Diagnostics' },
-    { '<leader>xl', '<cmd>TroubleToggle loclist<cr>', desc = 'Toggle Loclist' },
-    { '<leader>xq', '<cmd>TroubleToggle quickfix<cr>', desc = 'Toggle Quickfix' },
-    { 'gR', '<cmd>TroubleToggle lsp_references<cr>', desc = 'Toggle LSP References' },
+    { '<leader>xx', '<cmd>Trouble<cr>', desc = 'Toggle Trouble' },
+    { '<leader>xw', '<cmd>Trouble workspace_diagnostics<cr>', desc = 'Toggle Workspace Diagnostics' },
+    { '<leader>xd', '<cmd>Trouble document_diagnostics<cr>', desc = 'Toggle Document Diagnostics' },
+    { '<leader>xl', '<cmd>Trouble loclist<cr>', desc = 'Toggle Loclist' },
+    { '<leader>xq', '<cmd>Trouble quickfix<cr>', desc = 'Toggle Quickfix' },
+    { 'gR', '<cmd>Trouble lsp_references<cr>', desc = 'Toggle LSP References' },
  },
  config = function()
    require('trouble').setup {
--- a/config/nvim/lua/plugins/ufo.lua
+++ b/config/nvim/lua/plugins/ufo.lua
@@ -1,3 +1,22 @@
+-- Not UFO in the sky, but an ultra fold in Neovim.
+-- https://github.com/kevinhwang91/nvim-ufo/
+
+-- fold_virt_text_handler
+-- This handler is called when the fold text is too long to fit in the window.
+-- It is expected to truncate the text and return a new list of virtual text.
+-- The handler is called with the following arguments:
+-- virtText: The current virtual text list.
+-- lnum: The line number of the first line in the fold.
+-- endLnum: The line number of the last line in the fold.
+-- width: The width of the window.
+--
+--@type function
+--@param virtText
+--@param lnum
+--@param endLnum
+--@param width
+--@param truncate
+--@return table
 local handler = function(virtText, lnum, endLnum, width, truncate)
  local newVirtText = {}
  local suffix = (' 󰁂 %d '):format(endLnum - lnum)
@@ -27,8 +46,6 @@ local handler = function(virtText, lnum, endLnum, width, truncate)
 end

 return {
-  -- Not UFO in the sky, but an ultra fold in Neovim.
-  -- https://github.com/kevinhwang91/nvim-ufo/
  {
    'kevinhwang91/nvim-ufo',
    lazy = false,
--- a/config/nvim/lua/plugins/ui.lua
+++ b/config/nvim/lua/plugins/ui.lua
@@ -72,6 +72,9 @@ return {
    enabled = true,
    lazy = false,
    version = '*',
+    keys = {
+      { '<leader>tc', '<cmd>CloakToggle<cr>', desc = '[tc] Toggle Cloak' },
+    },
    config = function()
      require('cloak').setup {
        enabled = true,
@@ -95,9 +98,6 @@ return {
        },
      }
    end,
-    keys = {
-      { '<leader>tc', '<cmd>CloakToggle<cr>', desc = '[tc] Toggle Cloak' },
-    },
  },
  -- Close buffer without messing up with the window.
  -- https://github.com/famiu/bufdelete.nvim
@@ -125,18 +125,6 @@ return {
  {
    'LudoPinelli/comment-box.nvim',
    opts = {},
-    init = function()
-      local wk = require 'which-key'
-
-      wk.add {
-        { '<leader>cb', group = 'CommentBox' },
-        { '<leader>cbb', '<Cmd>CBccbox<CR>', desc = 'CommentBox: Box Title' },
-        { '<leader>cbd', '<Cmd>CBd<CR>', desc = 'CommentBox: Remove a box' },
-        { '<leader>cbl', '<Cmd>CBline<CR>', desc = 'CommentBox: Simple Line' },
-        { '<leader>cbm', '<Cmd>CBllbox14<CR>', desc = 'CommentBox: Marked' },
-        { '<leader>cbt', '<Cmd>CBllline<CR>', desc = 'CommentBox: Titled Line' },
-      }
-    end,
  },
  -- Automatically expand width of the current window.
  -- Maximizes and restore it. And all this with nice animations!
--- a/config/nvim/lua/plugins/which-key.lua
+++ b/config/nvim/lua/plugins/which-key.lua
@@ -14,7 +14,14 @@ return {
    wk.setup()

    wk.add {
-      -- Groups
+      -- Better default experience
+      { '<space>', '<Nop>', mode = { 'n', 'v' } },
+
+      -- ╭─────────────────────────────────────────────────────────╮
+      -- │                       With leader                       │
+      -- ╰─────────────────────────────────────────────────────────╯
+
+      -- ── Buffer ──────────────────────────────────────────────────────────
      {
        '<leader>b',
        group = '[b] Buffer',
@@ -22,17 +29,54 @@ return {
          return require('which-key.extras').expand.buf()
        end,
      },
+      { '<leader>bk', ':blast<cr>', desc = 'Buffer: Last', mode = 'n' },
+      { '<leader>bj', ':bfirst<cr>', desc = 'Buffer: First', mode = 'n' },
+      { '<leader>bh', ':bprev<cr>', desc = 'Buffer: Prev', mode = 'n' },
+      { '<leader>bl', ':bnext<cr>', desc = 'Buffer: Next', mode = 'n' },
+      { '<leader>bd', ':Bdelete<cr>', desc = 'Buffer: Delete', mode = 'n' },
+      { '<leader>bw', ':Bwipeout<cr>', desc = 'Buffer: Wipeout', mode = 'n' },
+
+      -- ── Code ────────────────────────────────────────────────────────────
      { '<leader>c', group = '[c] Code' },
-      { '<leader>d', group = '[d] Document' },
+      -- ── Code: CommentBox ────────────────────────────────────────────────
+      { '<leader>cb', group = 'CommentBox' },
+      { '<leader>cbb', '<Cmd>CBccbox<CR>', desc = 'CommentBox: Box Title' },
+      { '<leader>cbd', '<Cmd>CBd<CR>', desc = 'CommentBox: Remove a box' },
+      { '<leader>cbl', '<Cmd>CBline<CR>', desc = 'CommentBox: Simple Line' },
+      { '<leader>cbm', '<Cmd>CBllbox14<CR>', desc = 'CommentBox: Marked' },
+      { '<leader>cbt', '<Cmd>CBllline<CR>', desc = 'CommentBox: Titled Line' },
+
+      { '<leader>d', group = '[d] DAP' },
+      -- See: lua/plugins/dap.lua
+
      { '<leader>g', group = '[g] Git' },
+      -- See: lua/plugins/git.lua
+
+      { '<leader>h', group = '[h] Harpoon' },
+      -- See: lua/plugins/harpoon.lua
+
      { '<leader>l', group = '[l] LSP' },
-      { '<leader>p', group = '[p] Project' },
+      -- See: lua/plugins/lsp.lua
+
+      -- ── Quit ────────────────────────────────────────────────────────────
      { '<leader>q', group = '[q] Quit' },
+      { '<leader>qf', ':q<CR>', desc = 'Quicker close split' },
+      { '<leader>qq', ':wq!<CR>', desc = 'Quit with force saving' },
+      { '<leader>qw', ':wq<CR>', desc = 'Write and quit' },
+
      { '<leader>s', group = '[s] Search' },
+      -- See: lua/plugins/telescope.lua
+
+      -- ── Toggle ──────────────────────────────────────────────────────────
      { '<leader>t', group = '[t] Toggle' },
+      { '<leader>tt', ':TransparentToggle<CR>', desc = 'Toggle Transparency' },
+      { '<leader>ts', ':noh<CR>', desc = 'Toggle Search Highlighting' },
+
      { '<leader>w', group = '[w] Workspace' },
-      { '<leader>x', group = '[z] Trouble' },
-      { '<leader>z', group = '[x] FZF & Harpoon' },
+      { '<leader>x', group = '[x] Trouble' },
+      { '<leader>z', group = '[z] FZF' },
+
+      -- ── Help ────────────────────────────────────────────────────────────
      { '<leader>?', group = '[?] Help' },
      {
        '<leader>?w',
@@ -41,8 +85,56 @@ return {
        end,
        desc = 'Buffer Local Keymaps (which-key)',
      },
-      -- Misc keybinds
+
+      -- ╭─────────────────────────────────────────────────────────╮
+      -- │                     Without leader                      │
+      -- ╰─────────────────────────────────────────────────────────╯
+      { 'y', group = 'Yank & Surround' },
+
+      -- ── Old habits ──────────────────────────────────────────────────────
+      { '<C-s>', ':w<CR>', desc = 'Save file' },
+
+      -- ── Text manipulation in visual mode ────────────────────────────────
+      { '>', '>gv', desc = 'Indent Right', mode = 'v' },
+      { '<', '<gv', desc = 'Indent Left', mode = 'v' },
+      { 'J', ":m '>+1<CR>gv=gv", desc = 'Move Block Down', mode = 'v' },
+      { 'K', ":m '<-2<CR>gv=gv", desc = 'Move Block Up', mode = 'v' },
+
+      -- ── Misc keybinds ───────────────────────────────────────────────────
      { 'QQ', ':q!<CR>', desc = 'Quit without saving' },
+      { 'WW', ':w!<CR>', desc = 'Force write to file' },
+      { 'ss', ':noh<CR>', desc = 'Clear Search Highlighting' },
+      { 'jj', '<Esc>', desc = 'Esc without touching esc in insert mode', mode = 'i' },
+
+      -- ── Splits ──────────────────────────────────────────────────────────
+      --  Use CTRL+<hjkl> to switch between windows in normal mode
+      --  See `:help wincmd` for a list of all window commands
+      { '<C-h>', '<C-w><C-h>', desc = 'Move focus to the left window' },
+      { '<C-l>', '<C-w><C-l>', desc = 'Move focus to the right window' },
+      { '<C-j>', '<C-w><C-j>', desc = 'Move focus to the lower window' },
+      { '<C-k>', '<C-w><C-k>', desc = 'Move focus to the upper window' },
+      --  Split resizing
+      { '<C-w>,', ':vertical resize -10<CR>', desc = 'V Resize -' },
+      { '<C-w>.', ':vertical resize +10<CR>', desc = 'V Resize +' },
+
+      -- ── Disable arrow keys in normal mode ───────────────────────────────
+      { '<left>', '<cmd>echo "Use h to move!!"<CR>' },
+      { '<right>', '<cmd>echo "Use l to move!!"<CR>' },
+      { '<up>', '<cmd>echo "Use k to move!!"<CR>' },
+      { '<down>', '<cmd>echo "Use j to move!!"<CR>' },
+
+      -- ── Terminal ────────────────────────────────────────────────────────
+      -- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
+      -- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
+      -- is not what someone will guess without a bit more experience.
+      --
+      -- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping
+      -- or just use <C-\><C-n> to exit terminal mode.
+      { '<Esc><Esc>', '<C-\\><C-n>', desc = 'Exit terminal mode', mode = 't' },
+
+      -- ── Search ──────────────────────────────────────────────────────────
+      -- :noh if you have search highlights
+      { '<Esc><Esc>', ':noh<CR>', desc = 'Clear search highlights' },
    }
  end,
 }
--- a/config/nvim/lua/spell/en.utf-8.add
+++ b/config/nvim/lua/spell/en.utf-8.add
--- a/docs/nvim-keybindings.md
+++ b/docs/nvim-keybindings.md
@@ -2,101 +2,98 @@

 ```txt

-n  <Space>zg   * :Rg<CR>
-                 FZF: search with rg (aka live grep).
-n  <Space>zm   * :Maps<CR>
-                 FZF: search mappings.
-n  <Space>zh   * :History<CR>
-                 FZF: search history of opened files
-n  <Space>zb   * :Buffers<CR>
-                 FZF: search open buffers.
-n  <Space>zt   * :Windows<CR>
-                 FZF: search open tabs.
-n  <Space>zc   * :Commands<CR>
-                 FZF: search commands.
-n  <Space>zf   * :FZF<Space>
-                 FZF: search for files in given path.
+n  <Space>/    * <Lua 380: ~/.config/nvim/lua/plugins/telescope.lua:82>
+                 [/] Fuzzily search in current buffer]
+n  <Space>hw   * <Lua 42: ~/.config/nvim/lua/plugins/harpoon.lua:40>
+                 Open harpoon window with telescope
+n  <Space>1    * <Lua 40: ~/.config/nvim/lua/plugins/harpoon.lua:68>
+                 harpoon to file 1
+n  <Space>hn   * <Lua 39: ~/.config/nvim/lua/plugins/harpoon.lua:61>
+                 harpoon to next file
+n  <Space>hp   * <Lua 38: ~/.config/nvim/lua/plugins/harpoon.lua:54>
+                 harpoon to previous file
+n  <Space>ha   * <Lua 37: ~/.config/nvim/lua/plugins/harpoon.lua:47>
+                 harpoon file
+n  <Space>5    * <Lua 36: ~/.config/nvim/lua/plugins/harpoon.lua:96>
+                 harpoon to file 5
+n  <Space>4    * <Lua 35: ~/.config/nvim/lua/plugins/harpoon.lua:89>
+                 harpoon to file 4
+n  <Space>3    * <Lua 34: ~/.config/nvim/lua/plugins/harpoon.lua:82>
+                 harpoon to file 3
+n  <Space>2    * <Lua 33: ~/.config/nvim/lua/plugins/harpoon.lua:75>
+                 harpoon to file 2
 n  <Space>tc   * <Cmd>CloakToggle<CR>
                 [tc] Toggle Cloak
-n  <Space>/    * <Lua 189: ~/.config/nvim/lua/plugins/telescope.lua:85>
-                 [/] Fuzzily search in current buffer]
-n  <Space>ht   * <Lua 267: ~/.config/nvim/lua/plugins/harpoon.lua:16>
-n  <Space>1    * <Lua 65: ~/.config/nvim/lua/plugins/harpoon.lua:68>
-                 harpoon to file 1
-n  <Space>xn   * <Lua 64: ~/.config/nvim/lua/plugins/harpoon.lua:61>
-                 harpoon to next file
-n  <Space>xN   * <Lua 63: ~/.config/nvim/lua/plugins/harpoon.lua:54>
-                 harpoon to previous file
-n  <Space>xa   * <Lua 136: ~/.config/nvim/lua/plugins/harpoon.lua:40>
-                 Open harpoon window
-n  <Space>5    * <Lua 61: ~/.config/nvim/lua/plugins/harpoon.lua:96>
-                 harpoon to file 5
-n  <Space>4    * <Lua 60: ~/.config/nvim/lua/plugins/harpoon.lua:89>
-                 harpoon to file 4
-n  <Space>3    * <Lua 59: ~/.config/nvim/lua/plugins/harpoon.lua:82>
-                 harpoon to file 3
-n  <Space>2    * <Lua 57: ~/.config/nvim/lua/plugins/harpoon.lua:75>
-                 harpoon to file 2
-n  <Space>gB   * :G blame<CR>
-n  <Space>gb   * :Telescope git_branches<CR>
-n  <Space>gP   * :Neogit push<CR>
-n  <Space>gp   * :Neogit pull<CR>
-n  <Space>gc   * :Neogit commit<CR>
-n  <Space>gs   * <Lua 121: ~/.local/share/nvim/lazy/neogit/lua/neogit.lua:151>
-n  <Space>e    * <Lua 96: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 NeoTree reveal
-n  <Space>ca   * <Lua 95: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Code Action
-n  <Space>wl   * <Lua 94: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Workspace List Folders
-n  <Space>wr   * <Lua 93: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Workspace Remove Folder
-n  <Space>wa   * <Lua 92: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Workspace Add Folder
-n  <Space>ws   * <Lua 91: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Workspace Symbols
-n  <Space>D    * <Lua 89: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Type Definition
-n  <Space>dq   * <Lua 87: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Diagnostic: Set loc list
-n  <Space>do   * <Lua 86: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Diagnostic: Open float
-n  <Space>cr   * <Lua 84: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Rename
-n  <Space>ds   * <Lua 83: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Document Symbols
-n  <Space>?s   * <Lua 78: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Space>xx   * <Cmd>Trouble<CR>
+                 Toggle Trouble
+n  <Space>xq   * <Cmd>Trouble quickfix<CR>
+                 Toggle Quickfix
+n  <Space>xl   * <Cmd>Trouble loclist<CR>
+                 Toggle Loclist
+n  <Space>xd   * <Cmd>Trouble document_diagnostics<CR>
+                 Toggle Document Diagnostics
+n  <Space>xw   * <Cmd>Trouble workspace_diagnostics<CR>
+                 Toggle Workspace Diagnostics
+n  <Space>?s   * <Cmd>Neoconf show<CR>
                 Neoconf: Show merged config
-n  <Space>?m   * <Lua 77: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Space>?m   * <Cmd>Neoconf lsp<CR>
                 Neoconf: Show merged LSP config
-n  <Space>?l   * <Lua 76: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Space>?l   * <Cmd>Neoconf local<CR>
                 Neoconf: Local
-n  <Space>?g   * <Lua 75: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Space>?g   * <Cmd>Neoconf global<CR>
                 Neoconf: Global
-n  <Space>?c   * <Lua 73: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Space>?c   * <Cmd>Neoconf<CR>
                 Neoconf: Open
-   <Space>f    * <Lua 37: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Space>wl   * <Cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>
+                 LSP: Workspace List Folders
+n  <Space>wr   * <Cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>
+                 LSP: Workspace Remove Folder
+n  <Space>wa   * <Cmd>lua vim.lsp.buf.add_workspace_folder()<CR>
+                 LSP: Workspace Add Folder
+n  <Space>ws   * <Cmd>lua require("telescope.builtin").lsp_dynamic_workspace_symbols()<CR>
+                 LSP: Workspace Symbols
+n  <Space>ds   * <Cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>
+                 LSP: Document Symbols
+n  <Space>D    * <Cmd>lua vim.lsp.buf.type_definition()<CR>
+                 LSP: Type Definition
+n  <Space>ca   * <Cmd>lua vim.lsp.buf.code_action()<CR>
+                 LSP: Code Action
+n  <Space>cr   * <Cmd>lua vim.lsp.buf.rename()<CR>
+                 LSP: Rename
+n  <Space>dq   * <Cmd>lua vim.diagnostic.setloclist()<CR>
+                 Diagnostic: Set loc list
+n  <Space>do   * <Cmd>lua vim.diagnostic.open_float()<CR>
+                 Diagnostic: Open float
+   <Space>cf   * <Lua 107: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
                 [f] Format buffer
-n  <Space>qq   * <Cmd>wq!<CR>
-                 [qq] Quickly Quit
-n  <Space>xe   * <Cmd>GoIfErr<CR>
-                 Go If Error
-v  <Space>     * <Nop>
-n  <Space>     * <Nop>
-n  <Space>qf   * :q<CR>
-                 Quicker close split
-n  <Space>bw     :Bwipeout<CR>
-                 Buffer: Wipeout
-n  <Space>bd     :Bdelete<CR>
-                 Buffer: Delete
-n  <Space>bl     :bnext<CR>
-                 Buffer: Next
-n  <Space>bh     :bprev<CR>
-                 Buffer: Prev
-n  <Space>bj     :bfirst<CR>
-                 Buffer: First
-n  <Space>bk     :blast<CR>
-                 Buffer: Last
+n  <Space>e    * <Lua 81: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 NeoTree reveal
+n  <Space>cg   * <Lua 50: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Generate annotations
+n  <Space>zm   * <Lua 49: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 FZF: search mappings.
+n  <Space>zh   * <Lua 48: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 FZF: search history of opened files
+n  <Space>zb   * <Lua 47: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 FZF: search open buffers.
+n  <Space>zt   * <Lua 46: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 FZF: search open tabs.
+n  <Space>zc   * <Lua 32: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 FZF: search commands.
+n  <Space>zf   * <Lua 31: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 FZF: search for files in given path.
+n  <Space>zg   * <Lua 25: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 FZF: search with rg (aka live grep).
+n  <Space>dc   * <Lua 45: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 DAP: Continue
+n  <Space>db   * <Lua 44: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 DAP: Toggle Breakpoint
+n  <Space>dt   * <Lua 43: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 DAP: Toggle UI
+n  <Space>ht   * <Lua 369: ~/.config/nvim/lua/plugins/harpoon.lua:16>
+                 Open Harpoon Quick menu
+n  <Space>dr   * <Lua 41: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 DAP: Reset
 x  #           * <Lua 7: vim/_defaults.lua:0>
                 :help v_#-default
 o  %             <Plug>(MatchitOperationForward)
@@ -108,17 +105,11 @@ x  *           * <Lua 3: vim/_defaults.lua:0>
                 :help v_star-default
 x  @           * mode() == 'V' ? ':normal! @'.getcharstr().'<CR>' : '@'
                 :help v_@-default
-n  B             ^
-n  E             $
-n  K           * <Lua 82: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  K           * <Cmd>lua vim.lsp.buf.hover()<CR>
                 LSP: Hover Documentation
-n  QQ            :q!<CR>
-                 Quickly Quit
 x  Q           * mode() == 'V' ? ':normal! @<C-R>=reg_recorded()<CR><CR>' : 'Q'
                 :help v_Q-default
 x  S             <Plug>VSurround
-n  WW            :w!<CR>
-                 Force write
 n  Y           * y$
                 :help Y-default
 o  [%            <Plug>(MatchitOperationMultiBackward)
@@ -135,36 +126,24 @@ x  a%            <Plug>(MatchitVisualTextObject)
 n  cS            <Plug>CSurround
 n  cs            <Plug>Csurround
 n  ds            <Plug>Dsurround
-n  dn          * <Lua 81: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Diagnostic: Goto Next
-n  dp          * <Lua 80: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  dp          * <Cmd>lua vim.diagnostic.goto_prev()<CR>
                 Diagnostic: Goto Prev
+n  dn          * <Cmd>lua vim.diagnostic.goto_next()<CR>
+                 Diagnostic: Goto Next
 o  g%            <Plug>(MatchitOperationBackward)
 x  g%            <Plug>(MatchitVisualBackward)
 n  g%            <Plug>(MatchitNormalBackward)
 x  gS            <Plug>VgSurround
-n  gP          * <Lua 265: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:132>
-                 Close preview windows
-n  gpr         * <Lua 264: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:114>
-                 Preview references
-n  gpD         * <Lua 263: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:105>
-                 Preview declaration
-n  gpi         * <Lua 262: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:91>
-                 Preview implementation
-n  gpt         * <Lua 261: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:77>
-                 Preview type definition
-n  gpd         * <Lua 259: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:63>
-                 Preview definition
 n  gR          * :RegexplainerToggle<CR>
                 Toggle Regexplainer
-n  gd          * <Lua 90: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Goto Definition
-n  gr          * <Lua 88: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Goto References
-n  gI          * <Lua 85: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 LSP: Goto Implementation
-n  gD          * <Lua 79: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  gD          * <Cmd>lua vim.lsp.buf.declaration()<CR>
                 LSP: Goto Declaration
+n  gd          * <Cmd>lua vim.lsp.buf.definition()<CR>
+                 LSP: Goto Definition
+n  gr          * <Cmd>lua require("telescope.builtin").lsp_references()<CR>
+                 LSP: Goto References
+n  gI          * <Cmd>lua vim.lsp.buf.implementation()<CR>
+                 LSP: Goto Implementation
 o  gc          * <Lua 13: vim/_defaults.lua:0>
                 Comment textobject
 n  gcc         * <Lua 12: vim/_defaults.lua:0>
@@ -178,12 +157,11 @@ x  gx          * <Lua 9: vim/_defaults.lua:0>
 n  gx          * <Lua 8: vim/_defaults.lua:0>
                 Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)
 n  j           * v:count == 0 ? 'gj' : 'j'
+                 Move down
 n  k           * v:count == 0 ? 'gk' : 'k'
-n  n           * <Lua 71: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Move up
+n  n           * <Lua 51: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
                 Twilight
-n  ss          * :noh<CR>
-n  tT          * :TransparentToggle<CR>
-                 Toggle Transparency
 n  ySS           <Plug>YSsurround
 n  ySs           <Plug>YSsurround
 n  yss           <Plug>Yssurround
@@ -202,59 +180,44 @@ x  <Plug>(MatchitVisualBackward) * :<C-U>call matchit#Match_wrapper('',0,'v')<CR
 x  <Plug>(MatchitVisualForward) * :<C-U>call matchit#Match_wrapper('',1,'v')<CR>:if col("''") != col("$") | exe ":normal! m'" | endif<CR>gv``
 n  <Plug>(MatchitNormalBackward) * :<C-U>call matchit#Match_wrapper('',0,'n')<CR>
 n  <Plug>(MatchitNormalForward) * :<C-U>call matchit#Match_wrapper('',1,'n')<CR>
+v  <Plug>VgSurround * :<C-U>call <SNR>27_opfunc(visualmode(),visualmode() ==# 'V' ? 0 : 1)<CR>
+v  <Plug>VSurround * :<C-U>call <SNR>27_opfunc(visualmode(),visualmode() ==# 'V' ? 1 : 0)<CR>
+n  <Plug>YSurround * <SNR>27_opfunc2('setup')
+n  <Plug>Ysurround * <SNR>27_opfunc('setup')
+n  <Plug>YSsurround * <SNR>27_opfunc2('setup').'_'
+n  <Plug>Yssurround * '^'.v:count1.<SNR>27_opfunc('setup').'g_'
+n  <Plug>CSurround * :<C-U>call <SNR>27_changesurround(1)<CR>
+n  <Plug>Csurround * :<C-U>call <SNR>27_changesurround()<CR>
+n  <Plug>Dsurround * :<C-U>call <SNR>27_dosurround(<SNR>27_inputtarget())<CR>
+n  <Plug>SurroundRepeat * .
+n  <C-L>       * :<C-U>TmuxNavigateRight<CR>
 n  <C-Bslash>  * :<C-U>TmuxNavigatePrevious<CR>
 n  <C-J>       * :<C-U>TmuxNavigateDown<CR>
-n  <C-L>       * :<C-U>TmuxNavigateRight<CR>
 n  <C-H>       * :<C-U>TmuxNavigateLeft<CR>
-v  <Plug>VgSurround * :<C-U>call <SNR>28_opfunc(visualmode(),visualmode() ==# 'V' ? 0 : 1)<CR>
-v  <Plug>VSurround * :<C-U>call <SNR>28_opfunc(visualmode(),visualmode() ==# 'V' ? 1 : 0)<CR>
-n  <Plug>YSurround * <SNR>28_opfunc2('setup')
-n  <Plug>Ysurround * <SNR>28_opfunc('setup')
-n  <Plug>YSsurround * <SNR>28_opfunc2('setup').'_'
-n  <Plug>Yssurround * '^'.v:count1.<SNR>28_opfunc('setup').'g_'
-n  <Plug>CSurround * :<C-U>call <SNR>28_changesurround(1)<CR>
-n  <Plug>Csurround * :<C-U>call <SNR>28_changesurround()<CR>
-n  <Plug>Dsurround * :<C-U>call <SNR>28_dosurround(<SNR>28_inputtarget())<CR>
-n  <Plug>SurroundRepeat * .
-n  <C-P>       * :Files<CR>
-                 FZF: search for files starting at current directory.
-o  <Plug>(fzf-maps-o) * <C-C>:<C-U>call fzf#vim#maps('o', 0)<CR>
-x  <Plug>(fzf-maps-x) * :<C-U>call fzf#vim#maps('x', 0)<CR>
-n  <Plug>(fzf-maps-n) * :<C-U>call fzf#vim#maps('n', 0)<CR>
-n  <Plug>(fzf-normal) * <Nop>
-n  <Plug>(fzf-insert) * i
-s  <Plug>luasnip-jump-prev * <Lua 292: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:57>
+n  <C-K>       * :<C-U>TmuxNavigateUp<CR>
+s  <Plug>luasnip-jump-prev * <Lua 283: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:57>
                 LuaSnip: Jump to the previous node
-s  <Plug>luasnip-jump-next * <Lua 291: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:54>
+s  <Plug>luasnip-jump-next * <Lua 282: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:54>
                 LuaSnip: Jump to the next node
-s  <Plug>luasnip-prev-choice * <Lua 290: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:51>
+s  <Plug>luasnip-prev-choice * <Lua 281: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:51>
                 LuaSnip: Change to the previous choice from the choiceNode
-s  <Plug>luasnip-next-choice * <Lua 289: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:48>
+s  <Plug>luasnip-next-choice * <Lua 280: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:48>
                 LuaSnip: Change to the next choice from the choiceNode
-s  <Plug>luasnip-expand-snippet * <Lua 288: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:45>
+s  <Plug>luasnip-expand-snippet * <Lua 279: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:45>
                 LuaSnip: Expand the current snippet
-s  <Plug>luasnip-expand-or-jump * <Lua 287: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:42>
+s  <Plug>luasnip-expand-or-jump * <Lua 278: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:42>
                 LuaSnip: Expand or jump in the current snippet
-   <Plug>luasnip-expand-repeat * <Lua 285: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:35>
+   <Plug>luasnip-expand-repeat * <Lua 276: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:35>
                 LuaSnip: Repeat last node expansion
-n  <Plug>luasnip-delete-check * <Lua 283: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:28>
+n  <Plug>luasnip-delete-check * <Lua 274: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:28>
                 LuaSnip: Removes current snippet from jumplist
 n  <Plug>PlenaryTestFile * :lua require('plenary.test_harness').test_file(vim.fn.expand("%:p"))<CR>
-n  <C-S>       * <Cmd>w<CR>
-                 Save file
-n  <C-K>       * :<C-U>TmuxNavigateUp<CR>
-n  <Down>      * <Cmd>echo "Use j to move!!"<CR>
-n  <Up>        * <Cmd>echo "Use k to move!!"<CR>
-n  <Right>     * <Cmd>echo "Use l to move!!"<CR>
-n  <Left>      * <Cmd>echo "Use h to move!!"<CR>
-n  <C-W>.      * :vertical resize +10<CR>
-                 V Resize +
-n  <C-W>,      * :vertical resize -10<CR>
-                 V Resize -
+n  <C-P>       * <Lua 26: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 FZF: search for files starting at current directory.
 n  <C-W><C-D>    <C-W>d
                 Show diagnostics under the cursor
 n  <C-W>d      * <Lua 16: vim/_defaults.lua:0>
                 Show diagnostics under the cursor
 ```

- Generated on Mon 23 Sep 2024 10:24:56 EEST
+- Generated on Wed 25 Sep 2024 14:52:25 EEST