feat(workflow): pre-commit autoupdate

.github/workflows/pre-commit-autoupdate.yml

@@ -0,0 +1,24 @@
+---
+name: Pre-commit autoupdate
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+jobs:
+  auto-update:
+    runs-on: self-hosted
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4.5.0
+      - run: pip install pre-commit
+      - run: pre-commit autoupdate
+      - uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: update/pre-commit-hooks
+          title: "chore: update pre-commit hooks"
+          commit-message: "chore: update pre-commit hooks"
+          body: Update versions of pre-commit hooks to latest version.

.gitignore

@@ -26,4 +26,6 @@ config/iterm2/AppSupport
 config/gnupg/S.*
 config/gnupg/s
 config/gnupg/private-keys-v1.d
+config/nvim/spell/*
+!config/nvim/spell/.gitkeep
 

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
         args: [--autofix, --no-sort-keys]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.41.0
+    rev: v0.42.0
     hooks:
       - id: markdownlint
         args: [-c, .markdownlint.yaml, --fix]
@@ -45,6 +45,6 @@ repos:
       - id: shfmt
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.1
+    rev: v1.7.2
     hooks:
       - id: actionlint

.stylua.toml

@@ -2,8 +2,8 @@ column_width = 120
 line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
-quote_style = "AutoPreferDouble"
+quote_style = "AutoPreferSingle"
-call_parentheses = "Always"
+call_parentheses = "None"
 collapse_simple_statement = "Always"
 
 [sort_requires]

base/tool-versions

@@ -1,18 +1,17 @@
-asdf-plugin-manager 1.3.1
+asdf-plugin-manager 1.4.0
-nodejs 22.8.0
+nodejs 22.9.0
 golang 1.23.1
 python 3.12.6
 ruby 3.3.4
 rust 1.81.0
 direnv 2.34.0
-eza 0.19.3
 fd 10.2.0
 1password-cli 2.30.0
 age 1.2.0
 bottom 0.10.2
 dotenv-linter 3.3.0
 editorconfig-checker 2.8.0
-github-cli 2.56.0
+github-cli 2.57.0
 hadolint 2.12.0
 kubectl 1.31.1
 pipx 1.7.1
@@ -20,12 +19,12 @@ pre-commit 3.8.0
 ripgrep 14.1.1
 shellcheck 0.10.0
 shfmt 3.9.0
-terragrunt 0.67.5
+terragrunt 0.67.10
 tf-summarize 0.3.10
 yamllint 1.35.1
 yq 4.44.3
 bats 1.11.0
 gitleaks 8.18.4
 delta 0.18.1
-lazygit 0.44.0
 sops 3.9.0
+eza system

base/zshrc

@@ -6,7 +6,7 @@
 
 export DOTFILES="$HOME/.dotfiles"
 LOCAL_SHARE="$HOME/.local/share"
-export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$LOCAL_SHARE/nvim-kickstart/mason/bin:$LOCAL_SHARE/bob/nvim-bin:$LOCAL_SHARE/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
+export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$LOCAL_SHARE/nvim/mason/bin:$LOCAL_SHARE/bob/nvim-bin:$LOCAL_SHARE/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
 export SHARED_SCRIPTS_SOURCED=0
 
 source "$DOTFILES/config/shared.sh"

config/asdf/cargo-packages

@@ -19,3 +19,5 @@ bob-nvim
 // bottom, btm - A cross-platform graphical process/system monitor with
 // a customizable interface and a multitude of features.
 bottom
+// A modern alternative to ls
+eza

config/asdf/golang-packages

@@ -17,3 +17,5 @@ github.com/charmbracelet/glow@v1.5.1
 github.com/rhysd/actionlint/cmd/actionlint@v1.7.1
 // Cleans up your $HOME from those pesky dotfiles
 github.com/doron-cohen/antidot@v0.6.3
+// FZF is a general-purpose command-line fuzzy finder.
+github.com/junegunn/fzf@latest

config/asdf/plugin-versions

@@ -5,7 +5,6 @@ bottom                https://github.com/carbonteq/asdf-btm.git
 direnv                https://github.com/asdf-community/asdf-direnv.git                    a2219c2
 dotenv-linter         https://github.com/wesleimp/asdf-dotenv-linter.git                   1369f53
 editorconfig-checker  https://github.com/gabitchov/asdf-editorconfig-checker.git           585c1d5
-eza                   https://github.com/lwiechec/asdf-eza.git                             eee3d59
 fd                    https://gitlab.com/wt0f/asdf-fd.git                                  17d56e0
 github-cli            https://github.com/bartlomiejdanek/asdf-github-cli.git               e0605b7
 golang                https://github.com/asdf-community/asdf-golang.git                    0e86b1d

config/homebrew/Brewfile

@@ -204,8 +204,6 @@ cask "font-open-sans"
 cask "font-roboto"
 cask "font-source-code-pro"
 cask "font-source-code-pro-for-powerline"
-cask "font-source-sans-pro"
-cask "font-source-serif-pro"
 # GIT client
 cask "fork"
 # HTTP and GraphQL Client

config/nvim/.editorconfig

@@ -9,3 +9,9 @@ insert_final_newline = true
 charset = utf-8
 indent_style = space
 indent_size = 2
+max_line_length = 120
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

config/nvim/.gitignore

@@ -0,0 +1,3 @@
+spell/*
+!spell/.gitkeep
+

config/nvim/.luarc.json

@@ -1,5 +0,0 @@
-{
-    "diagnostics.globals": [
-        "vim"
-    ]
-}

config/nvim/.neoconf.json

@@ -1,24 +0,0 @@
-{
-  "neodev": {
-    "library": {
-      "enabled": true,
-      "plugins": [
-        "nvim-lspconfig",
-        "lsp",
-        "completion",
-      ]
-    }
-  },
-  "neoconf": {
-    "plugins": {
-      "lua_ls": {
-        "enabled": true
-      },
-    }
-  },
-  "lspconfig": {
-    "lua_ls": {
-      "Lua.completion.callSnippet": "Replace",
-    },
-  }
-}

config/nvim/.stylua.toml

@@ -1,7 +1,11 @@
-column_width = 160
+column_width = 80
 line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
 quote_style = "AutoPreferSingle"
 call_parentheses = "None"
+collapse_simple_statement = "Always"
+
+[sort_requires]
+enabled = true
 

config/nvim/init.lua

@@ -1,11 +1,20 @@
--- vim: ts=2 sts=2 sw=2 et
+-- ╭─────────────────────────────────────────────────────────╮
+-- │            ivuorinen's Neovim configuration             │
+-- ╰─────────────────────────────────────────────────────────╯
 
--- Install lazylazy
+-- ── Install lazylazy ────────────────────────────────────────────────
 -- https://github.com/folke/lazy.nvim
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
   local lazyrepo = 'https://github.com/folke/lazy.nvim.git'
-  local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath }
+  local out = vim.fn.system {
+    'git',
+    'clone',
+    '--filter=blob:none',
+    '--branch=stable',
+    lazyrepo,
+    lazypath,
+  }
   if vim.v.shell_error ~= 0 then
     vim.api.nvim_echo({
       { 'Failed to clone lazy.nvim:\n', 'ErrorMsg' },
@@ -18,17 +27,35 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
-require 'options'
+-- ── Add ~/.local/bin to the PATH ────────────────────────────────────
-require 'keymaps'
+vim.fn.setenv(
+  'PATH',
+  vim.fn.expand '$HOME/.local/bin' .. ':' .. vim.fn.expand '$PATH'
+)
 
-require('lazy').setup {
+require 'options'
-  checker = {
+require 'autogroups'
-    -- Automatically check for updates
+
-    enabled = true,
+-- ── Load plugins ────────────────────────────────────────────────────
-    nofity = false,
+require('lazy').setup(
-  },
+  -- Automatically load plugins from lua/plugins
-  spec = {
+  'plugins',
-    -- Import plugins from `lua/plugins` directory
+  -- Lazy Configuration
-    { import = 'plugins' },
+  {
-  },
+    checker = {
-}
+      -- Automatically check for updates
+      enabled = true,
+      -- We don't want to be notified about updates
+      notify = false,
+    },
+    change_detection = {
+      -- No need to notify about changes
+      notify = false,
+    },
+    install = {
+      colorscheme = { vim.g.colors_theme },
+    },
+  }
+)
+
+-- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/autogroups.lua

@@ -0,0 +1,54 @@
+-- ╭─────────────────────────────────────────────────────────╮
+-- │                       Autogroups                        │
+-- ╰─────────────────────────────────────────────────────────╯
+
+local augroup = vim.api.nvim_create_augroup -- Create/get autocommand group
+local autocmd = vim.api.nvim_create_autocmd -- Create autocommand
+
+-- ── Highlight on yank ───────────────────────────────────────────────
+-- See `:help vim.highlight.on_yank()`
+autocmd('TextYankPost', {
+  callback = function() vim.highlight.on_yank() end,
+  group = augroup('YankHighlight', { clear = true }),
+  pattern = '*',
+})
+
+-- ── Windows to close with "q" ───────────────────────────────────────
+autocmd('FileType', {
+  group = augroup('close_with_q', { clear = true }),
+  pattern = {
+    'PlenaryTestPopup',
+    'checkhealth',
+    'dbout',
+    'gitsigns.blame',
+    'grug-far',
+    'help',
+    'lspinfo',
+    'man',
+    'neotest-output',
+    'neotest-output-panel',
+    'neotest-summary',
+    'notify',
+    'qf',
+    'spectre_panel',
+    'startuptime',
+    'tsplayground',
+  },
+  callback = function(event)
+    vim.bo[event.buf].buflisted = false
+    vim.keymap.set('n', 'q', '<cmd>close<cr>', {
+      buffer = event.buf,
+      silent = true,
+      desc = 'Quit buffer',
+    })
+  end,
+})
+
+-- ── make it easier to close man-files when opened inline ────────────
+autocmd('FileType', {
+  group = augroup('man_unlisted', { clear = true }),
+  pattern = { 'man' },
+  callback = function(event) vim.bo[event.buf].buflisted = false end,
+})
+
+-- vim: ts=2 sts=2 sw=2 et

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 = '*',
-})

config/nvim/lua/options.lua

@@ -1,16 +1,25 @@
+-- ╭─────────────────────────────────────────────────────────╮
+-- │              neovim configuration options               │
+-- ╰─────────────────────────────────────────────────────────╯
+-- See `:help vim.opt`
+-- For more options, you can see `:help option-list`
+
+-- Enables the experimental nvim 0.5 features
+vim.loader.enable()
+
+-- Map leader and local leader
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
--- Set to true if you have a Nerd Font installed and selected in the terminal
+-- Set the colorscheme and variants
-vim.g.have_nerd_font = true
+vim.g.colors_theme = 'tokyonight'
+vim.g.colors_variant_light = 'tokyonight-day'
+vim.g.colors_variant_dark = 'tokyonight-storm'
 
 -- Make sure editorconfig support is enabled
 vim.g.editorconfig = true
 
--- [[ Setting options ]]
+-- Enable line numbers and relative line numbers
--- See `:help vim.opt`
--- For more options, you can see `:help option-list`
-
 vim.opt.number = true
 vim.opt.relativenumber = true
 
@@ -22,10 +31,10 @@ vim.opt.showmode = false
 
 -- Sync clipboard between OS and Neovim.
 --  Schedule the setting after `UiEnter` because it can increase startup-time.
---  Remove this option if you want your OS clipboard to remain independent.
 --  See `:help 'clipboard'`
 vim.schedule(function()
-  vim.opt.clipboard = 'unnamedplus'
+  local c = vim.env.SSH_TTY and '' or 'unnamedplus'
+  vim.opt.clipboard = c
 end)
 
 vim.opt.breakindent = true -- Enable break indent
@@ -34,7 +43,8 @@ vim.opt.smartindent = true -- Insert indents automatically
 -- Save undo history
 vim.opt.undofile = true
 
--- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
+-- Case-insensitive searching UNLESS \C or one or
+-- more capital letters in the search term
 vim.opt.ignorecase = true
 vim.opt.smartcase = true
 
@@ -47,7 +57,7 @@ vim.wo.signcolumn = 'yes'
 
 -- Decrease mapped sequence wait time
 -- Displays which-key popup sooner
-vim.opt.timeoutlen = 300
+vim.opt.timeoutlen = 250
 
 -- Configure how new splits should be opened
 vim.opt.splitright = true
@@ -66,20 +76,56 @@ vim.opt.inccommand = 'split'
 vim.opt.cursorline = true
 
 -- Minimal number of screen lines to keep above and below the cursor.
-vim.opt.scrolloff = 10
+vim.opt.scrolloff = 15
-
--- Enable break indent
-vim.o.breakindent = true
-
--- Save undo history
-vim.o.undofile = true
 
 -- Set completeopt to have a better completion experience
 vim.o.completeopt = 'menuone,noselect'
+
 -- Fixes Notify opacity issues
 vim.o.termguicolors = true
 
 -- Set spell checking
 vim.o.spell = true
+vim.o.spelllang = 'en_us'
 
+-- Tree-sitter settings
 vim.g.loaded_perl_provider = 0
+vim.g.loaded_ruby_provider = 0
+
+-- kevinhwang91/nvim-ufo settings
+vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
+vim.o.foldcolumn = '1' -- '0' is not bad
+-- Using ufo provider need a large value, feel free to decrease the value
+vim.o.foldlevel = 99
+vim.o.foldlevelstart = 99
+vim.o.foldenable = true
+
+-- anuvyklack/windows.nvim settings
+vim.o.winwidth = 15
+vim.o.winminwidth = 10
+vim.o.equalalways = false
+
+-- folke/noice.nvim settings
+vim.g.noice_ignored_filetypes = {
+  'fugitiveblame',
+  'fugitive',
+  'gitcommit',
+  'noice',
+}
+
+-- ── 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 }
+)
+
+-- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/plugins/autoformat.lua

@@ -1,38 +0,0 @@
--- Autoformat
--- https://github.com/stevearc/conform.nvim
-return {
-  'stevearc/conform.nvim',
-  event = { 'BufWritePre' },
-  cmd = { 'ConformInfo' },
-  keys = {
-    {
-      '<leader>cf',
-      function()
-        require('conform').format { async = true, lsp_fallback = true }
-      end,
-      mode = '',
-      desc = '[f] Format buffer',
-    },
-  },
-  opts = {
-    notify_on_error = false,
-    format_on_save = function(bufnr)
-      -- Disable "format_on_save lsp_fallback" for languages that don't
-      -- have a well standardized coding style. You can add additional
-      -- languages here or re-enable it for the disabled ones.
-      local disable_filetypes = { c = true, cpp = true }
-      return {
-        timeout_ms = 500,
-        lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
-      }
-    end,
-    formatters_by_ft = {
-      lua = { 'stylua' },
-      -- Conform can also run multiple formatters sequentially
-      -- python = { "isort", "black" },
-      --
-      -- You can use 'stop_after_first' to run the first available formatter from the list
-      javascript = { 'prettierd', 'prettier', stop_after_first = true },
-    },
-  },
-}

config/nvim/lua/plugins/cmp.lua

@@ -1,29 +1,51 @@
+-- Auto completion
+-- https://github.com/hrsh7th/nvim-cmp
 return {
-  -- Autocompletion
-  -- https://github.com/hrsh7th/nvim-cmp
   {
     'hrsh7th/nvim-cmp',
+    lazy = false,
+    version = false, -- Use the latest version of the plugin
     event = 'InsertEnter',
     dependencies = {
       'hrsh7th/cmp-nvim-lsp',
-      'L3MON4D3/LuaSnip',
+
-      'saadparwaiz1/cmp_luasnip',
+      -- ── LuaSnip Dependencies ────────────────────────────────────────────
-      -- Adds other completion capabilities.
+      -- Snippet Engine for Neovim written in Lua.
-      --  nvim-cmp does not ship with all sources by default. They are split
+      -- https://github.com/L3MON4D3/LuaSnip
-      --  into multiple repos for maintenance purposes.
+      { 'L3MON4D3/LuaSnip', build = 'make install_jsregexp' },
-      'hrsh7th/cmp-nvim-lsp',
+      -- luasnip completion source for nvim-cmp
-      'hrsh7th/cmp-path',
+      -- https://github.com/saadparwaiz1/cmp_luasnip
-      'onsails/lspkind.nvim',
+      { 'saadparwaiz1/cmp_luasnip' },
+
+      -- ── Adds other completion capabilities. ─────────────────────────────
+      -- ── nvim-cmp does not ship with all sources by default.
+      -- ── They are split into multiple repos for maintenance purposes.
+      { 'hrsh7th/cmp-nvim-lsp' },
+      { 'hrsh7th/cmp-buffer' },
+      { 'hrsh7th/cmp-path' },
+      -- cmp import and use all environment variables from .env.* and system
+      -- https://github.com/SergioRibera/cmp-dotenv
+      { 'SergioRibera/cmp-dotenv' },
+
+      -- ── Other deps ──────────────────────────────────────────────────────
+      -- vscode-like pictograms for neovim lsp completion items
+      -- https://github.com/onsails/lspkind.nvim
+      { 'onsails/lspkind.nvim' },
+      -- Lua plugin to turn github copilot into a cmp source
+      -- https://github.com/zbirenbaum/copilot-cmp
       {
         'zbirenbaum/copilot-cmp',
         dependencies = {
+          -- Fully featured & enhanced replacement for copilot.vim complete
+          -- with API for interacting with Github Copilot
+          -- https://github.com/zbirenbaum/copilot.lua
           {
             'zbirenbaum/copilot.lua',
             cmd = 'Copilot',
             build = ':Copilot setup',
             event = { 'InsertEnter', 'LspAttach' },
-            fix_pairs = true,
             opts = {
+              fix_pairs = true,
               suggestion = { enabled = false },
               panel = { enabled = false },
               filetypes = {
@@ -31,11 +53,9 @@ return {
                 help = true,
               },
             },
-          }
+          },
         },
-        config = function()
+        config = function() require('copilot_cmp').setup() end,
-          require('copilot_cmp').setup()
-        end,
       },
     },
     config = function()
@@ -43,25 +63,42 @@ return {
       local luasnip = require 'luasnip'
       local lspkind = require 'lspkind'
       luasnip.config.setup {}
+      require('copilot_cmp').setup()
+
+      local has_words_before = function()
+        if vim.api.nvim_get_option_value('buftype', {}) == 'prompt' then
+          return false
+        end
+        local line, col = table.unpack(vim.api.nvim_win_get_cursor(0))
+        return col ~= 0
+          and vim.api
+              .nvim_buf_get_text(0, line - 1, 0, line - 1, col, {})[1]
+              :match '^%s*$'
+            == nil
+      end
 
       cmp.setup {
         formatting = {
           format = lspkind.cmp_format {
             mode = 'symbol',
-            min_width = 40,
+            max_width = function() return math.floor(0.45 * vim.o.columns) end,
-            max_width = 100,
+            show_labelDetails = true,
             symbol_map = {
-              Copilot = ''
+              Copilot = '',
+              Text = '',
+              Constructor = '',
             },
           },
         },
         view = {
-          entries = 'native',
+          width = function(_, _) return math.min(80, vim.o.columns) end,
+          entries = {
+            name = 'custom',
+            selection_order = 'near_cursor',
+          },
         },
         snippet = {
-          expand = function(args)
+          expand = function(args) luasnip.lsp_expand(args.body) end,
-            luasnip.lsp_expand(args.body)
-          end,
         },
         mapping = cmp.mapping.preset.insert {
           ['<C-d>'] = cmp.mapping.scroll_docs(-4),
@@ -69,14 +106,14 @@ return {
           -- Manually trigger a completion from nvim-cmp.
           --  Generally you don't need this, because nvim-cmp will display
           --  completions whenever it has completion options available.
-          ['<C-Space>'] = cmp.mapping.complete(),
+          ['<C-c>'] = cmp.mapping.complete(),
           ['<CR>'] = cmp.mapping.confirm {
             behavior = cmp.ConfirmBehavior.Replace,
             select = true,
           },
           ['<Tab>'] = cmp.mapping(function(fallback)
-            if cmp.visible() then
+            if cmp.visible() and has_words_before() then
-              cmp.select_next_item()
+              cmp.select_next_item { behavior = cmp.SelectBehavior.Select }
             elseif luasnip.expand_or_jumpable() then
               luasnip.expand_or_jump()
             else
@@ -100,6 +137,26 @@ return {
           { name = 'nvim_lsp', group_index = 2 },
           { name = 'path', group_index = 2 },
           { name = 'luasnip', group_index = 2 },
+          { name = 'buffer', group_index = 2 },
+          { name = 'dotenv', group_index = 2 },
+        },
+        sorting = {
+          priority_weight = 2,
+          comparators = {
+            require('copilot_cmp.comparators').prioritize,
+
+            -- Below is the default comparator list and order for nvim-cmp
+            cmp.config.compare.offset,
+            -- cmp.config.compare.scopes, --this is commented in nvim-cmp too
+            cmp.config.compare.exact,
+            cmp.config.compare.score,
+            cmp.config.compare.recently_used,
+            cmp.config.compare.locality,
+            cmp.config.compare.kind,
+            cmp.config.compare.sort_text,
+            cmp.config.compare.length,
+            cmp.config.compare.order,
+          },
         },
       }
     end,

config/nvim/lua/plugins/dap.lua

@@ -9,22 +9,17 @@ return {
       'ray-x/guihua.lua',
       'leoluz/nvim-dap-go',
     },
-    keys = {
-      { '<leader>dt', '<cmd>DapUiToggle', desc = 'DAP: Toggle UI' },
-      { '<leader>db', '<cmd>DapToggleBreakpoint', desc = 'DAP: Toggle Breakpoint' },
-      { '<leader>dc', '<cmd>DapContinue', desc = 'DAP: Continue' },
-      { '<leader>dr', ":lua require('dapui').open({reset = true})<CR>", desc = 'DAP: Reset' },
-      { '<leader>ht', ":lua require('harpoon.ui').toggle_quick_menu()<CR>", desc = 'DAP: Harpoon UI' },
-    },
     setup = function()
       require('dapui').setup()
       require('dap-go').setup()
-      require('nvim-dap-virtual-text').setup()
+      require('nvim-dap-virtual-text').setup {}
 
-      vim.fn.sign_define(
+      vim.fn.sign_define('DapBreakpoint', {
-        'DapBreakpoint',
+        text = '🔴',
-        { text = '🔴', texthl = 'DapBreakpoint', linehl = 'DapBreakpoint', numhl = 'DapBreakpoint' }
+        texthl = 'DapBreakpoint',
-      )
+        linehl = 'DapBreakpoint',
+        numhl = 'DapBreakpoint',
+      })
     end,
   },
 }

config/nvim/lua/plugins/fzf.lua

@@ -1,32 +0,0 @@
-return {
-  -- fzf <3 vim
-  -- https://github.com/junegunn/fzf.vim
-  'junegunn/fzf.vim',
-  dependencies = {
-    { 'junegunn/fzf', run = ':call fzf#install()' },
-  },
-  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.' },
-    -- 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.' },
-    { '<Leader>zt', ':Tags<CR>', desc = 'FZF: search in tags file' },
-    { '<Leader>zb', ':Buffers<CR>', desc = 'FZF: search open buffers.' },
-    -- Ref: https://medium.com/@paulodiovani/vim-buffers-windows-and-tabs-an-overview-8e2a57c57afa
-    { '<Leader>zt', ':Windows<CR>', desc = 'FZF: search open tabs.' },
-    { '<Leader>zh', ':History<CR>', desc = 'FZF: search history of opened files' },
-    { '<Leader>zm', ':Maps<CR>', desc = 'FZF: search mappings.' },
-    { '<Leader>zg', ':Rg<CR>', desc = 'FZF: search with rg (aka live grep).' },
-  },
-  config = function()
-    -- To ignore a certain path in a git project from both RG and FD used by FZF,
-    -- the eaiest way is to create ignore files and exclude the in local git clone.
-    -- Ref: https://stackoverflow.com/a/1753078/265508
-    -- $ cd git_proj/
-    -- $ echo "path/to/exclude" > .rgignore
-    -- $ echo "path/to/exclude" > .fdignore
-    -- $ printf ".rgignore\n.fdignore" >> .git/info/exclude
-  end,
-}

config/nvim/lua/plugins/git.lua

@@ -1,49 +0,0 @@
-return {
-  -- Git integration for buffers
-  -- https://github.com/lewis6991/gitsigns.nvim
-  {
-    'lewis6991/gitsigns.nvim',
-    config = function()
-      require('gitsigns').setup {
-        signs = {
-          add = { text = '+' },
-          change = { text = '~' },
-          delete = { text = '_' },
-          topdelete = { text = '‾' },
-          changedelete = { text = '~' },
-        },
-        current_line_blame = false,
-        on_attach = function(bufnr)
-          local gs = require 'gitsigns'
-
-          local function map(mode, l, r, opts)
-            opts = opts or {}
-            opts.buffer = bufnr
-            vim.keymap.set(mode, l, r, opts)
-          end
-
-          -- Navigation
-          map('n', 'gn', function()
-            if vim.wo.diff then
-              return ']c'
-            end
-            vim.schedule(function()
-              gs.next_hunk()
-            end)
-            return '<Ignore>'
-          end, { expr = true })
-
-          map('n', 'gp', function()
-            if vim.wo.diff then
-              return '[c'
-            end
-            vim.schedule(function()
-              gs.prev_hunk()
-            end)
-            return '<Ignore>'
-          end, { expr = true })
-        end,
-      }
-    end,
-  },
-}

config/nvim/lua/plugins/goto-preview.lua

@@ -1,37 +1,30 @@
+-- A small Neovim plugin for previewing definitions using floating windows.
+-- https://github.com/rmagatti/goto-preview
 return {
-  -- A small Neovim plugin for previewing definitions using floating windows.
-  -- https://github.com/rmagatti/goto-preview
   'rmagatti/goto-preview',
   dependencies = {
     { 'nvim-telescope/telescope.nvim' },
   },
-  keys = {
+  opts = {
-    { 'n', 'gpd', '<cmd>lua require("goto-preview").goto_preview_definition()<CR>' },
+    width = 120, -- Width of the floating window
-    { 'n', 'gpi', '<cmd>lua require("goto-preview").goto_preview_implementation()<CR>' },
+    height = 15, -- Height of the floating window
-    { 'n', 'gP', '<cmd>lua require("goto-preview").close_all_windows()<CR>' },
+    border = { '↖', '─', '┐', '│', '┘', '─', '└', '│' }, -- Border characters of the floating window
-  },
+    default_mappings = true,
-  config = function()
+    debug = false, -- Print debug information
-    require('goto-preview').setup {
+    opacity = nil, -- 0-100 opacity level of the floating window where 100 is fully transparent.
-      width = 120, -- Width of the floating window
+    resizing_mappings = false, -- Binds arrow keys to resizing the floating window.
-      height = 15, -- Height of the floating window
+    post_open_hook = nil, -- A function taking two arguments, a buffer and a window to be ran as a hook.
-      border = { '↖', '─', '┐', '│', '┘', '─', '└', '│' }, -- Border characters of the floating window
+    references = { -- Configure the telescope UI for slowing the references cycling window.
-      default_mappings = true,
+      telescope = require('telescope.themes').get_dropdown {
-      debug = false, -- Print debug information
+        hide_preview = false,
-      opacity = nil, -- 0-100 opacity level of the floating window where 100 is fully transparent.
-      resizing_mappings = false, -- Binds arrow keys to resizing the floating window.
-      post_open_hook = nil, -- A function taking two arguments, a buffer and a window to be ran as a hook.
-      references = { -- Configure the telescope UI for slowing the references cycling window.
-        telescope = require('telescope.themes').get_dropdown {
-          hide_preview = false,
-        },
       },
-      -- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality.
+    },
-      focus_on_open = true, -- Focus the floating window when opening it.
+    -- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality.
-      dismiss_on_move = false, -- Dismiss the floating window when moving the cursor.
+    focus_on_open = true, -- Focus the floating window when opening it.
-      force_close = true, -- passed into vim.api.nvim_win_close's second argument. See :h nvim_win_close
+    dismiss_on_move = false, -- Dismiss the floating window when moving the cursor.
-      bufhidden = 'wipe', -- the bufhidden option to set on the floating window. See :h bufhidden
+    force_close = true, -- passed into vim.api.nvim_win_close's second argument. See :h nvim_win_close
-      stack_floating_preview_windows = true, -- Whether to nest floating windows
+    bufhidden = 'wipe', -- the bufhidden option to set on the floating window. See :h bufhidden
-      preview_window_title = { enable = true, position = 'left' },
+    stack_floating_preview_windows = true, -- Whether to nest floating windows
-    }
+    preview_window_title = { enable = true, position = 'left' },
-  end,
+  },
 }

config/nvim/lua/plugins/harpoon.lua

@@ -1,103 +0,0 @@
-return {
-  -- Getting you where you want with the fewest keystrokes.
-  -- https://github.com/ThePrimeagen/harpoon
-  {
-    'ThePrimeagen/harpoon',
-    branch = 'harpoon2',
-    dependencies = {
-      'nvim-lua/plenary.nvim',
-      'nvim-telescope/telescope.nvim',
-    },
-    config = function()
-      local harpoon = require 'harpoon'
-
-      harpoon:setup {}
-
-      vim.keymap.set('n', '<leader>ht', function()
-        harpoon.ui:toggle_quick_menu(harpoon:list())
-      end)
-
-      -- basic telescope configuration
-      local conf = require('telescope.config').values
-      local function toggle_telescope(harpoon_files)
-        local file_paths = {}
-        for _, item in ipairs(harpoon_files.items) do
-          table.insert(file_paths, item.value)
-        end
-
-        require('telescope.pickers')
-          .new({}, {
-            prompt_title = 'Harpoon',
-            finder = require('telescope.finders').new_table {
-              results = file_paths,
-            },
-            previewer = conf.file_previewer {},
-            sorter = conf.generic_sorter {},
-          })
-          :find()
-      end
-
-      vim.keymap.set('n', '<leader>xa', function()
-        toggle_telescope(harpoon:list())
-      end, { desc = 'Open harpoon window' })
-    end,
-    keys = {
-      {
-        '<leader>xa',
-        function()
-          require('harpoon'):list():add()
-        end,
-        desc = 'harpoon file',
-      },
-      {
-        '<leader>xN',
-        function()
-          require('harpoon'):list():prev()
-        end,
-        desc = 'harpoon to previous file',
-      },
-      {
-        '<leader>xn',
-        function()
-          require('harpoon'):list():next()
-        end,
-        desc = 'harpoon to next file',
-      },
-      {
-        '<leader>1',
-        function()
-          require('harpoon'):list():select(1)
-        end,
-        desc = 'harpoon to file 1',
-      },
-      {
-        '<leader>2',
-        function()
-          require('harpoon'):list():select(2)
-        end,
-        desc = 'harpoon to file 2',
-      },
-      {
-        '<leader>3',
-        function()
-          require('harpoon'):list():select(3)
-        end,
-        desc = 'harpoon to file 3',
-      },
-      {
-        '<leader>4',
-        function()
-          require('harpoon'):list():select(4)
-        end,
-        desc = 'harpoon to file 4',
-      },
-      {
-        '<leader>5',
-        function()
-          require('harpoon'):list():select(5)
-        end,
-        desc = 'harpoon to file 5',
-      },
-    },
-  },
-}

config/nvim/lua/plugins/lazy.lua

@@ -1,51 +1,58 @@
 return {
-  -- vscode-like pictograms for neovim lsp completion items
-  -- https://github.com/onsails/lspkind-nvim
-  { 'onsails/lspkind.nvim' },
 
-  -- Rethinking Vim as a tool for writing
+  -- A better annotation generator.
-  -- https://github.com/preservim/vim-pencil
+  -- Supports multiple languages and annotation conventions.
-  { 'preservim/vim-pencil' },
+  -- https://github.com/danymat/neogen
+  {
+    'danymat/neogen',
+    version = '*',
+    opts = { enabled = true, snippet_engine = 'luasnip' },
+  },
 
-  -- obsession.vim: continuously updated session files
+  -- The Refactoring library based off the Refactoring book by Martin Fowler
-  -- https://github.com/tpope/vim-obsession
+  -- https://github.com/ThePrimeagen/refactoring.nvim
-  { 'tpope/vim-obsession' },
+  {
+    'ThePrimeagen/refactoring.nvim',
+    version = '*',
+    dependencies = { 'nvim-lua/plenary.nvim', 'nvim-treesitter/nvim-treesitter' },
+    opts = {},
+  },
 
-  -- surround.vim: Delete/change/add parentheses/quotes/XML-tags/much more with ease
+  -- All the npm/yarn/pnpm commands I don't want to type
-  -- https://github.com/tpope/vim-surround
+  -- https://github.com/vuki656/package-info.nvim
-  { 'tpope/vim-surround' },
+  {
+    'vuki656/package-info.nvim',
+    version = '*',
+    dependencies = { 'MunifTanjim/nui.nvim' },
+    opts = {},
+  },
+
+  -- Add/change/delete surrounding delimiter pairs with ease. Written with ❤️ in Lua.
+  -- https://github.com/kylechui/nvim-surround
+  {
+    'kylechui/nvim-surround',
+    version = '*',
+    event = 'VeryLazy',
+    opts = {},
+  },
 
   -- Highlight, list and search todo comments in your projects
   -- https://github.com/folke/todo-comments.nvim
   {
     'folke/todo-comments.nvim',
-    dependencies = 'nvim-lua/plenary.nvim',
+    version = '*',
-    config = function()
+    dependencies = { 'nvim-lua/plenary.nvim' },
-      require('todo-comments').setup {}
-    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
-  {
-    'lukas-reineke/indent-blankline.nvim',
-    main = 'ibl',
     opts = {},
   },
 
   -- Commenting
+  -- "gc" to comment visual regions/lines
   -- https://github.com/numToStr/Comment.nvim
   {
-    'numToStr/Comment.nvim', -- "gc" to comment visual regions/lines
+    'numToStr/Comment.nvim',
+    version = '*',
     event = { 'BufRead', 'BufNewFile' },
-    config = function()
+    opts = {},
-      require('Comment').setup()
-    end,
   },
 
   -- Detect tabstop and shiftwidth automatically

config/nvim/lua/plugins/lint.lua

@@ -1,55 +0,0 @@
-return {
-
-  { -- Linting
-    'mfussenegger/nvim-lint',
-    event = { 'BufReadPre', 'BufNewFile' },
-    config = function()
-      local lint = require 'lint'
-      lint.linters_by_ft = {
-        markdown = { 'markdownlint' },
-      }
-
-      -- To allow other plugins to add linters to require('lint').linters_by_ft,
-      -- instead set linters_by_ft like this:
-      -- lint.linters_by_ft = lint.linters_by_ft or {}
-      -- lint.linters_by_ft['markdown'] = { 'markdownlint' }
-      --
-      -- However, note that this will enable a set of default linters,
-      -- which will cause errors unless these tools are available:
-      -- {
-      --   clojure = { "clj-kondo" },
-      --   dockerfile = { "hadolint" },
-      --   inko = { "inko" },
-      --   janet = { "janet" },
-      --   json = { "jsonlint" },
-      --   markdown = { "vale" },
-      --   rst = { "vale" },
-      --   ruby = { "ruby" },
-      --   terraform = { "tflint" },
-      --   text = { "vale" }
-      -- }
-      --
-      -- You can disable the default linters by setting their filetypes to nil:
-      -- lint.linters_by_ft['clojure'] = nil
-      -- lint.linters_by_ft['dockerfile'] = nil
-      -- lint.linters_by_ft['inko'] = nil
-      -- lint.linters_by_ft['janet'] = nil
-      -- lint.linters_by_ft['json'] = nil
-      -- lint.linters_by_ft['markdown'] = nil
-      -- lint.linters_by_ft['rst'] = nil
-      -- lint.linters_by_ft['ruby'] = nil
-      -- lint.linters_by_ft['terraform'] = nil
-      -- lint.linters_by_ft['text'] = nil
-
-      -- Create autocommand which carries out the actual linting
-      -- on the specified events.
-      local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
-      vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
-        group = lint_augroup,
-        callback = function()
-          lint.try_lint()
-        end,
-      })
-    end,
-  },
-}

config/nvim/lua/plugins/lsp.lua

@@ -1,146 +1,192 @@
--- Quickstart configs for Nvim LSP
+-- Quick start 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 = {
+      -- ── Mason and LSPConfig integration ─────────────────────────────────
       -- Automatically install LSPs to stdpath for neovim
-      'williamboman/mason.nvim',
+
-      'williamboman/mason-lspconfig.nvim',
+      -- Portable package manager for Neovim that runs everywhere Neovim runs.
-      'WhoIsSethDaniel/mason-tool-installer.nvim',
+      -- Easily install and manage LSP servers, DAP servers, linters, and formatters.
-      -- Useful status updates for LSP
+      -- https://github.com/williamboman/mason.nvim
       {
-        'j-hui/fidget.nvim',
+        'williamboman/mason.nvim',
-        opts = {
+        cmd = 'Mason',
-          notification = {
+        run = ':MasonUpdate',
-            window = {
+      },
-              winblend = 50,
+      -- Extension to mason.nvim that makes it easier to use lspconfig with mason.nvim.
-              align = 'top',
+      -- https://github.com/williamboman/mason-lspconfig.nvim
+      { 'williamboman/mason-lspconfig.nvim' },
+
+      -- ── Formatting ──────────────────────────────────────────────────────
+      -- Lightweight yet powerful formatter plugin for Neovim
+      -- https://github.com/stevearc/conform.nvim
+      {
+        'stevearc/conform.nvim',
+        event = { 'BufWritePre' },
+        cmd = { 'ConformInfo' },
+        config = function()
+          -- Select first conform formatter that is available
+          ---@param bufnr integer
+          ---@param ... string
+          ---@return string
+          local function first(bufnr, ...)
+            local conform = require 'conform'
+            for i = 1, select('#', ...) do
+              local formatter = select(i, ...)
+              if conform.get_formatter_info(formatter, bufnr).available then
+                return formatter
+              end
+            end
+            return select(1, ...)
+          end
+
+          require('conform').setup {
+            -- Enable or disable logging
+            notify_on_error = true,
+            -- Set the default formatter for all filetypes
+            default_formatter = 'injected',
+            -- Set the default formatter for all filetypes
+            default_formatter_opts = {
+              lsp_format = 'fallback',
+              -- Set the default formatter for all filetypes
+              -- formatter = 'injected',
+              -- Set the default formatter for all filetypes
+              -- formatter_opts = {},
             },
-          },
+            formatters_by_ft = {
-        },
+              markdown = function(bufnr)
+                return { first(bufnr, 'prettierd', 'prettier'), 'injected' }
+              end,
+              javascript = function(bufnr)
+                return { first(bufnr, 'prettier', 'eslint'), 'injected' }
+              end,
+              lua = { 'stylua' },
+              -- Conform will run multiple formatters sequentially
+              -- python = { 'isort', 'black', lsp_format = 'fallback' },
+              -- You can customize some of the format options for the filetype (:help conform.format)
+              -- rust = { 'rustfmt', lsp_format = 'fallback' },
+            },
+            format_on_save = function(bufnr)
+              -- Disable autoformat on certain filetypes
+              local ignore_filetypes = {
+                'c',
+                'cpp',
+                'sql',
+                'java',
+              }
+              if vim.tbl_contains(ignore_filetypes, vim.bo[bufnr].filetype) then
+                return
+              end
+              -- Disable with a global or buffer-local variable
+              if
+                vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat
+              then
+                return
+              end
+              -- Disable autoformat for files in a certain path
+              local bufname = vim.api.nvim_buf_get_name(bufnr)
+              if bufname:match '/node_modules/' then return end
+              if bufname:match '/vendor/' then return end
+              if bufname:match '/dist/' then return end
+              if bufname:match '/build/' then return end
+
+              return { timeout_ms = 500, lsp_format = 'fallback' }
+            end,
+          }
+        end,
+        init = function()
+          -- If you want the formatexpr, here is the place to set it
+          vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
+        end,
       },
-      'b0o/schemastore.nvim',
+
-      {
+      -- ── Misc ────────────────────────────────────────────────────────────
-        -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+      -- vscode-like pictograms for neovim lsp completion items
-        -- used for completion, annotations and signatures of Neovim apis
+      -- https://github.com/onsails/lspkind-nvim
-        'folke/lazydev.nvim',
+      { 'onsails/lspkind.nvim' },
-        dependencies = {
+      -- JSON schemas for Neovim
-          -- `wezterm-types` provides types for the Wezterm terminal
+      -- https://github.com/b0o/SchemaStore.nvim
-          {
+      { 'b0o/schemastore.nvim' },
-            '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',
-    },
-    keys = {
-      { '<leader>do', '<cmd>lua vim.diagnostic.open_float()<CR>', desc = 'Diagnostic: Open float' },
-      { '<leader>dq', '<cmd>lua vim.diagnostic.setloclist()<CR>', desc = 'Diagnostic: Set loc list' },
-      { 'dn', '<cmd>lua vim.diagnostic.goto_next()<CR>', desc = 'Diagnostic: Goto Next' },
-      { 'dp', '<cmd>lua vim.diagnostic.goto_prev()<CR>', desc = 'Diagnostic: Goto Prev' },
-      { '<leader>cr', '<cmd>lua vim.lsp.buf.rename()<CR>', desc = 'LSP: Rename' },
-      { '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', desc = 'LSP: Code Action' },
-      { 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', desc = 'LSP: Goto Definition' },
-      { 'gr', '<cmd>lua require("telescope.builtin").lsp_references()<CR>', desc = 'LSP: Goto References' },
-      { 'gI', '<cmd>lua vim.lsp.buf.implementation()<CR>', desc = 'LSP: Goto Implementation' },
-      { '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', desc = 'LSP: Type Definition' },
-      { '<leader>ds', '<cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>', desc = 'LSP: Document Symbols' },
-      { '<leader>ws', '<cmd>lua require("telescope.builtin").lsp_dynamic_workspace_symbols()<CR>', desc = 'LSP: Workspace Symbols' },
-      { 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', desc = 'LSP: Hover Documentation' },
-      { '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', desc = 'LSP: Signature Documentation' },
-      { 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', desc = 'LSP: Goto Declaration' },
-      { '<leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', desc = 'LSP: Workspace Add Folder' },
-      { '<leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', desc = 'LSP: Workspace Remove Folder' },
-      { '<leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', desc = 'LSP: Workspace List Folders' },
     },
     config = function()
-      -- LSP settings.
+      -- ── LSP settings. ───────────────────────────────────────────────────
       --  This function gets run when an LSP connects to a particular buffer.
+
+      -- Make runtime files discoverable to the server
+      local runtime_path = vim.split(package.path, ';')
+      table.insert(runtime_path, 'lua/?.lua')
+      table.insert(runtime_path, 'lua/?/init.lua')
+
+      -- Generate a command `:Format` local to the LSP buffer
+      --
+      ---@param _     nil    Skipped
+      ---@param bufnr number Buffer number
+      ---@output nil
       local on_attach = function(_, bufnr)
         -- Create a command `:Format` local to the LSP buffer
-        vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
+        vim.api.nvim_create_user_command('Format', function(args)
-          if vim.lsp.buf.format then
+          local range = nil
-            vim.lsp.buf.format()
+          if args.count ~= -1 then
-          elseif vim.lsp.buf.formatting then
+            local end_line = vim.api.nvim_buf_get_lines(
-            vim.lsp.buf.formatting()
+              bufnr,
+              args.line2 - 1,
+              args.line2,
+              true
+            )[1]
+            range = {
+              start = { args.line1, 0 },
+              ['end'] = { args.line2, end_line:len() },
+            }
           end
-        end, { desc = 'Format current buffer with LSP' })
+          require('conform').format {
+            async = true,
+            lsp_format = 'fallback',
+            range = range,
+          }
+        end, { range = true, desc = 'Format current buffer with LSP' })
       end
 
-      -- Setup mason so it can manage external tooling
+      -- ── Enable the following language servers ───────────────────────────
-      require('mason').setup()
+      -- :help lspconfig-all for all pre-configured LSPs
-
-      -- Enable the following language servers
-      -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
       local servers = {
-        -- :help lspconfig-all for all pre-configured LSPs
-        ast_grep = {},
-
-        actionlint = {}, -- GitHub Actions
-        ansiblels = {}, -- Ansible
         bashls = {}, -- Bash
-        css_variables = {}, -- CSS
+        -- csharp_ls = {}, -- C#, requires dotnet executable
-        cssls = {}, -- CSS
-        docker_compose_language_service = {}, -- Docker compose
-        dockerls = {}, -- Docker
-        eslint = {}, -- ESLint
-        gitlab_ci_ls = {}, -- GitLab CI
         gopls = {}, -- Go
         html = {}, -- HTML
         intelephense = {}, -- PHP
-        pest_ls = {}, -- Pest (PHP)
-        phpactor = {}, -- PHP
-        psalm = {}, -- PHP
-        pyright = {}, -- Python
-        semgrep = {}, -- Security
-        shellcheck = {}, -- Shell scripts
-        shfmt = {}, -- Shell scripts formatting
-        stylelint_lsp = {}, -- Stylelint for S/CSS
-        stylua = {}, -- Used to format Lua code
         tailwindcss = {}, -- Tailwind CSS
-        terraformls = {}, -- Terraform
+        ts_ls = {}, -- TypeScript
-        tflint = {}, -- Terraform
-        ts_ls = {}, -- TypeScript/JS
-        typos_lsp = {}, -- Better writing
         volar = {}, -- Vue
-        yamlls = {}, -- YAML
 
         lua_ls = {
           settings = {
             Lua = {
+              runtime = {
+                -- Tell the language server which version of Lua you're using (most likely LuaJIT)
+                version = 'LuaJIT',
+                -- Setup your lua path
+                path = runtime_path,
+              },
+              diagnostics = {
+                globals = { 'vim' },
+                disable = {
+                  -- Ignore Lua_LS's noisy `missing-fields` warnings
+                  'missing-fields',
+                },
+              },
+              workspace = {
+                library = vim.api.nvim_get_runtime_file('', true),
+                checkThirdParty = false,
+              },
+              -- Do not send telemetry data containing a randomized but unique identifier
+              telemetry = { enable = false },
+
               completion = {
                 callSnippet = 'Replace',
               },
-              -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-              diagnostics = { disable = { 'missing-fields' } },
             },
           },
         },
@@ -159,104 +205,227 @@ return {
                 url = '',
               },
               schemas = require('schemastore').yaml.schemas(),
+              validate = { enable = true },
             },
           },
         },
       }
 
-      local ensure_installed = vim.tbl_keys(servers or {})
+      -- Mason servers should be it's own variable for mason-nvim-lint
-      vim.list_extend(ensure_installed, {
+      -- See: https://mason-registry.dev/registry/list
-        'actionlint',
+      local mason_servers = {
-        'ansible-language-server',
-        'ansible-lint',
         'bash-language-server',
-        'blade-formatter',
+        'clang-format',
+        'codespell',
         'commitlint',
         'diagnostic-languageserver',
-        'docker-compose-language-service',
-        'dockerfile-language-server',
         'editorconfig-checker',
         'fixjson',
-        'flake8',
-        'html-lsp',
-        'jq',
         'jsonlint',
+        'lua-language-server',
         'luacheck',
-        'php-cs-fixer',
+        'phpcbf',
         'phpcs',
         'phpmd',
-        'semgrep',
+        'prettier',
         'shellcheck',
         'shfmt',
-        'stylelint',
         'stylua',
+        'vim-language-server',
+        'vue-language-server',
         'yamllint',
-      })
-      require('mason-tool-installer').setup {
-        ensure_installed = ensure_installed,
-        auto_update = true,
       }
+      local ensure_installed = vim.tbl_keys(servers or {})
+      vim.list_extend(ensure_installed, mason_servers)
 
-      -- Ensure the servers above are installed
+      -- ── Setup mason so it can manage external tooling ───────────────────
-      require('mason-lspconfig').setup {
+      require('mason').setup {
+        ensure_installed = ensure_installed,
         automatic_installation = true,
-        ensure_installed = servers,
       }
 
       -- nvim-cmp supports additional completion capabilities
       local capabilities = vim.lsp.protocol.make_client_capabilities()
       capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
+      -- Tell the server the capability of foldingRange,
+      -- Neovim hasn't added foldingRange to default capabilities, users must add it manually
+      capabilities.textDocument.foldingRange = {
+        dynamicRegistration = true,
+        lineFoldingOnly = true,
+      }
 
-      for _, lsp in ipairs(servers) do
+      capabilities.textDocument.completion.completionItem.snippetSupport = true
-        require('lspconfig')[lsp].setup {
+      capabilities.textDocument.completion.completionItem.resolveSupport = {
-          on_attach = on_attach,
+        properties = {
-          capabilities = capabilities,
+          'documentation',
-        }
+          'detail',
-      end
+          'additionalTextEdits',
-
-      -- Turn on lsp status information
-      require('fidget').setup()
-
-      -- Example custom configuration for lua
-      --
-      -- Make runtime files discoverable to the server
-      local runtime_path = vim.split(package.path, ';')
-      table.insert(runtime_path, 'lua/?.lua')
-      table.insert(runtime_path, 'lua/?/init.lua')
-
-      require('lspconfig').lua_ls.setup {
-        on_attach = on_attach,
-        capabilities = capabilities,
-        settings = {
-          Lua = {
-            runtime = {
-              -- Tell the language server which version of Lua you're using (most likely LuaJIT)
-              version = 'LuaJIT',
-              -- Setup your lua path
-              path = runtime_path,
-            },
-            diagnostics = {
-              globals = { 'vim' },
-            },
-            workspace = {
-              library = vim.api.nvim_get_runtime_file('', true),
-              checkThirdParty = false,
-            },
-            -- Do not send telemetry data containing a randomized but unique identifier
-            telemetry = { enable = false },
-          },
         },
       }
 
-      vim.api.nvim_create_autocmd('FileType', {
+      local lspconfig_handlers = {
-        pattern = 'sh',
+        -- The first entry (without a key) will be the default handler
-        callback = function()
+        -- and will be called for each installed server that doesn't have
-          vim.lsp.start {
+        -- a dedicated handler.
-            name = 'bash-language-server',
+        function(server_name) -- default handler (optional)
-            cmd = { 'bash-language-server', 'start' },
+          require('lspconfig')[server_name].setup {
+            on_attach = on_attach,
+            capabilities = capabilities,
           }
         end,
-      })
+        -- Next, you can provide targeted overrides for specific servers.
+        ['lua_ls'] = function()
+          require('lspconfig')['lua_ls'].setup { settings = servers.lua_ls }
+        end,
+        ['jsonls'] = function()
+          require('lspconfig')['jsonls'].setup { settings = servers.jsonls }
+        end,
+      }
+
+      require('mason-lspconfig').setup {
+        ensure_installed = vim.tbl_keys(servers or {}),
+        automatic_installation = true,
+        handlers = lspconfig_handlers,
+      }
     end,
   },
+
+  -- Garbage collector that stops inactive LSP clients to free RAM
+  -- https://github.com/Zeioth/garbage-day.nvim
+  {
+    'zeioth/garbage-day.nvim',
+    dependencies = 'neovim/nvim-lspconfig',
+    event = 'VeryLazy',
+    opts = {},
+  },
+
+  -- improve neovim lsp experience
+  -- https://github.com/nvimdev/lspsaga.nvim
+  -- https://nvimdev.github.io/lspsaga/
+  {
+    'nvimdev/lspsaga.nvim',
+    event = 'LspAttach',
+    dependencies = {
+      'nvim-treesitter/nvim-treesitter', -- optional
+      'nvim-tree/nvim-web-devicons', -- optional
+    },
+    opts = {
+      code_action = {
+        show_server_name = true,
+      },
+      diagnostic = {
+        keys = {
+          quit = { 'q', '<ESC>' },
+        },
+      },
+    },
+  },
+
+  -- Not UFO in the sky, but an ultra fold in Neovim.
+  -- https://github.com/kevinhwang91/nvim-ufo/
+  {
+    'kevinhwang91/nvim-ufo',
+    version = '*',
+    dependencies = {
+      { 'neovim/nvim-lspconfig' },
+      { 'kevinhwang91/promise-async' },
+      { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' },
+      {
+        -- Status column plugin that provides a configurable
+        -- 'statuscolumn' and click handlers.
+        -- https://github.com/luukvbaal/statuscol.nvim
+        'luukvbaal/statuscol.nvim',
+        config = function()
+          local builtin = require 'statuscol.builtin'
+          require('statuscol').setup {
+            relculright = true,
+            segments = {
+              {
+                text = { builtin.foldfunc },
+                click = 'v:lua.ScFa',
+              },
+              {
+                sign = {
+                  namespace = { 'diagnostic/signs' },
+                  maxwidth = 2,
+                  -- auto = true,
+                },
+                click = 'v:lua.ScSa',
+              },
+              {
+                text = { builtin.lnumfunc, ' ' },
+                click = 'v:lua.ScLa',
+              },
+            },
+          }
+        end,
+      },
+    },
+    opts = {
+      open_fold_hl_timeout = 150,
+      close_fold_kinds_for_ft = { 'imports', 'comment' },
+      preview = {
+        win_config = {
+          border = { '', '─', '', '', '', '─', '', '' },
+          winhighlight = 'Normal:Folded',
+          winblend = 0,
+        },
+        mappings = {
+          scrollU = '<C-u>',
+          scrollD = '<C-d>',
+          jumpTop = '[',
+          jumpBot = ']',
+        },
+      },
+
+      provider_selector = function(_, _, _) -- bufnr, filetype, buftype
+        return { 'treesitter', 'indent' }
+      end,
+
+      -- 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.
+      --
+      ---@param virtText table The current virtual text list.
+      ---@param lnum number The line number of the first line in the fold.
+      ---@param endLnum number The line number of the last line in the fold.
+      ---@param width number The width of the window.
+      ---@param truncate function Truncate function
+      ---@return table
+      fold_virt_text_handler = function(
+        virtText,
+        lnum,
+        endLnum,
+        width,
+        truncate
+      )
+        local newVirtText = {}
+        local suffix = (' 󰁂 %d '):format(endLnum - lnum)
+        local sufWidth = vim.fn.strdisplaywidth(suffix)
+        local targetWidth = width - sufWidth
+        local curWidth = 0
+        for _, chunk in ipairs(virtText) do
+          local chunkText = chunk[1]
+          local chunkWidth = vim.fn.strdisplaywidth(chunkText)
+          if targetWidth > curWidth + chunkWidth then
+            table.insert(newVirtText, chunk)
+          else
+            chunkText = truncate(chunkText, targetWidth - curWidth)
+            local hlGroup = chunk[2]
+            table.insert(newVirtText, { chunkText, hlGroup })
+            chunkWidth = vim.fn.strdisplaywidth(chunkText)
+            -- str width returned from truncate() may less than 2nd argument, need padding
+            if curWidth + chunkWidth < targetWidth then
+              suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
+            end
+            break
+          end
+          curWidth = curWidth + chunkWidth
+        end
+        table.insert(newVirtText, { suffix, 'MoreMsg' })
+        return newVirtText
+      end,
+    },
+  },
 }

config/nvim/lua/plugins/lualine.lua

@@ -7,31 +7,66 @@ return {
     'folke/noice.nvim',
   },
   config = function()
+    local function diff_source()
+      local gitsigns = vim.b.gitsigns_status_dict
+      if gitsigns then
+        return {
+          added = gitsigns.added,
+          modified = gitsigns.changed,
+          removed = gitsigns.removed,
+        }
+      end
+    end
+
     require('lualine').setup {
       options = {
         icons_enabled = true,
         component_separators = '|',
         section_separators = '',
       },
+      -- Sections
+      -- +-------------------------------------------------+
+      -- | A | B | C                             X | Y | Z |
+      -- +-------------------------------------------------+
       sections = {
+        lualine_a = {
+          'mode',
+        },
+        lualine_b = {
+          { 'b:gitsigns_head', icon = '' },
+          { 'diff', source = diff_source },
+          'diagnostics',
+        },
+        lualine_c = {
+          'buffers',
+          -- 'filename',
+        },
         lualine_x = {
+          -- 'fileformat',
+          'filetype',
+        },
+        lualine_y = {
+          -- 'progress'
+        },
+        lualine_z = {
           {
             require('noice').api.statusline.mode.get,
             cond = require('noice').api.statusline.mode.has,
-            -- color = { fg = '#ff9e64' },
           },
           {
             require('noice').api.status.command.get,
             cond = require('noice').api.status.command.has,
-            -- color = { fg = '#ff9e64' },
-          },
-        },
-        lualine_a = {
-          {
-            'buffers',
           },
         },
       },
+      inactive_sections = {
+        lualine_a = {},
+        lualine_b = {},
+        lualine_c = { 'filename' },
+        lualine_x = { 'location' },
+        lualine_y = {},
+        lualine_z = {},
+      },
     }
   end,
 }

config/nvim/lua/plugins/neotree.lua

@@ -1,6 +1,5 @@
 -- Neo-tree is a Neovim plugin to browse the file system
 -- https://github.com/nvim-neo-tree/neo-tree.nvim
-
 return {
   'nvim-neo-tree/neo-tree.nvim',
   version = '*',
@@ -9,29 +8,27 @@ return {
     'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
     'MunifTanjim/nui.nvim',
     {
+      -- This plugins prompts the user to pick a window and returns
+      -- the window id of the picked window
+      -- https://github.com/s1n7ax/nvim-window-picker
       's1n7ax/nvim-window-picker',
       version = '2.*',
-      config = function()
+      opts = {
-        require('window-picker').setup {
+        filter_rules = {
-          filter_rules = {
+          include_current_win = false,
-            include_current_win = false,
+          autoselect_one = true,
-            autoselect_one = true,
+          -- filter using buffer options
-            -- filter using buffer options
+          bo = {
-            bo = {
+            -- if the file type is one of following, the window will be ignored
-              -- if the file type is one of following, the window will be ignored
+            filetype = { 'neo-tree', 'neo-tree-popup', 'notify' },
-              filetype = { 'neo-tree', 'neo-tree-popup', 'notify' },
+            -- if the buffer type is one of following, the window will be ignored
-              -- if the buffer type is one of following, the window will be ignored
+            buftype = { 'terminal', 'quickfix' },
-              buftype = { 'terminal', 'quickfix' },
-            },
           },
-        }
+        },
-      end,
+      },
     },
   },
   cmd = 'Neotree',
-  keys = {
-    { '<leader>e', ':Neotree reveal<CR>', desc = 'NeoTree reveal' },
-  },
   opts = {
     close_if_last_window = true,
     filesystem = {

config/nvim/lua/plugins/noice.lua

@@ -1,7 +1,8 @@
+-- Highly experimental plugin that completely replaces the UI
+-- for messages, cmdline and the popupmenu.
+-- https://github.com/folke/noice.nvim
+
 return {
-  -- Highly experimental plugin that completely replaces the UI
-  -- for messages, cmdline and the popupmenu.
-  -- https://github.com/folke/noice.nvim
   'folke/noice.nvim',
   lazy = false,
   enabled = true,
@@ -12,73 +13,67 @@ return {
     'rcarriga/nvim-notify',
     'hrsh7th/nvim-cmp',
   },
-  keys = {
+  opts = {
-    { 'n', '<leader>tn', ':Noice dismiss<CR>', desc = 'Noice dismiss' },
+    lsp = {
+      -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
+      override = {
+        ['vim.lsp.util.convert_input_to_markdown_lines'] = true,
+        ['vim.lsp.util.stylize_markdown'] = true,
+        ['cmp.entry.get_documentation'] = true, -- requires hrsh7th/nvim-cmp
+      },
+    },
+    -- you can enable a preset for easier configuration
+    presets = {
+      bottom_search = false, -- use a classic bottom cmdline for search
+      command_palette = true, -- position the cmdline and popupmenu together
+      long_message_to_split = true, -- long messages will be sent to a split
+      inc_rename = false, -- enables an input dialog for inc-rename.nvim
+      lsp_doc_border = false, -- add a border to hover docs and signature help
+    },
+    routes = {
+      {
+        filter = {
+          event = 'msg_show',
+          any = {
+            { find = '%d+L, %d+B' },
+            { find = '; after #%d+' },
+            { find = '; before #%d+' },
+            { find = '%d fewer lines' },
+            { find = '%d more lines' },
+          },
+        },
+        opts = { skip = true },
+      },
+    },
+    views = {
+      cmdline_popup = {
+        position = {
+          row = 5,
+          col = '50%',
+        },
+        size = {
+          width = 60,
+          height = 'auto',
+        },
+      },
+      popupmenu = {
+        relative = 'editor',
+        position = {
+          row = 8,
+          col = '50%',
+        },
+        size = {
+          width = 60,
+          height = 10,
+        },
+        border = {
+          style = 'rounded',
+          padding = { 0, 1 },
+        },
+        win_options = {
+          winhighlight = { Normal = 'Normal', FloatBorder = 'DiagnosticInfo' },
+        },
+      },
+    },
   },
-  config = function()
-    vim.g.noice_ignored_filetypes = { 'fugitiveblame', 'fugitive', 'gitcommit', 'noice' }
-    require('noice').setup {
-      lsp = {
-        -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
-        override = {
-          ['vim.lsp.util.convert_input_to_markdown_lines'] = true,
-          ['vim.lsp.util.stylize_markdown'] = true,
-          ['cmp.entry.get_documentation'] = true, -- requires hrsh7th/nvim-cmp
-        },
-      },
-      -- you can enable a preset for easier configuration
-      presets = {
-        bottom_search = false, -- use a classic bottom cmdline for search
-        command_palette = true, -- position the cmdline and popupmenu together
-        long_message_to_split = true, -- long messages will be sent to a split
-        inc_rename = false, -- enables an input dialog for inc-rename.nvim
-        lsp_doc_border = false, -- add a border to hover docs and signature help
-      },
-      routes = {
-        {
-          filter = {
-            event = 'msg_show',
-            any = {
-              { find = '%d+L, %d+B' },
-              { find = '; after #%d+' },
-              { find = '; before #%d+' },
-              { find = '%d fewer lines' },
-              { find = '%d more lines' },
-            },
-          },
-          opts = { skip = true },
-        },
-      },
-      views = {
-        cmdline_popup = {
-          position = {
-            row = 5,
-            col = '50%',
-          },
-          size = {
-            width = 60,
-            height = 'auto',
-          },
-        },
-        popupmenu = {
-          relative = 'editor',
-          position = {
-            row = 8,
-            col = '50%',
-          },
-          size = {
-            width = 60,
-            height = 10,
-          },
-          border = {
-            style = 'rounded',
-            padding = { 0, 1 },
-          },
-          win_options = {
-            winhighlight = { Normal = 'Normal', FloatBorder = 'DiagnosticInfo' },
-          },
-        },
-      },
-    }
-  end,
 }

config/nvim/lua/plugins/telescope.lua

@@ -8,7 +8,57 @@ return {
     { 'nvim-lua/plenary.nvim' },
     { 'nvim-telescope/telescope-symbols.nvim' },
     { 'folke/which-key.nvim' },
-    { 'ThePrimeagen/harpoon' },
+    -- Getting you where you want with the fewest keystrokes.
+    -- https://github.com/ThePrimeagen/harpoon
+    {
+      'ThePrimeagen/harpoon',
+      branch = 'harpoon2',
+      dependencies = {
+        'nvim-lua/plenary.nvim',
+        'nvim-telescope/telescope.nvim',
+      },
+      config = function()
+        local harpoon = require 'harpoon'
+        harpoon:setup {}
+
+        -- basic telescope configuration
+        local conf = require('telescope.config').values
+        local function toggle_telescope(harpoon_files)
+          local file_paths = {}
+          for _, item in ipairs(harpoon_files.items) do
+            table.insert(file_paths, item.value)
+          end
+
+          require('telescope.pickers')
+            .new({}, {
+              prompt_title = 'Harpoon',
+              finder = require('telescope.finders').new_table {
+                results = file_paths,
+              },
+              previewer = conf.file_previewer {},
+              sorter = conf.generic_sorter {},
+            })
+            :find()
+        end
+
+        vim.keymap.set(
+          'n',
+          '<leader>hw',
+          function() toggle_telescope(harpoon:list()) end,
+          { desc = 'Open harpoon window with telescope' }
+        )
+        vim.keymap.set(
+          'n',
+          '<leader>ht',
+          function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
+          { desc = 'Open Harpoon Quick menu' }
+        )
+      end,
+    },
+    -- A Telescope picker to quickly access configurations
+    -- of plugins managed by lazy.nvim.
+    -- https://github.com/polirritmico/telescope-lazy-plugins.nvim
+    { 'polirritmico/telescope-lazy-plugins.nvim' },
 
     -- Fuzzy Finder Algorithm which requires local dependencies to be built.
     -- Only load if `make` is available
@@ -28,15 +78,6 @@ return {
     t.setup {
       defaults = {
         layout_strategy = 'horizontal',
-        layout_config = {
-          preview_width = 0.65,
-          horizontal = {
-            size = {
-              width = '95%',
-              height = '95%',
-            },
-          },
-        },
         pickers = {
           find_files = {
             theme = 'dropdown',
@@ -51,39 +92,28 @@ return {
           },
         },
       },
+      extensions = {
+        lazy_plugins = {
+          -- Must be a valid path to the file containing the lazy spec and setup() call.
+          lazy_config = vim.fn.stdpath 'config' .. '/init.lua',
+        },
+      },
     }
 
     -- Load extensions
     pcall(t.load_extension, 'harpoon')
     pcall(t.load_extension, 'git_worktree')
+    pcall(t.load_extension, 'lazy_plugins')
+
     -- Enable telescope fzf native, if installed
     pcall(t.load_extension, 'fzf')
 
     -- [[ Telescope Keymaps ]]
     -- See `:help telescope.builtin`
     -- See `:help telescope.keymap`
-    local b = require 'telescope.builtin'
-
-    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>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>st', ':TodoTelescope<CR>', desc = 'Telescope: Todo' },
-      { '<leader><tab>', "<Cmd>lua require('telescope.builtin').commands()<CR>", desc = 'Telescope: Commands' },
-    }
-
     vim.keymap.set('n', '<leader>/', function()
       -- You can pass additional configuration to telescope to change theme, layout, etc.
-      b.current_buffer_fuzzy_find(themes.get_dropdown {
+      require('telescope.builtin').current_buffer_fuzzy_find(themes.get_dropdown {
         winblend = 10,
         previewer = true,
       })

config/nvim/lua/plugins/treesitter.lua

@@ -1,7 +1,8 @@
+-- Highlight, edit, and navigate code
+-- https://github.com/nvim-treesitter/nvim-treesitter
 return {
-  -- Highlight, edit, and navigate code
-  -- https://github.com/nvim-treesitter/nvim-treesitter
   'nvim-treesitter/nvim-treesitter',
+  version = false, -- last release is way too old and doesn't work on Windows
   build = function()
     pcall(require('nvim-treesitter.install').update { with_sync = true })
   end,
@@ -10,6 +11,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 +100,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',
           },
         },
       },

config/nvim/lua/plugins/trouble.lua

@@ -1,34 +1,15 @@
+-- A pretty diagnostics, references, telescope results,
+-- quickfix and location list to help you solve all the
+-- trouble your code is causing.
+-- https://github.com/folke/trouble.nvim
 return {
   'folke/trouble.nvim',
   lazy = false,
-  dependencies = 'nvim-tree/nvim-web-devicons',
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
-  keys = {
+  opts = {
-    { '<leader>xx', '<cmd>TroubleToggle<cr>', desc = 'Toggle Trouble' },
+    auto_preview = false,
-    { '<leader>xw', '<cmd>TroubleToggle workspace_diagnostics<cr>', desc = 'Toggle Workspace Diagnostics' },
+    auto_fold = true,
-    { '<leader>xd', '<cmd>TroubleToggle document_diagnostics<cr>', desc = 'Toggle Document Diagnostics' },
+    auto_close = true,
-    { '<leader>xl', '<cmd>TroubleToggle loclist<cr>', desc = 'Toggle Loclist' },
+    use_lsp_diagnostic_signs = true,
-    { '<leader>xq', '<cmd>TroubleToggle quickfix<cr>', desc = 'Toggle Quickfix' },
-    { 'gR', '<cmd>TroubleToggle lsp_references<cr>', desc = 'Toggle LSP References' },
   },
-  config = function()
-    require('trouble').setup {
-      auto_preview = false,
-      auto_fold = true,
-      auto_close = true,
-      use_lsp_diagnostic_signs = true,
-    }
-
-    -- Diagnostic signs
-    -- https://github.com/folke/trouble.nvim/issues/52
-    local signs = {
-      Error = ' ',
-      Warning = ' ',
-      Hint = ' ',
-      Information = ' ',
-    }
-    for type, icon in pairs(signs) do
-      local hl = 'DiagnosticSign' .. type
-      vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
-    end
-  end,
 }

config/nvim/lua/plugins/ufo.lua

@@ -1,84 +0,0 @@
-local handler = function(virtText, lnum, endLnum, width, truncate)
-  local newVirtText = {}
-  local suffix = (' 󰁂 %d '):format(endLnum - lnum)
-  local sufWidth = vim.fn.strdisplaywidth(suffix)
-  local targetWidth = width - sufWidth
-  local curWidth = 0
-  for _, chunk in ipairs(virtText) do
-    local chunkText = chunk[1]
-    local chunkWidth = vim.fn.strdisplaywidth(chunkText)
-    if targetWidth > curWidth + chunkWidth then
-      table.insert(newVirtText, chunk)
-    else
-      chunkText = truncate(chunkText, targetWidth - curWidth)
-      local hlGroup = chunk[2]
-      table.insert(newVirtText, { chunkText, hlGroup })
-      chunkWidth = vim.fn.strdisplaywidth(chunkText)
-      -- str width returned from truncate() may less than 2nd argument, need padding
-      if curWidth + chunkWidth < targetWidth then
-        suffix = suffix .. (' '):rep(targetWidth - curWidth - chunkWidth)
-      end
-      break
-    end
-    curWidth = curWidth + chunkWidth
-  end
-  table.insert(newVirtText, { suffix, 'MoreMsg' })
-  return newVirtText
-end
-
-return {
-  -- Not UFO in the sky, but an ultra fold in Neovim.
-  -- https://github.com/kevinhwang91/nvim-ufo/
-  {
-    'kevinhwang91/nvim-ufo',
-    lazy = false,
-    enabled = true,
-    version = '*',
-    dependencies = {
-      'kevinhwang91/promise-async',
-      { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' },
-      {
-        'luukvbaal/statuscol.nvim',
-        config = function()
-          local builtin = require 'statuscol.builtin'
-          require('statuscol').setup {
-            relculright = true,
-            segments = {
-              { text = { builtin.foldfunc }, click = 'v:lua.ScFa' },
-              { text = { '%s' }, click = 'v:lua.ScSa' },
-              { text = { builtin.lnumfunc, ' ' }, click = 'v:lua.ScLa' },
-            },
-          }
-        end,
-      },
-    },
-    init = function()
-      vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
-      vim.o.foldcolumn = '1' -- '0' is not bad
-      vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
-      vim.o.foldlevelstart = 99
-      vim.o.foldenable = true
-    end,
-    opts = {
-      open_fold_hl_timeout = 150,
-      close_fold_kinds_for_ft = { 'imports', 'comment' },
-      preview = {
-        win_config = {
-          border = { '', '─', '', '', '', '─', '', '' },
-          winhighlight = 'Normal:Folded',
-          winblend = 0,
-        },
-        mappings = {
-          scrollU = '<C-u>',
-          scrollD = '<C-d>',
-          jumpTop = '[',
-          jumpBot = ']',
-        },
-      },
-      provider_selector = function(_, _, _) -- bufnr, filetype, buftype
-        return { 'treesitter', 'indent' }
-      end,
-      fold_virt_text_handler = handler,
-    },
-  },
-}

config/nvim/lua/plugins/ui.lua

@@ -4,9 +4,7 @@ return {
   {
     'folke/tokyonight.nvim',
     priority = 1000, -- Make sure to load this before all the other start plugins.
-    init = function()
+    init = function() vim.cmd.colorscheme(vim.g.colors_theme) end,
-      vim.cmd.colorscheme 'tokyonight'
-    end,
     opts = {
       transparent = true,
     },
@@ -20,27 +18,137 @@ return {
       update_interval = 1000,
       set_dark_mode = function()
         vim.api.nvim_set_option_value('background', 'dark', {})
-        vim.cmd 'colorscheme tokyonight-storm'
+        vim.cmd.colorscheme(vim.g.colors_variant_dark)
       end,
       set_light_mode = function()
         vim.api.nvim_set_option_value('background', 'light', {})
-        vim.cmd 'colorscheme tokyonight-day'
+        vim.cmd.colorscheme(vim.g.colors_variant_light)
       end,
     },
   },
 
+  -- vim dashboard
+  -- https://github.com/nvimdev/dashboard-nvim
+  {
+    'nvimdev/dashboard-nvim',
+    event = 'VimEnter',
+    config = function()
+      require('dashboard').setup {
+        theme = 'doom',
+        config = {
+          disable_move = true,
+          week_header = {
+            enable = true,
+          },
+          shortcut = {},
+          center = {
+            {
+              icon = ' ',
+              icon_hl = '@variable',
+              desc = 'Files',
+              group = 'Label',
+              action = 'Telescope find_files',
+              key = 'f',
+            },
+            {
+              icon = ' ',
+              desc = 'Marks',
+              group = 'DiagnosticHint',
+              action = 'Telescope harpoon marks',
+              key = 'a',
+            },
+            {
+              icon = '⚑ ',
+              desc = 'TODO',
+              group = 'DiagnosticOptions',
+              action = 'TodoTelescope',
+              key = 't',
+            },
+            {
+              icon = ' ',
+              desc = 'Search',
+              group = 'Number',
+              action = 'Telescope live_grep',
+              key = 's',
+            },
+            {
+              icon = '󰊳 ',
+              desc = 'Lazy Update',
+              group = '@property',
+              action = 'Lazy update',
+              key = 'u',
+            },
+          },
+        },
+      }
+    end,
+    dependencies = { { 'nvim-tree/nvim-web-devicons' } },
+  },
+
   -- Remove all background colors to make nvim transparent
   -- https://github.com/xiyaowong/nvim-transparent
-  { 'xiyaowong/nvim-transparent' },
+  { 'xiyaowong/nvim-transparent', opts = {} },
 
   -- Twilight is a Lua plugin for Neovim 0.5 that dims inactive
   -- portions of the code you're editing using TreeSitter.
   -- https://github.com/folke/twilight.nvim
+  { 'folke/twilight.nvim', opts = {} },
+
+  -- Indent guides for Neovim
+  -- https://github.com/lukas-reineke/indent-blankline.nvim
   {
-    'folke/twilight.nvim',
+    'lukas-reineke/indent-blankline.nvim',
-    ft = 'markdown', -- Highlight markdown files
+    main = 'ibl',
-    keys = {
+    config = function()
-      { 'n', 'tw', '<cmd>Twilight<cr>', desc = 'Twilight' },
+      require('ibl').setup {
+        indent = {
+          char = '│',
+        },
+        exclude = {
+          filetypes = { 'terminal', 'dashboard' },
+          buftypes = { 'dashboard' },
+        },
+      }
+    end,
+  },
+
+  -- Git integration for buffers
+  -- https://github.com/lewis6991/gitsigns.nvim
+  {
+    'lewis6991/gitsigns.nvim',
+    version = false,
+    lazy = false,
+    opts = {
+      signs = {
+        add = { text = '+' },
+        change = { text = '~' },
+        delete = { text = '_' },
+        topdelete = { text = '‾' },
+        changedelete = { text = '~' },
+      },
+      current_line_blame = false,
+      on_attach = function(bufnr)
+        local gs = require 'gitsigns'
+
+        local function map(mode, l, r, opts)
+          opts = opts or {}
+          opts.buffer = bufnr
+          vim.keymap.set(mode, l, r, opts)
+        end
+
+        -- Navigation
+        map('n', 'gn', function()
+          if vim.wo.diff then return ']c' end
+          vim.schedule(function() gs.next_hunk() end)
+          return '<Ignore>'
+        end, { expr = true })
+
+        map('n', 'gp', function()
+          if vim.wo.diff then return '[c' end
+          vim.schedule(function() gs.prev_hunk() end)
+          return '<Ignore>'
+        end, { expr = true })
+      end,
     },
   },
 
@@ -48,8 +156,6 @@ return {
   -- https://github.com/christoomey/vim-tmux-navigator
   {
     'christoomey/vim-tmux-navigator',
-    lazy = false,
-    enabled = true,
     cmd = {
       'TmuxNavigateLeft',
       'TmuxNavigateDown',
@@ -57,60 +163,48 @@ return {
       'TmuxNavigateRight',
       'TmuxNavigatePrevious',
     },
-    keys = {
-      { '<c-h>', '<cmd><C-U>TmuxNavigateLeft<cr>', desc = 'tmux: Navigate Left' },
-      { '<c-j>', '<cmd><C-U>TmuxNavigateDown<cr>', desc = 'tmux: Navigate Down' },
-      { '<c-k>', '<cmd><C-U>TmuxNavigateUp<cr>', desc = 'tmux: Navigate Up' },
-      { '<c-l>', '<cmd><C-U>TmuxNavigateRight<cr>', desc = 'tmux: Navigate Right' },
-      { '<c-\\>', '<cmd><C-U>TmuxNavigatePrevious<cr>', desc = 'tmux: Navigate Previous' },
-    },
   },
+
   -- Cloak allows you to overlay *'s over defined patterns in defined files.
   -- https://github.com/laytan/cloak.nvim
   {
     'laytan/cloak.nvim',
-    enabled = true,
-    lazy = false,
     version = '*',
-    config = function()
+    opts = {
-      require('cloak').setup {
+      enabled = true,
-        enabled = true,
+      cloak_character = '*',
-        cloak_character = '*',
+      -- The applied highlight group (colors) on the cloaking, see `:h highlight`.
-        -- The applied highlight group (colors) on the cloaking, see `:h highlight`.
+      highlight_group = 'Comment',
-        highlight_group = 'Comment',
+      patterns = {
-        patterns = {
+        {
-          {
+          -- Match any file starting with ".env".
-            -- Match any file starting with ".env".
+          -- This can be a table to match multiple file patterns.
-            -- This can be a table to match multiple file patterns.
+          file_pattern = {
-            file_pattern = {
+            '.env*',
-              '.env*',
+            'wrangler.toml',
-              'wrangler.toml',
+            '.dev.vars',
-              '.dev.vars',
-            },
-            -- Match an equals sign and any character after it.
-            -- This can also be a table of patterns to cloak,
-            -- example: cloak_pattern = { ":.+", "-.+" } for yaml files.
-            cloak_pattern = '=.+',
           },
+          -- Match an equals sign and any character after it.
+          -- This can also be a table of patterns to cloak,
+          -- example: cloak_pattern = { ":.+", "-.+" } for yaml files.
+          cloak_pattern = '=.+',
         },
-      }
+      },
-    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
   { 'famiu/bufdelete.nvim' },
+
   -- Neovim plugin for locking a buffer to a window
   -- https://github.com/stevearc/stickybuf.nvim
   { 'stevearc/stickybuf.nvim', opts = {} },
+
   -- Describe the regexp under the cursor
   -- https://github.com/bennypowers/nvim-regexplainer
   {
     'bennypowers/nvim-regexplainer',
-    lazy = false,
+    event = 'BufEnter',
-    enabled = true,
     dependencies = {
       'nvim-treesitter/nvim-treesitter',
       'MunifTanjim/nui.nvim',
@@ -120,24 +214,11 @@ return {
       auto = true,
     },
   },
+
   -- Clarify and beautify your comments using boxes and lines.
   -- https://github.com/LudoPinelli/comment-box.nvim
-  {
+  { 'LudoPinelli/comment-box.nvim', opts = {} },
-    '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!
   -- https://github.com/anuvyklack/windows.nvim
@@ -147,11 +228,18 @@ return {
       'anuvyklack/middleclass',
       'anuvyklack/animation.nvim',
     },
-    config = function()
+    opts = {},
-      vim.o.winwidth = 15
+  },
-      vim.o.winminwidth = 10
+
-      vim.o.equalalways = false
+  -- Plugin to improve viewing Markdown files in Neovim
-      require('windows').setup()
+  -- https://github.com/MeanderingProgrammer/render-markdown.nvim
-    end,
+  {
+    'MeanderingProgrammer/render-markdown.nvim',
+    dependencies = {
+      'nvim-treesitter/nvim-treesitter',
+      'nvim-tree/nvim-web-devicons',
+    },
+    ft = 'markdown',
+    opts = {},
   },
 }

config/nvim/lua/plugins/which-key.lua

@@ -14,35 +14,596 @@ return {
     wk.setup()
 
     wk.add {
-      -- Groups
+      -- ╭─────────────────────────────────────────────────────────╮
+      -- │                       With leader                       │
+      -- ╰─────────────────────────────────────────────────────────╯
+
+      -- ── Buffer ──────────────────────────────────────────────────────────
       {
         '<leader>b',
         group = '[b] Buffer',
         expand = function()
+          -- Add the current buffers to the menu
           return require('which-key.extras').expand.buf()
         end,
       },
-      { '<leader>c', group = '[c] Code' },
-      { '<leader>d', group = '[d] Document' },
-      { '<leader>g', group = '[g] Git' },
-      { '<leader>l', group = '[l] LSP' },
-      { '<leader>p', group = '[p] Project' },
-      { '<leader>q', group = '[q] Quit' },
-      { '<leader>s', group = '[s] Search' },
-      { '<leader>t', group = '[t] Toggle' },
-      { '<leader>w', group = '[w] Workspace' },
-      { '<leader>x', group = '[z] Trouble' },
-      { '<leader>z', group = '[x] FZF & Harpoon' },
-      { '<leader>?', group = '[?] Help' },
       {
-        '<leader>?w',
+        { '<leader>bk', '<cmd>blast<cr>', desc = 'Buffer: Last' },
-        function()
+        { '<leader>bj', '<cmd>bfirst<cr>', desc = 'Buffer: First' },
-          wk.show { global = false }
+        { '<leader>bh', '<cmd>bprev<cr>', desc = 'Buffer: Prev' },
-        end,
+        { '<leader>bl', '<cmd>bnext<cr>', desc = 'Buffer: Next' },
-        desc = 'Buffer Local Keymaps (which-key)',
+        { '<leader>bd', '<cmd>Bdelete<cr>', desc = 'Buffer: Delete' },
+        { '<leader>bw', '<cmd>Bwipeout<cr>', desc = 'Buffer: Wipeout' },
       },
-      -- Misc keybinds
+
-      { 'QQ', ':q!<CR>', desc = 'Quit without saving' },
+      -- ── Code ────────────────────────────────────────────────────────────
+      { '<leader>c', group = '[c] Code' },
+      {
+        {
+          '<leader>ca',
+          '<cmd>lua vim.lsp.buf.code_action()<CR>',
+          desc = 'LSP: Code Action',
+        },
+        {
+          '<leader>cg',
+          '<cmd>lua require("neogen").generate()<CR>',
+          desc = 'Generate annotations',
+        },
+      },
+      -- ── 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',
+        },
+      },
+      -- ── Code: package.json control ──────────────────────────────────────
+      -- See: lua/plugins/lazy.lua
+      { '<leader>cn', group = 'package.json control' },
+      {
+        {
+          '<leader>cnd',
+          '<cmd>lua require("package-info").delete()<cr>',
+          desc = 'Delete package',
+        },
+        {
+          '<leader>cni',
+          '<cmd>lua require("package-info").install()<cr>',
+          desc = 'Install package',
+        },
+        {
+          '<leader>cns',
+          '<cmd>lua require("package-info").show({ force = true })<cr>',
+          desc = 'Show package info',
+        },
+        {
+          '<leader>cnu',
+          '<cmd>lua require("package-info").change_version()<cr>',
+          desc = 'Change version',
+        },
+      },
+
+      -- ── Code: Refactoring ───────────────────────────────────────────────
+      { '<leader>cx', group = '[x] Refactoring' },
+      {
+        mode = { 'x' },
+        -- Extract function supports only visual mode
+        {
+          '<leader>cxe',
+          "<cmd>lua require('refactoring').refactor('Extract Function')<cr>",
+          desc = 'Extract Function',
+        },
+        {
+          '<leader>cxf',
+          "<cmd>lua require('refactoring').refactor('Extract Function To File')<cr>",
+          desc = 'Extract Function to File',
+        },
+        -- Extract variable supports only visual mode
+        {
+          '<leader>cxv',
+          "<cmd>lua require('refactoring').refactor('Extract Variable')<cr>",
+          desc = 'Extract Variable',
+        },
+      },
+      -- Inline func supports only normal
+      {
+        '<leader>cxif',
+        "<cmd>lua require('refactoring').refactor('Inline Function')<cr>",
+        desc = 'Inline Function',
+      },
+      -- Extract block supports only normal mode
+      {
+        '<leader>cxb',
+        "<cmd>lua require('refactoring').refactor('Extract Block')<cr>",
+        desc = 'Extract Block',
+      },
+      {
+        '<leader>cxbf',
+        "<cmd>lua require('refactoring').refactor('Extract Block To File')<cr>",
+        desc = 'Extract Block to File',
+      },
+      {
+        mode = { 'n', 'x' },
+        -- Inline var supports both normal and visual mode
+        {
+          '<leader>cxiv',
+          "<cmd>lua require('refactoring').refactor('Inline Variable')<cr>",
+          desc = 'Inline Variable',
+        },
+      },
+
+      -- ── Code: LSPSaga ───────────────────────────────────────────────────
+      -- See: lua/plugins/lsp.lua
+      {
+        '<C-a>',
+        '<cmd>Lspsaga term_toggle<cr>',
+        desc = 'LSPSaga: Open Floaterm',
+      },
+      {
+        '<leader>ca',
+        '<cmd>Lspsaga code_action<cr>',
+        desc = 'LSPSaga: Code Actions',
+      },
+      {
+        '<leader>cci',
+        '<cmd>Lspsaga incoming_calls<cr>',
+        desc = 'LSPSaga: Incoming Calls',
+      },
+      {
+        '<leader>cco',
+        '<cmd>Lspsaga outgoing_calls<cr>',
+        desc = 'LSPSaga: Outgoing Calls',
+      },
+      {
+        '<leader>cd',
+        '<cmd>Lspsaga show_line_diagnostics<cr>',
+        desc = 'LSPSaga: Show Line Diagnostics',
+      },
+      {
+        '<leader>cf',
+        '<cmd>lua require("conform").format({ async = true, lsp_fallback = true })<cr>',
+        mode = { 'n', 'v' },
+        desc = 'Format buffer',
+      },
+      {
+        '<leader>ci',
+        '<cmd>Lspsaga implement<cr>',
+        desc = 'LSPSaga: Implementations',
+      },
+      {
+        '<leader>cl',
+        '<cmd>Lspsaga show_cursor_diagnostics<cr>',
+        desc = 'LSPSaga: Show Cursor Diagnostics',
+      },
+      {
+        '<leader>cp',
+        '<cmd>Lspsaga peek_definition<cr>',
+        desc = 'LSPSaga: Peek Definition',
+      },
+      { '<leader>cr', '<cmd>Lspsaga rename<cr>', desc = 'LSPSaga: Rename' },
+      {
+        '<leader>cR',
+        '<cmd>Lspsaga rename ++project<cr>',
+        desc = 'LSPSaga: Rename Project wide',
+      },
+      {
+        '<leader>cs',
+        '<cmd>Lspsaga signature_help<cr>',
+        desc = 'LSPSaga: Signature Documentation',
+      },
+      {
+        '<leader>ct',
+        '<cmd>Lspsaga peek_type_definition<cr>',
+        desc = 'LSPSaga: Peek Type Definition',
+      },
+      {
+        '<leader>cu',
+        '<cmd>Lspsaga preview_definition<cr>',
+        desc = 'LSPSaga: Preview Definition',
+      },
+      {
+        '<leader>cv',
+        '<cmd>Lspsaga diagnostic_jump_prev<cr>',
+        desc = 'LSPSaga: Diagnostic Jump Prev',
+      },
+      {
+        '<leader>cw',
+        '<cmd>Lspsaga diagnostic_jump_next<cr>',
+        desc = 'LSPSaga: Diagnostic Jump Next',
+      },
+
+      -- ── DAP ─────────────────────────────────────────────────────────────
+      { '<leader>d', group = '[d] DAP' },
+      {
+        {
+          '<leader>db',
+          '<cmd>DapToggleBreakpoint',
+          desc = 'DAP: Toggle Breakpoint',
+        },
+        { '<leader>dc', '<cmd>DapContinue', desc = 'DAP: Continue' },
+        {
+          '<leader>do',
+          '<cmd>lua vim.diagnostic.open_float()<CR>',
+          desc = 'Diagnostic: Open float',
+        },
+        {
+          '<leader>dq',
+          '<cmd>lua vim.diagnostic.setloclist()<CR>',
+          desc = 'Diagnostic: Set loc list',
+        },
+        {
+          '<leader>dr',
+          "<cmd>lua require('dapui').open({reset = true})<CR>",
+          desc = 'DAP: Reset',
+        },
+        {
+          '<leader>ds',
+          '<cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>',
+          desc = 'LSP: Document Symbols',
+        },
+        { '<leader>dt', '<cmd>DapUiToggle', desc = 'DAP: Toggle UI' },
+      },
+
+      -- ── Harpoon ─────────────────────────────────────────────────────────
+      -- See: lua/plugins/telescope.lua
+      { '<leader>h', group = '[h] Harpoon' },
+      {
+        {
+          '<leader>ha',
+          '<cmd>lua require("harpoon"):list():add()<cr>',
+          desc = 'harpoon file',
+        },
+        {
+          '<leader>hn',
+          '<cmd>lua require("harpoon"):list():next()<cr>',
+          desc = 'harpoon to next file',
+        },
+        {
+          '<leader>hp',
+          '<cmd>lua require("harpoon"):list():prev()<cr>',
+          desc = 'harpoon to previous file',
+        },
+        {
+          '<leader>ht',
+          "<cmd>lua require('harpoon.ui').toggle_quick_menu()<CR>",
+          desc = 'DAP: Harpoon UI',
+        },
+      },
+
+      -- ── LSP ─────────────────────────────────────────────────────────────
+      { '<leader>l', group = '[l] LSP' },
+      -- See: lua/plugins/lsp.lua
+
+      -- ── Quit ────────────────────────────────────────────────────────────
+      { '<leader>q', group = '[q] Quit' },
+      {
+        { '<leader>qf', '<cmd>q<CR>', desc = 'Quicker close split' },
+        { '<leader>qq', '<cmd>wq!<CR>', desc = 'Quit with force saving' },
+        { '<leader>qw', '<cmd>wq<CR>', desc = 'Write and quit' },
+      },
+
+      -- ── Search ──────────────────────────────────────────────────────────
+      { '<leader>s', group = '[s] Search' },
+      -- See: lua/plugins/telescope.lua
+      {
+        '<leader><space>',
+        "<cmd>lua require('telescope.builtin').buffers()<cr>",
+        desc = 'Find existing buffers',
+      },
+      {
+        '<leader><tab>',
+        "<cmd>lua require('telescope.builtin').commands()<CR>",
+        desc = 'Telescope: Commands',
+      },
+      {
+        '<leader>sd',
+        "<cmd>lua require('telescope.builtin').diagnostics()<cr>",
+        desc = 'Search Diagnostics',
+      },
+      {
+        '<leader>sg',
+        "<cmd>lua require('telescope.builtin').live_grep()<cr>",
+        desc = 'Search by Grep',
+      },
+      {
+        '<leader>sm',
+        '<cmd>Telescope harpoon marks<CR>',
+        desc = 'Harpoon Marks',
+      },
+      {
+        '<leader>sn',
+        "<cmd>lua require('telescope').extensions.notify.notify()<CR>",
+        desc = 'Show Notifications',
+      },
+      {
+        '<leader>so',
+        "<cmd>lua require('telescope.builtin').oldfiles()<cr>",
+        desc = 'Find recently Opened files',
+      },
+      {
+        '<leader>sp',
+        "<cmd>lua require('telescope').extensions.lazy_plugins.lazy_plugins()<cr>",
+        desc = 'Find neovim/lazy configs',
+      },
+      { '<leader>st', '<cmd>TodoTelescope<CR>', desc = 'Telescope: Show Todo' },
+      {
+        '<leader>sw',
+        "<cmd>lua require('telescope.builtin').grep_string()<cr>",
+        desc = 'Search current Word',
+      },
+
+      -- ── Toggle ──────────────────────────────────────────────────────────
+      { '<leader>t', group = '[t] Toggle' },
+      {
+        { '<leader>tc', '<cmd>CloakToggle<cr>', desc = 'Toggle Cloak' },
+        { '<leader>tn', '<cmd>Noice dismiss<CR>', desc = 'Noice dismiss' },
+        { '<leader>ts', '<cmd>noh<CR>', desc = 'Toggle Search Highlighting' },
+        {
+          '<leader>tt',
+          '<cmd>TransparentToggle<CR>',
+          desc = 'Toggle Transparency',
+        },
+        { '<leader>tw', '<cmd>Twilight<cr>', desc = 'Toggle Twilight' },
+      },
+
+      -- ── Workspace ───────────────────────────────────────────────────────
+      { '<leader>w', group = '[w] Workspace' },
+      {
+        {
+          '<leader>wa',
+          '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>',
+          desc = 'LSP: Workspace Add Folder',
+        },
+        {
+          '<leader>wl',
+          '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>',
+          desc = 'LSP: Workspace List Folders',
+        },
+        {
+          '<leader>wr',
+          '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>',
+          desc = 'LSP: Workspace Remove Folder',
+        },
+        {
+          '<leader>ws',
+          '<cmd>lua require("telescope.builtin").lsp_dynamic_workspace_symbols()<CR>',
+          desc = 'LSP: Workspace Symbols',
+        },
+      },
+
+      -- ── Trouble ─────────────────────────────────────────────────────────
+      { '<leader>x', group = '[x] Trouble' },
+      {
+        {
+          '<leader>xx',
+          '<cmd>Trouble diagnostics<cr>',
+          desc = 'Toggle Trouble Diagnostics',
+        },
+        {
+          '<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' },
+      },
+
+      -- ── Help ────────────────────────────────────────────────────────────
+      { '<leader>?', group = '[?] Help & Cheat sheets' },
+      {
+        {
+          '<leader>?w',
+          '<cmd>lua require("which-key").show({global = false})<cr>',
+          desc = 'Buffer Local Keymaps (which-key)',
+        },
+      },
+
+      -- ── Misc ────────────────────────────────────────────────────────────
+      {
+        '<leader>1',
+        '<cmd>lua require("harpoon"):list():select(1)<cr>',
+        desc = 'harpoon to file 1',
+      },
+      {
+        '<leader>2',
+        '<cmd>lua require("harpoon"):list():select(2)<cr>',
+        desc = 'harpoon to file 2',
+      },
+      {
+        '<leader>3',
+        '<cmd>lua require("harpoon"):list():select(3)<cr>',
+        desc = 'harpoon to file 3',
+      },
+      {
+        '<leader>4',
+        '<cmd>lua require("harpoon"):list():select(4)<cr>',
+        desc = 'harpoon to file 4',
+      },
+      {
+        '<leader>5',
+        '<cmd>lua require("harpoon"):list():select(5)<cr>',
+        desc = 'harpoon to file 5',
+      },
+      {
+        '<leader>D',
+        '<cmd>lua vim.lsp.buf.type_definition()<CR>',
+        desc = 'LSP: Type Definition',
+      },
+      { '<leader>e', '<cmd>Neotree reveal<CR>', desc = 'NeoTree reveal' },
+
+      -- ╭─────────────────────────────────────────────────────────╮
+      -- │                     Without leader                      │
+      -- ╰─────────────────────────────────────────────────────────╯
+      { 'y', group = 'Yank & Surround' },
+
+      { 'gp', group = 'Goto Preview' },
+      {
+        {
+          'gpd',
+          '<cmd>lua require("goto-preview").goto_preview_definition()<CR>',
+          desc = 'Goto: Preview Definition',
+        },
+        {
+          'gpi',
+          '<cmd>lua require("goto-preview").goto_preview_implementation()<CR>',
+          desc = 'Goto: Preview Implementation',
+        },
+        {
+          'gpP',
+          '<cmd>lua require("goto-preview").close_all_windows()<CR>',
+          desc = 'Goto: Close All Preview Windows',
+        },
+      },
+
+      -- ── tmux navigation ─────────────────────────────────────────────────
+      {
+        {
+          '<c-h>',
+          '<cmd><C-U>TmuxNavigateLeft<cr>',
+          desc = 'tmux: Navigate Left',
+        },
+        {
+          '<c-j>',
+          '<cmd><C-U>TmuxNavigateDown<cr>',
+          desc = 'tmux: Navigate Down',
+        },
+        { '<c-k>', '<cmd><C-U>TmuxNavigateUp<cr>', desc = 'tmux: Navigate Up' },
+        {
+          '<c-l>',
+          '<cmd><C-U>TmuxNavigateRight<cr>',
+          desc = 'tmux: Navigate Right',
+        },
+        {
+          '<c-\\>',
+          '<cmd><C-U>TmuxNavigatePrevious<cr>',
+          desc = 'tmux: Navigate Previous',
+        },
+      },
+
+      -- ── Old habits ──────────────────────────────────────────────────────
+      { '<C-s>', '<cmd>w<CR>', desc = 'Save file' },
+
+      -- ── Text manipulation in visual mode ────────────────────────────────
+      {
+        mode = 'v',
+        { '>', '>gv', desc = 'Indent Right' },
+        { '<', '<gv', desc = 'Indent Left' },
+        { 'J', "<cmd>m '>+1<CR>gv=gv", desc = 'Move Block Down' },
+        { 'K', "<cmd>m '<-2<CR>gv=gv", desc = 'Move Block Up' },
+      },
+
+      -- ── LSP ─────────────────────────────────────────────────────────────
+      {
+        '<C-k>',
+        '<cmd>lua vim.lsp.buf.signature_help()<CR>',
+        desc = 'LSP: Signature Documentation',
+      },
+      {
+        'K',
+        '<cmd>Lspsaga hover_doc<cr>',
+        desc = 'LSPSaga: Hover Documentation',
+      },
+
+      { 'd', group = 'Diagnostics' },
+      {
+        {
+          'dn',
+          '<cmd>lua vim.diagnostic.goto_next()<CR>',
+          desc = 'Diagnostic: Goto Next',
+        },
+        {
+          'dp',
+          '<cmd>lua vim.diagnostic.goto_prev()<CR>',
+          desc = 'Diagnostic: Goto Prev',
+        },
+      },
+      {
+        { 'g', group = 'Goto' },
+        {
+          'gD',
+          '<cmd>lua vim.lsp.buf.declaration()<CR>',
+          desc = 'LSP: Goto Declaration',
+        },
+        {
+          'gI',
+          '<cmd>lua vim.lsp.buf.implementation()<CR>',
+          desc = 'LSP: Goto Implementation',
+        },
+        {
+          'gR',
+          '<cmd>Trouble lsp_references<cr>',
+          desc = 'Toggle LSP References',
+        },
+        {
+          'gd',
+          '<cmd>lua vim.lsp.buf.definition()<CR>',
+          desc = 'LSP: Goto Definition',
+        },
+        {
+          'gr',
+          '<cmd>lua require("telescope.builtin").lsp_references()<CR>',
+          desc = 'LSP: Goto References',
+        },
+      },
+
+      -- ── Misc keybinds ───────────────────────────────────────────────────
+      -- Sublime-like shortcut 'go to file' ctrl+p.
+      {
+        '<C-p>',
+        '<cmd>Telescope find_files<CR>',
+        desc = 'Search for files starting at current directory.',
+      },
+      { 'QQ', '<cmd>q!<CR>', desc = 'Quit without saving' },
+      { 'WW', '<cmd>w!<CR>', desc = 'Force write to file' },
+      { 'ss', '<cmd>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>,', '<cmd>vertical resize -10<CR>', desc = 'V Resize -' },
+      { '<C-w>.', '<cmd>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>', '<cmd>noh<CR>', desc = 'Clear search highlights' },
     }
   end,
 }

config/nvim/lua/spell/en.utf-8.add

@@ -1,13 +0,0 @@
-#'ve
-i/!
-i've/!
-I've
-I
-good
-#rd
-#rd/!
-#rd
-#rd
-#rd/!
-#rd
-wrd/!

docs/nvim-keybindings.md

@@ -2,101 +2,98 @@
 
 ```txt
 
-n  <Space>zg   * :Rg<CR>
+n  <Space>/    * <Lua 380: ~/.config/nvim/lua/plugins/telescope.lua:82>
-                 FZF: search with rg (aka live grep).
+                 [/] Fuzzily search in current buffer]
-n  <Space>zm   * :Maps<CR>
+n  <Space>hw   * <Lua 42: ~/.config/nvim/lua/plugins/harpoon.lua:40>
-                 FZF: search mappings.
+                 Open harpoon window with telescope
-n  <Space>zh   * :History<CR>
+n  <Space>1    * <Lua 40: ~/.config/nvim/lua/plugins/harpoon.lua:68>
-                 FZF: search history of opened files
+                 harpoon to file 1
-n  <Space>zb   * :Buffers<CR>
+n  <Space>hn   * <Lua 39: ~/.config/nvim/lua/plugins/harpoon.lua:61>
-                 FZF: search open buffers.
+                 harpoon to next file
-n  <Space>zt   * :Windows<CR>
+n  <Space>hp   * <Lua 38: ~/.config/nvim/lua/plugins/harpoon.lua:54>
-                 FZF: search open tabs.
+                 harpoon to previous file
-n  <Space>zc   * :Commands<CR>
+n  <Space>ha   * <Lua 37: ~/.config/nvim/lua/plugins/harpoon.lua:47>
-                 FZF: search commands.
+                 harpoon file
-n  <Space>zf   * :FZF<Space>
+n  <Space>5    * <Lua 36: ~/.config/nvim/lua/plugins/harpoon.lua:96>
-                 FZF: search for files in given path.
+                 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>
+n  <Space>xx   * <Cmd>Trouble<CR>
-                 [/] Fuzzily search in current buffer]
+                 Toggle Trouble
-n  <Space>ht   * <Lua 267: ~/.config/nvim/lua/plugins/harpoon.lua:16>
+n  <Space>xq   * <Cmd>Trouble quickfix<CR>
-n  <Space>1    * <Lua 65: ~/.config/nvim/lua/plugins/harpoon.lua:68>
+                 Toggle Quickfix
-                 harpoon to file 1
+n  <Space>xl   * <Cmd>Trouble loclist<CR>
-n  <Space>xn   * <Lua 64: ~/.config/nvim/lua/plugins/harpoon.lua:61>
+                 Toggle Loclist
-                 harpoon to next file
+n  <Space>xd   * <Cmd>Trouble document_diagnostics<CR>
-n  <Space>xN   * <Lua 63: ~/.config/nvim/lua/plugins/harpoon.lua:54>
+                 Toggle Document Diagnostics
-                 harpoon to previous file
+n  <Space>xw   * <Cmd>Trouble workspace_diagnostics<CR>
-n  <Space>xa   * <Lua 136: ~/.config/nvim/lua/plugins/harpoon.lua:40>
+                 Toggle Workspace Diagnostics
-                 Open harpoon window
+n  <Space>?s   * <Cmd>Neoconf show<CR>
-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>
                  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>
+n  <Space>e    * <Lua 81: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 [qq] Quickly Quit
+                 NeoTree reveal
-n  <Space>xe   * <Cmd>GoIfErr<CR>
+n  <Space>cg   * <Lua 50: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Go If Error
+                 Generate annotations
-v  <Space>     * <Nop>
+n  <Space>zm   * <Lua 49: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-n  <Space>     * <Nop>
+                 FZF: search mappings.
-n  <Space>qf   * :q<CR>
+n  <Space>zh   * <Lua 48: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Quicker close split
+                 FZF: search history of opened files
-n  <Space>bw     :Bwipeout<CR>
+n  <Space>zb   * <Lua 47: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Buffer: Wipeout
+                 FZF: search open buffers.
-n  <Space>bd     :Bdelete<CR>
+n  <Space>zt   * <Lua 46: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Buffer: Delete
+                 FZF: search open tabs.
-n  <Space>bl     :bnext<CR>
+n  <Space>zc   * <Lua 32: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Buffer: Next
+                 FZF: search commands.
-n  <Space>bh     :bprev<CR>
+n  <Space>zf   * <Lua 31: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Buffer: Prev
+                 FZF: search for files in given path.
-n  <Space>bj     :bfirst<CR>
+n  <Space>zg   * <Lua 25: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Buffer: First
+                 FZF: search with rg (aka live grep).
-n  <Space>bk     :blast<CR>
+n  <Space>dc   * <Lua 45: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Buffer: Last
+                 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  K           * <Cmd>lua vim.lsp.buf.hover()<CR>
-n  E             $
-n  K           * <Lua 82: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
                  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>
+n  dp          * <Cmd>lua vim.diagnostic.goto_prev()<CR>
-                 Diagnostic: Goto Next
-n  dp          * <Lua 80: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
                  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>
+n  gD          * <Cmd>lua vim.lsp.buf.declaration()<CR>
-                 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>
                  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>
+n  <C-K>       * :<C-U>TmuxNavigateUp<CR>
-v  <Plug>VSurround * :<C-U>call <SNR>28_opfunc(visualmode(),visualmode() ==# 'V' ? 1 : 0)<CR>
+s  <Plug>luasnip-jump-prev * <Lua 283: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:57>
-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>
                  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>
+n  <C-P>       * <Lua 26: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Save file
+                 FZF: search for files starting at current directory.
-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-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

scripts/install-cargo-packages.sh

@@ -3,7 +3,7 @@
 #
 # shellcheck source=shared.sh
 
-echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
 exit 0
 
 eval "$HOME/.dotfiles/config/shared.sh"

scripts/install-fzf.sh

@@ -2,6 +2,10 @@
 #
 # Install fzf
 #
+
+echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
+exit 0
+
 # shellcheck source=shared.sh
 eval "$DOTFILES/config/shared.sh"
 

scripts/install-go-packages.sh

@@ -3,7 +3,7 @@
 #
 # shellcheck source=shared.sh
 
-echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
 exit 0
 
 eval "$DOTFILES/config/shared.sh"

scripts/install-npm-packages.sh

@@ -3,7 +3,7 @@
 #
 # shellcheck source=shared.sh
 
-echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
 exit 0
 
 eval "$DOTFILES/config/shared.sh"

scripts/install-pip-packages.sh

@@ -3,7 +3,7 @@
 #
 # shellcheck source=shared.sh
 
-echo "This file has been deprecated in favor of asdf. Please use asdf instead."
+echo "This file ($0) has been deprecated in favor of asdf. Please use asdf instead."
 exit 0
 
 source "${DOTFILES}/config/shared.sh"