NeoVim & VIM

- Testing setup through neotest plugin
- Spellcheck enabled on markdown and text files
- Diagnosis summary through trouble plugin
- Code completion keybindings improved
- Auto-formatting through conform plugin
- Reactjs context aware commenting through nvim-ts-context-commentstring
- Auto HTML tag completion through nvim-ts-autotag
- CSS color highlight through nvim-highlight-colors
- Lualine: breadcrumbs, git status, single line
- Auto restore neovim sessions
- Better keyboard maps

Shell
- Aliases now load from .bashrc or .zshrc
- Bash & zsh shortcuts to easy open and create projects
- zoxide instead of cd when installed
- bootstrap.sh shellhardened

common/.config/nvim/lua/config/autocmd.lua

@@ -0,0 +1,20 @@
+-- Auto reload existing session
+vim.api.nvim_create_autocmd("VimEnter", {
+    group = vim.api.nvim_create_augroup("restore_session", { clear = true }),
+    callback = function()
+        -- If nvim started with arguments, do NOT restore
+        if vim.fn.argc() ~= 0 then return end
+        require("persistence").load()
+    end,
+    nested = true,
+})
+
+-- Enable spell check on markdown and text files
+vim.api.nvim_create_autocmd("FileType", {
+    group = vim.api.nvim_create_augroup("spell_check_text_files", { clear = true }),
+    pattern = { "markdown", "gitcommit", "text" },
+    callback = function()
+        vim.opt.spell = true
+    end,
+    nested = true,
+})

common/.config/nvim/lua/config/init.lua

@@ -1,2 +1,3 @@
 require("config.keymaps")
 require("config.options")
+require("config.autocmd")

common/.config/nvim/lua/config/keymaps.lua

@@ -4,7 +4,14 @@ if vim.loop.fs_stat(vim_mappings) then
     vim.cmd("source " .. vim_mappings)
 end
 
+vim.keymap.set({ "n" }, "<leader><CR>", function()
+    vim.cmd("source " .. vim.fn.expand(vim.fn.stdpath("config") .. "/init.lua"))
+end, { desc = "Apply NVIM config changes" })
+
+vim.keymap.set({ "n", "v" }, "<leader>y", '"+y', { desc = "Copy to system clipboard" })
+vim.keymap.set({ "n", "v" }, "<leader>p", '"+p', { desc = "Paste from system clipboard" })
 vim.keymap.set({ "n" }, "<C-c>", "<cmd> %y+ <CR>", { desc = "Copy entire content of the current buffer" })
+
 vim.keymap.set("n", "<leader>fn", "<cmd>enew<CR>", { desc = "Create new file/buffer" })
 
 -- Remap for dealing with word wrap
@@ -29,6 +36,12 @@ vim.keymap.set("n", "<A-k>", "<cmd>m .-2<cr>==", { desc = "Move line up" })
 vim.keymap.set("v", "<A-j>", ":m '>+1<cr>gv=gv", { desc = "Move line down" })
 vim.keymap.set("v", "<A-k>", ":m '<-2<cr>gv=gv", { desc = "Move line up" })
 
+vim.keymap.set("i", "<C-BS>", "<C-g>u<C-w>", { desc = "Add undo breakpoint and delete last word" })
+vim.keymap.set("i", ",", ",<C-g>u", { desc = "Auto add undo breakpoints on ','" })
+vim.keymap.set("i", ".", ".<C-g>u", { desc = "Auto add undo breakpoints on '.'" })
+vim.keymap.set("i", ";", ";<C-g>u", { desc = "Auto add undo breakpoints on ';'" })
+vim.keymap.set("i", "\r", "\r<C-g>u", { desc = "Auto add undo breakpoints on new lines" })
+
 -- Traverse Buffer
 vim.keymap.set("n", "<Tab>", "<cmd>bnext<CR>", { desc = "Switch to next buffer" })
 vim.keymap.set("n", "<S-Tab>", "<cmd>bprevious<CR>", { desc = "Switch to previous buffer" })
@@ -38,7 +51,7 @@ vim.keymap.set({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Sav
 vim.keymap.set({ "i", "x", "n", "s" }, "<C-q>", "<cmd>wqa<cr><esc>", { desc = "Save all files and Quit Neovim" })
 
 -- Close Current Buffer
-vim.keymap.set({ "n", "v" }, "<leader>bx", function()
+vim.keymap.set({ "n", "v" }, "<leader>xb", function()
     if vim.bo.modified then
         vim.cmd.write()
     end
@@ -46,17 +59,32 @@ vim.keymap.set({ "n", "v" }, "<leader>bx", function()
 end, { desc = "Save and close current buffer" })
 
 -- Traverse quickfix
+-- TODO: Friendly message when no quickfix
 vim.keymap.set("n", "[q", vim.cmd.cprev, { desc = "Previous quickfix" })
 vim.keymap.set("n", "]q", vim.cmd.cnext, { desc = "Next quickfix" })
 
 -- Clear searches
 vim.keymap.set({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
-vim.keymap.set("n", "<leader>/", "<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>",
-    { desc = "Redraw / clear hlsearch / diff update" })
+vim.keymap.set("n", "<leader>/", "<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>", { desc = "Redraw / clear hlsearch / diff update" })
 
+-- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n
 vim.keymap.set("n", "n", "'Nn'[v:searchforward].'zv'", { expr = true, desc = "Next search result" })
-vim.keymap.set("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
-vim.keymap.set("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
+vim.keymap.set({ "x", "o" }, "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
 vim.keymap.set("n", "N", "'nN'[v:searchforward].'zv'", { expr = true, desc = "Prev search result" })
-vim.keymap.set("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
-vim.keymap.set("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
+vim.keymap.set({ "x", "o" }, "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
+
+-- diagnostic: From LazyVim
+local diagnostic_goto = function(next, severity)
+    local go = next and vim.diagnostic.goto_next or vim.diagnostic.goto_prev
+    severity = severity and vim.diagnostic.severity[severity] or nil
+    return function()
+        go({ severity = severity })
+    end
+end
+vim.keymap.set("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
+vim.keymap.set("n", "]d", diagnostic_goto(true), { desc = "Next Diagnostic" })
+vim.keymap.set("n", "[d", diagnostic_goto(false), { desc = "Prev Diagnostic" })
+vim.keymap.set("n", "]e", diagnostic_goto(true, "ERROR"), { desc = "Next Error" })
+vim.keymap.set("n", "[e", diagnostic_goto(false, "ERROR"), { desc = "Prev Error" })
+vim.keymap.set("n", "]w", diagnostic_goto(true, "WARN"), { desc = "Next Warning" })
+vim.keymap.set("n", "[w", diagnostic_goto(false, "WARN"), { desc = "Prev Warning" })

common/.config/nvim/lua/config/util.lua

@@ -0,0 +1,121 @@
+-- Required mostly be lualine plugin
+-- Copied from Lazyvim
+local M = {
+    icons = {
+        misc = {
+            dots = "󰇘",
+        },
+        dap = {
+            Stopped = { "󰁕 ", "DiagnosticWarn", "DapStoppedLine" },
+            Breakpoint = " ",
+            BreakpointCondition = " ",
+            BreakpointRejected = { " ", "DiagnosticError" },
+            LogPoint = ".>",
+        },
+        diagnostics = { Error = " ", Warn = " ", Hint = " ", Info = " " },
+        git = { added = " ", modified = " ", removed = " " },
+        kinds = {
+            Array = " ",
+            Boolean = "󰨙 ",
+            Class = " ",
+            Codeium = "󰘦 ",
+            Color = " ",
+            Control = " ",
+            Collapsed = " ",
+            Constant = "󰏿 ",
+            Constructor = " ",
+            Copilot = " ",
+            Enum = " ",
+            EnumMember = " ",
+            Event = " ",
+            Field = " ",
+            File = "󰈙 ",
+            Folder = " ",
+            Function = "󰊕 ",
+            Interface = " ",
+            Key = "󰌋 ",
+            Keyword = " ",
+            Method = "󰊕 ",
+            Module = " ",
+            Namespace = "󰦮 ",
+            Null = "󰟢 ",
+            Number = "󰎠 ",
+            Object = " ",
+            Operator = " ",
+            Package = " ",
+            Property = " ",
+            Reference = " ",
+            Snippet = " ",
+            String = " ",
+            Struct = "󰆼 ",
+            TabNine = "󰏚 ",
+            Text = " ",
+            TypeParameter = " ",
+            Unit = " ",
+            Value = " ",
+            Variable = "󰀫 ",
+        },
+    },
+}
+
+function M.fg(name)
+    ---@type {foreground?:number}?
+    ---@diagnostic disable-next-line: deprecated
+    local hl = vim.api.nvim_get_hl and vim.api.nvim_get_hl(0, { name = name }) or vim.api.nvim_get_hl_by_name(name, true)
+    ---@diagnostic disable-next-line: undefined-field
+    local fg = hl and (hl.fg or hl.foreground)
+    return fg and { fg = string.format("#%06x", fg) } or nil
+end
+
+---@param opts? lsp.Client.filter
+function M.get_clients(opts)
+    local ret = {} ---@type lsp.Client[]
+    if vim.lsp.get_clients then
+        ret = vim.lsp.get_clients(opts)
+    else
+        ---@diagnostic disable-next-line: deprecated
+        ret = vim.lsp.get_active_clients(opts)
+        if opts and opts.method then
+            ---@param client lsp.Client
+            ret = vim.tbl_filter(function(client)
+                return client.supports_method(opts.method, { bufnr = opts.bufnr })
+            end, ret)
+        end
+    end
+    return opts and opts.filter and vim.tbl_filter(opts.filter, ret) or ret
+end
+
+---@param from string
+---@param to string
+function M.on_rename(from, to)
+    local clients = M.get_clients()
+    for _, client in ipairs(clients) do
+        if client.supports_method("workspace/willRenameFiles") then
+            ---@diagnostic disable-next-line: invisible
+            local resp = client.request_sync("workspace/willRenameFiles", {
+                files = {
+                    {
+                        oldUri = vim.uri_from_fname(from),
+                        newUri = vim.uri_from_fname(to),
+                    },
+                },
+            }, 1000, 0)
+            if resp and resp.result ~= nil then
+                vim.lsp.util.apply_workspace_edit(resp.result, client.offset_encoding)
+            end
+        end
+    end
+end
+
+---@param on_attach fun(client, buffer)
+function M.on_lsp_attach(on_attach)
+    vim.api.nvim_create_autocmd("LspAttach", {
+        callback = function(args)
+            local buffer = args.buf ---@type number
+            local client = vim.lsp.get_client_by_id(args.data.client_id)
+            on_attach(client, buffer)
+        end,
+    })
+end
+
+return M