Remove config for neoformat

- remove wilder.nvim and its config
- add blink.cmp config as backup solution

.gitignore

@@ -4,3 +4,4 @@ en.utf-8.add.spl
 .netrwhist
 *.log
 .DS_Store
+lazy-lock.json

README.md

@@ -9,11 +9,8 @@
     <a>
       <img alt="Windows" src="https://img.shields.io/badge/Windows-%23.svg?style=flat-square&logo=windows&color=0078D6&logoColor=white" />
     </a>
-    <a href="https://github.com/jdhao/nvim-config/releases/latest">
-      <img alt="Latest release" src="https://img.shields.io/github/v/release/jdhao/nvim-config" />
-    </a>
     <a href="https://github.com/neovim/neovim/releases/tag/stable">
-      <img src="https://img.shields.io/badge/Neovim-0.10.2-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
+      <img src="https://img.shields.io/badge/Neovim-0.11.2-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
     </a>
     <a href="https://github.com/jdhao/nvim-config/search?l=vim-script">
       <img src="https://img.shields.io/github/languages/top/jdhao/nvim-config" alt="Top languages"/>
@@ -21,9 +18,6 @@
     <a href="https://github.com/jdhao/nvim-config/graphs/commit-activity">
       <img src="https://img.shields.io/github/commit-activity/m/jdhao/nvim-config?style=flat-square" />
     </a>
-    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.10.1">
-      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.10.1?style=flat-square" />
-    </a>
     <a href="https://github.com/jdhao/nvim-config/graphs/contributors">
       <img src="https://img.shields.io/github/contributors/jdhao/nvim-config?style=flat-square" />
     </a>
@@ -62,7 +56,7 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + Language server protocol (LSP) support via [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig).
 + Git integration via [vim-fugitive](https://github.com/tpope/vim-fugitive).
 + Better escaping from insert mode via [better-escape.vim](https://github.com/nvim-zh/better-escape.vim).
-+ Ultra-fast project-wide fuzzy searching via [LeaderF](https://github.com/Yggdroot/LeaderF).
++ Ultra-fast project-wide fuzzy searching via [fzf-lua](https://github.com/ibhagwan/fzf-lua).
 + Faster code commenting via [vim-commentary](https://github.com/tpope/vim-commentary).
 + Faster matching pair insertion and jump via [nvim-autopairs](https://github.com/windwp/nvim-autopairs).
 + Smarter and faster matching pair management (add, replace or delete) via [vim-sandwich](https://github.com/machakann/vim-sandwich).
@@ -72,7 +66,6 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + File tree explorer via [nvim-tree.lua](https://github.com/nvim-tree/nvim-tree.lua).
 + Better quickfix list with [nvim-bqf](https://github.com/kevinhwang91/nvim-bqf).
 + Show search index and count with [nvim-hlslens](https://github.com/kevinhwang91/nvim-hlslens).
-+ Command line auto-completion via [wilder.nvim](https://github.com/gelguy/wilder.nvim).
 + User-defined mapping hint via [which-key.nvim](https://github.com/folke/which-key.nvim).
 + Asynchronous code execution via [asyncrun.vim](https://github.com/skywind3000/asyncrun.vim).
 + Code highlighting via [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter).
@@ -82,7 +75,6 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + LaTeX editing and previewing via [vimtex](https://github.com/lervag/vimtex)
 + Animated GUI style notification via [nvim-notify](https://github.com/rcarriga/nvim-notify).
 + Tags navigation via [vista](https://github.com/liuchengxu/vista.vim).
-+ Code formatting via [Neoformat](https://github.com/sbdchd/neoformat).
 + Undo management via [vim-mundo](https://github.com/simnalamburt/vim-mundo)
 + Code folding with [nvim-ufo](https://github.com/kevinhwang91/nvim-ufo) and [statuscol.nvim](https://github.com/luukvbaal/statuscol.nvim)
 + ......
@@ -97,10 +89,10 @@ For more UI demos, check [here](https://github.com/jdhao/nvim-config/issues/15).
 <img src="https://user-images.githubusercontent.com/16662357/183256752-fb23b215-a6b8-4646-beed-9999f52d53f1.png" width="800">
 </p>
 
-## File fuzzy finding using LeaderF
+## File fuzzy finding using fzf-lua
 
 <p align="center">
-<img src="https://user-images.githubusercontent.com/16662357/183257017-2d9d7605-3c4b-4e1d-8955-30998f9b6f28.gif" width="800">
+<img src="https://github.com/user-attachments/assets/3199e35d-121a-487b-bfd1-58eb69b0b48a" width="800">
 </p>
 
 ## Code autocompletion with nvim-cmp
@@ -115,12 +107,6 @@ For more UI demos, check [here](https://github.com/jdhao/nvim-config/issues/15).
 <img src="https://user-images.githubusercontent.com/16662357/128590833-aaa05d53-19ef-441d-a5a9-ba1bbd3936c1.gif" width="800">
 </p>
 
-## Command-line autocompletion with wilder.nvim
-
-<p align="center">
-<img src="https://user-images.githubusercontent.com/16662357/147677787-8e5d229a-a16a-420e-98f5-88f2a1be84a2.gif" width="800">
-</p>
-
 ## Tags
 
 <p align="center">

after/ftplugin/markdown.lua

@@ -0,0 +1,107 @@
+local function add_reference_at_end(label, url, title)
+  vim.schedule(function()
+    local bufnr = vim.api.nvim_get_current_buf()
+    local line_count = vim.api.nvim_buf_line_count(bufnr)
+
+    -- Prepare reference definition
+    local ref_def = "[" .. label .. "]: " .. url
+    if title and title ~= "" then
+      ref_def = ref_def .. ' "' .. title .. '"'
+    end
+
+    -- Check if references section exists
+    local buffer_lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
+
+    local has_ref_section = false
+    for _, line in ipairs(buffer_lines) do
+      if line:match("^%s*<!%-%-.*[Rr]eferences.*%-%->[%s]*$") then
+        has_ref_section = true
+        break
+      end
+    end
+
+    local lines_to_add = {}
+    -- Add references header if it doesn't exist
+    if not has_ref_section then
+      if #lines_to_add == 0 then
+        table.insert(lines_to_add, "")
+      end
+      table.insert(lines_to_add, "<!-- References -->")
+    end
+
+    table.insert(lines_to_add, ref_def)
+
+    -- Insert at buffer end
+    vim.api.nvim_buf_set_lines(bufnr, line_count, line_count, false, lines_to_add)
+  end)
+end
+
+local function get_ref_link_labels()
+  local labels = {}
+  local seen = {} -- To avoid duplicates
+  local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false)
+
+  for _, line in ipairs(lines) do
+    -- Pattern explanation:
+    -- %[.-%] matches [link text] (non-greedy)
+    -- %[(.-)%] matches [label] and captures the label content
+    local start_pos = 1
+    while start_pos <= #line do
+      local match_start, match_end, label = string.find(line, "%[.-%]%[(.-)%]", start_pos)
+      if not match_start then
+        break
+      end
+
+      -- Only add unique labels
+      if label and label ~= "" and not seen[label] then
+        table.insert(labels, label)
+        seen[label] = true
+      end
+
+      start_pos = match_end + 1
+    end
+  end
+
+  return labels
+end
+
+local function count_consecutive_spaces(str)
+  -- Remove leading spaces first
+  local trimmed = str:match("^%s*(.*)")
+  local count = 0
+
+  -- Count each sequence of one or more consecutive spaces
+  for spaces in trimmed:gmatch("%s+") do
+    count = count + 1
+  end
+  return count
+end
+
+vim.api.nvim_buf_create_user_command(0, "AddRef", function(opts)
+  local args = vim.split(opts.args, " ", { trimempty = true })
+
+  if #args < 2 then
+    vim.print("Usage: :AddRef <label> <url>")
+    return
+  end
+
+  local label = args[1]
+  local url = args[2]
+
+  add_reference_at_end(label, url, "")
+end, {
+  desc = "Add reference link at buffer end",
+  nargs = "+",
+  complete = function(arg_lead, cmdline, curpos)
+    vim.print(string.format("arg_lead: '%s', cmdline: '%s', curpos: %d", arg_lead, cmdline, curpos))
+
+    -- only complete the first argument
+    if count_consecutive_spaces(cmdline) > 1 then
+      -- we are now starting the second argument, so no completion anymore
+      return {}
+    end
+
+    local ref_link_labels = get_ref_link_labels()
+    return ref_link_labels
+  end,
+})

after/ftplugin/python.vim

@@ -12,3 +12,5 @@ set tabstop=4       " number of visual spaces per TAB
 set softtabstop=4   " number of spaces in tab when editing
 set shiftwidth=4    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces
+
+nnoremap <buffer><silent> <space>f <cmd>silent !black %<CR>

after/lsp/clangd.lua

@@ -0,0 +1,3 @@
+return {
+  filetypes = { "c", "cpp", "cc" },
+}

after/lsp/ltex.lua

@@ -0,0 +1,8 @@
+return {
+  filetypes = { "text", "plaintex", "tex", "markdown" },
+  settings = {
+    ltex = {
+      language = "en",
+    },
+  },
+}

after/lsp/lua_ls.lua

@@ -0,0 +1,14 @@
+-- settings for lua-language-server can be found on https://luals.github.io/wiki/settings/
+return {
+  settings = {
+    Lua = {
+      runtime = {
+        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+        version = "LuaJIT",
+      },
+      hint = {
+        enable = true,
+      },
+    },
+  },
+}

after/lsp/pyright.lua

@@ -0,0 +1,51 @@
+-- For what diagnostic is enabled in which type checking mode, check doc:
+-- https://github.com/microsoft/pyright/blob/main/docs/configuration.md#diagnostic-settings-defaults
+-- Currently, the pyright also has some issues displaying hover documentation:
+-- https://www.reddit.com/r/neovim/comments/1gdv1rc/what_is_causeing_the_lsp_hover_docs_to_looks_like/
+
+local new_capability = {
+  -- this will remove some of the diagnostics that duplicates those from ruff, idea taken and adapted from
+  -- here: https://github.com/astral-sh/ruff-lsp/issues/384#issuecomment-1989619482
+  textDocument = {
+    publishDiagnostics = {
+      tagSupport = {
+        valueSet = { 2 },
+      },
+    },
+    hover = {
+      contentFormat = { "plaintext" },
+      dynamicRegistration = true,
+    },
+  },
+}
+
+return {
+  cmd = { "delance-langserver", "--stdio" },
+  settings = {
+    pyright = {
+      -- disable import sorting and use Ruff for this
+      disableOrganizeImports = true,
+      disableTaggedHints = false,
+    },
+    python = {
+      analysis = {
+        autoSearchPaths = true,
+        diagnosticMode = "workspace",
+        typeCheckingMode = "standard",
+        useLibraryCodeForTypes = true,
+        -- we can this setting below to redefine some diagnostics
+        diagnosticSeverityOverrides = {
+          deprecateTypingAliases = false,
+        },
+        -- inlay hint settings are provided by pylance?
+        inlayHints = {
+          callArgumentNames = "partial",
+          functionReturnTypes = true,
+          pytestParameters = true,
+          variableTypes = true,
+        },
+      },
+    },
+  },
+  capabilities = new_capability,
+}

after/lsp/ruff.lua

@@ -0,0 +1,8 @@
+return {
+  init_options = {
+    -- the settings can be found here: https://docs.astral.sh/ruff/editors/settings/
+    settings = {
+      organizeImports = true,
+    },
+  },
+}

autoload/utils.vim

@@ -10,23 +10,6 @@ function! s:Single_quote(str) abort
   return "'" . substitute(copy(a:str), "'", "''", 'g') . "'"
 endfunction
 
-" Check the syntax group in the current cursor position, see
-" https://stackoverflow.com/q/9464844/6064933 and
-" https://jordanelver.co.uk/blog/2015/05/27/working-with-vim-colorschemes/
-function! utils#SynGroup() abort
-  if !exists('*synstack')
-    return
-  endif
-  echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
-endfunction
-
-" Check if a colorscheme exists in runtimepath.
-" The following two functions are inspired by https://stackoverflow.com/a/5703164/6064933.
-function! utils#HasColorscheme(name) abort
-  let l:pat = printf('colors/%s.vim', a:name)
-  return !empty(globpath(&runtimepath, l:pat))
-endfunction
-
 " Custom fold expr, adapted from https://vi.stackexchange.com/a/9094/15292
 function! utils#VimFolds(lnum) abort
   " get content of current line and the line below
@@ -146,27 +129,6 @@ function! utils#iso_time(timestamp) abort
 
 endfunction
 
-" Check if we are inside a Git repo.
-function! utils#Inside_git_repo() abort
-  let res = system('git rev-parse --is-inside-work-tree')
-  if match(res, 'true') == -1
-    return v:false
-  else
-    " Manually trigger a special user autocmd InGitRepo (used lazyloading.
-    doautocmd User InGitRepo
-    return v:true
-  endif
-endfunction
-
-function! utils#GetGitBranch()
-  let l:res = systemlist('git rev-parse --abbrev-ref HEAD')[0]
-  if match(l:res, 'fatal') != -1
-    return ''
-  else
-    return l:res
-  endif
-endfunction
-
 " Redirect command output to a register for later processing.
 " Ref: https://stackoverflow.com/q/2573021/6064933 and https://unix.stackexchange.com/q/8101/221410 .
 function! utils#CaptureCommandOutput(command) abort

docs/nvim_setup_linux.sh

@@ -221,7 +221,7 @@ fi
 NVIM_DIR=$HOME/tools/nvim
 NVIM_SRC_NAME=$HOME/packages/nvim-linux64.tar.gz
 NVIM_CONFIG_DIR=$HOME/.config/nvim
-NVIM_LINK="https://github.com/neovim/neovim/releases/download/stable/nvim-linux64.tar.gz"
+NVIM_LINK="https://github.com/neovim/neovim/releases/download/stable/nvim-linux-x86_64.tar.gz"
 if [[ ! -f "$NVIM_DIR/bin/nvim" ]]; then
     echo "Installing Nvim"
     echo "Creating nvim directory under tools directory"

init.lua

@@ -13,7 +13,7 @@ vim.loader.enable()
 
 local utils = require("utils")
 
-local expected_version = "0.10.2"
+local expected_version = "0.11.2"
 utils.is_compatible_version(expected_version)
 
 local config_dir = vim.fn.stdpath("config")
@@ -29,5 +29,12 @@ require("custom-autocmd")
 require("mappings")
 -- all the plugins installed and their configurations
 vim.cmd("source " .. vim.fs.joinpath(config_dir, "viml_conf/plugins.vim"))
+
+-- diagnostic related config
+require("diagnostic-conf")
+
 -- colorscheme settings
-require("colorschemes")
+local color_scheme = require("colorschemes")
+
+-- Load a random colorscheme
+color_scheme.rand_colorscheme()

lua/colorschemes.lua

@@ -1,5 +1,4 @@
 --- This module will load a random colorscheme on nvim startup process.
-
 local utils = require("utils")
 
 local M = {}
@@ -8,9 +7,14 @@ local M = {}
 -- the same as the colorscheme name itself.
 M.colorscheme_conf = {
   onedark = function()
-    vim.cmd([[colorscheme onedark]])
+    -- Lua
+    require("onedark").setup {
+      style = "darker",
+    }
+    require("onedark").load()
   end,
   edge = function()
+    vim.g.edge_style = "default"
     vim.g.edge_enable_italic = 1
     vim.g.edge_better_performance = 1
 
@@ -26,41 +30,67 @@ M.colorscheme_conf = {
     -- foreground option can be material, mix, or original
     vim.g.gruvbox_material_foreground = "original"
     --background option can be hard, medium, soft
-    vim.g.gruvbox_material_background = "medium"
+    vim.g.gruvbox_material_background = "hard"
     vim.g.gruvbox_material_enable_italic = 1
     vim.g.gruvbox_material_better_performance = 1
 
     vim.cmd([[colorscheme gruvbox-material]])
   end,
   everforest = function()
+    vim.g.everforest_background = "hard"
     vim.g.everforest_enable_italic = 1
     vim.g.everforest_better_performance = 1
 
     vim.cmd([[colorscheme everforest]])
   end,
   nightfox = function()
-    vim.cmd([[colorscheme nordfox]])
+    vim.cmd([[colorscheme carbonfox]])
-  end,
-  catppuccin = function()
-    -- available option: latte, frappe, macchiato, mocha
-    vim.g.catppuccin_flavour = "frappe"
-    require("catppuccin").setup()
-
-    vim.cmd([[colorscheme catppuccin]])
   end,
   onedarkpro = function()
     -- set colorscheme after options
-    vim.cmd("colorscheme onedark_vivid")
+    -- onedark_vivid does not enough contrast
+    vim.cmd("colorscheme onedark_dark")
   end,
   material = function()
-    vim.g.material_style = "oceanic"
+    vim.g.material_style = "darker"
     vim.cmd("colorscheme material")
   end,
   arctic = function()
     vim.cmd("colorscheme arctic")
   end,
   kanagawa = function()
-    vim.cmd("colorscheme kanagawa-wave")
+    vim.cmd("colorscheme kanagawa-dragon")
+  end,
+  modus = function()
+    vim.cmd([[colorscheme modus]])
+  end,
+  jellybeans = function()
+    vim.cmd([[colorscheme jellybeans]])
+  end,
+  github = function()
+    vim.cmd([[colorscheme github_dark_default]])
+  end,
+  e_ink = function()
+    require("e-ink").setup()
+    vim.cmd.colorscheme("e-ink")
+  end,
+  ashen = function()
+    vim.cmd([[colorscheme ashen]])
+  end,
+  melange = function()
+    vim.cmd([[colorscheme melange]])
+  end,
+  makurai = function()
+    vim.cmd.colorscheme("makurai_warrior")
+  end,
+  vague = function()
+    vim.cmd([[colorscheme vague]])
+  end,
+  kanso = function()
+    vim.cmd([[colorscheme kanso]])
+  end,
+  citruszest = function()
+    vim.cmd([[colorscheme citruszest]])
   end,
 }
 
@@ -68,22 +98,8 @@ M.colorscheme_conf = {
 M.rand_colorscheme = function()
   local colorscheme = utils.rand_element(vim.tbl_keys(M.colorscheme_conf))
 
-  if not vim.tbl_contains(vim.tbl_keys(M.colorscheme_conf), colorscheme) then
-    local msg = "Invalid colorscheme: " .. colorscheme
-    vim.notify(msg, vim.log.levels.ERROR, { title = "nvim-config" })
-
-    return
-  end
-
   -- Load the colorscheme and its settings
   M.colorscheme_conf[colorscheme]()
-
-  if vim.g.logging_level == "debug" then
-    local msg = "Colorscheme: " .. colorscheme
-
-    vim.notify(msg, vim.log.levels.DEBUG, { title = "nvim-config" })
-  end
 end
 
--- Load a random colorscheme
+return M
-M.rand_colorscheme()

lua/config/dashboard-nvim.lua

@@ -23,19 +23,19 @@ conf.center = {
   {
     icon = "󰈞  ",
     desc = "Find  File                              ",
-    action = "Leaderf file --popup",
+    action = "FzfLua files",
     key = "<Leader> f f",
   },
   {
     icon = "󰈢  ",
     desc = "Recently opened files                   ",
-    action = "Leaderf mru --popup",
+    action = "FzfLua oldfiles",
     key = "<Leader> f r",
   },
   {
     icon = "󰈬  ",
     desc = "Project grep                            ",
-    action = "Leaderf rg --popup",
+    action = "FzfLua live_grep",
     key = "<Leader> f g",
   },
   {

lua/config/fzf-lua.lua

@@ -0,0 +1,18 @@
+require("fzf-lua").setup {
+  defaults = {
+    file_icons = "mini",
+  },
+  winopts = {
+    row = 0.5,
+    height = 0.7,
+  },
+  files = {
+    previewer = false,
+  },
+}
+
+vim.keymap.set("n", "<leader>ff", "<cmd>FzfLua files<cr>", { desc = "Fuzzy find files" })
+vim.keymap.set("n", "<leader>fg", "<cmd>FzfLua live_grep<cr>", { desc = "Fuzzy grep files" })
+vim.keymap.set("n", "<leader>fh", "<cmd>FzfLua helptags<cr>", { desc = "Fuzzy grep tags in help files" })
+vim.keymap.set("n", "<leader>ft", "<cmd>FzfLua btags<cr>", { desc = "Fuzzy search buffer tags" })
+vim.keymap.set("n", "<leader>fb", "<cmd>FzfLua buffers<cr>", { desc = "Fuzzy search opened buffers" })

lua/config/git-conflict.lua

@@ -0,0 +1,12 @@
+require("git-conflict").setup {}
+
+vim.api.nvim_create_autocmd("User", {
+  pattern = "GitConflictResolved",
+  callback = function()
+    -- clear qf list
+    vim.fn.setqflist({}, "r")
+
+    -- reopen it?
+    vim.cmd([[GitConflictListQf]])
+  end,
+})

lua/config/gitsigns.lua

@@ -8,7 +8,7 @@ gs.setup {
     topdelete = { text = "‾" },
     changedelete = { text = "│" },
   },
-  word_diff = true,
+  word_diff = false,
   on_attach = function(bufnr)
     local function map(mode, l, r, opts)
       opts = opts or {}
@@ -38,10 +38,10 @@ gs.setup {
     end, { expr = true, desc = "previous hunk" })
 
     -- Actions
-    map("n", "<leader>hp", gs.preview_hunk)
+    map("n", "<leader>hp", gs.preview_hunk, { desc = "preview hunk" })
     map("n", "<leader>hb", function()
       gs.blame_line { full = true }
-    end)
+    end, { desc = "blame hunk" })
   end,
 }
 

lua/config/glance.lua

@@ -0,0 +1,12 @@
+local glance = require("glance")
+
+glance.setup {
+  height = 25,
+  border = {
+    enable = true,
+  },
+}
+
+vim.keymap.set("n", "<space>gd", "<cmd>Glance definitions<cr>")
+vim.keymap.set("n", "<space>gr", "<cmd>Glance references<cr>")
+vim.keymap.set("n", "<space>gi", "<cmd>Glance implementations<cr>")

lua/config/hlslens.lua

@@ -16,7 +16,7 @@ local activate_hlslens = function(direction)
   if not status then
     local start_idx, _ = string.find(msg, "E486", 1, true)
     local msg_part = string.sub(msg, start_idx)
-    api.nvim_err_writeln(msg_part)
+    api.nvim_echo({ { msg_part } }, true, { err = true })
     return
   end
 
@@ -40,7 +40,7 @@ local check_cursor_word = function()
   local result = cursor_word == ""
   if result then
     local msg = "E348: No string under cursor"
-    api.nvim_err_writeln(msg)
+    api.nvim_echo({ { msg } }, true, { err = true })
   end
 
   return result, cursor_word

lua/config/indent-blankline.lua

@@ -1,36 +0,0 @@
-local api = vim.api
-
-local exclude_ft = { "help", "git", "markdown", "snippets", "text", "gitconfig", "alpha", "dashboard" }
-
-require("ibl").setup {
-  indent = {
-    -- -- U+2502 may also be a good choice, it will be on the middle of cursor.
-    -- -- U+250A is also a good choice
-    char = "▏",
-  },
-  scope = {
-    show_start = false,
-    show_end = false,
-  },
-  exclude = {
-    filetypes = exclude_ft,
-    buftypes = { "terminal" },
-  },
-}
-
-local gid = api.nvim_create_augroup("indent_blankline", { clear = true })
-api.nvim_create_autocmd("InsertEnter", {
-  pattern = "*",
-  group = gid,
-  command = "IBLDisable",
-})
-
-api.nvim_create_autocmd("InsertLeave", {
-  pattern = "*",
-  group = gid,
-  callback = function()
-    if not vim.tbl_contains(exclude_ft, vim.bo.filetype) then
-      vim.cmd([[IBLEnable]])
-    end
-  end,
-})

lua/config/lightbulb.lua

@@ -0,0 +1,20 @@
+---@diagnostic disable: missing-fields
+require("nvim-lightbulb").setup {
+  autocmd = {
+    enabled = true,
+    updatetime = -1,
+  },
+  ---@diagnostic disable-next-line: unused-local
+  filter = function(client_name, result)
+    -- Ruff always sends these two actions even if there are no action to take,
+    -- so it is better to just ignore this to avoid noise. See also discussion below:
+    -- https://github.com/astral-sh/ruff-lsp/issues/91
+    local ignored_kinds = { "source.fixAll.ruff", "source.organizeImports.ruff" }
+
+    if vim.tbl_contains(ignored_kinds, result.kind) then
+      return false
+    end
+
+    return true
+  end,
+}

lua/config/lsp.lua

@@ -1,305 +1,143 @@
-local fn = vim.fn
-local api = vim.api
-local keymap = vim.keymap
-local lsp = vim.lsp
-local diagnostic = vim.diagnostic
-local lspconfig = require("lspconfig")
-
 local utils = require("utils")
 
--- set quickfix list from diagnostics in a certain buffer, not the whole workspace
-local set_qflist = function(buf_num, severity)
-  local diagnostics = nil
-  diagnostics = diagnostic.get(buf_num, { severity = severity })
-
-  local qf_items = diagnostic.toqflist(diagnostics)
-  vim.fn.setqflist({}, " ", { title = "Diagnostics", items = qf_items })
-
-  -- open quickfix by default
-  vim.cmd([[copen]])
-end
-
-local custom_attach = function(client, bufnr)
-  -- Mappings.
-  local map = function(mode, l, r, opts)
-    opts = opts or {}
-    opts.silent = true
-    opts.buffer = bufnr
-    keymap.set(mode, l, r, opts)
-  end
-
-  map("n", "gd", vim.lsp.buf.definition, { desc = "go to definition" })
-  map("n", "<C-]>", vim.lsp.buf.definition)
-  map("n", "K", vim.lsp.buf.hover)
-  map("n", "<C-k>", vim.lsp.buf.signature_help)
-  map("n", "<space>rn", vim.lsp.buf.rename, { desc = "varialbe rename" })
-  map("n", "gr", vim.lsp.buf.references, { desc = "show references" })
-  map("n", "[d", diagnostic.goto_prev, { desc = "previous diagnostic" })
-  map("n", "]d", diagnostic.goto_next, { desc = "next diagnostic" })
-  -- this puts diagnostics from opened files to quickfix
-  map("n", "<space>qw", diagnostic.setqflist, { desc = "put window diagnostics to qf" })
-  -- this puts diagnostics from current buffer to quickfix
-  map("n", "<space>qb", function()
-    set_qflist(bufnr)
-  end, { desc = "put buffer diagnostics to qf" })
-  map("n", "<space>ca", vim.lsp.buf.code_action, { desc = "LSP code action" })
-  map("n", "<space>wa", vim.lsp.buf.add_workspace_folder, { desc = "add workspace folder" })
-  map("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, { desc = "remove workspace folder" })
-  map("n", "<space>wl", function()
-    vim.print(vim.lsp.buf.list_workspace_folders())
-  end, { desc = "list workspace folder" })
-
-  -- Set some key bindings conditional on server capabilities
-  if client.server_capabilities.documentFormattingProvider and client.name ~= "lua_ls" then
-    map({ "n", "x" }, "<space>f", vim.lsp.buf.format, { desc = "format code" })
-  end
-
-  -- Uncomment code below to enable inlay hint from language server, some LSP server supports inlay hint,
-  -- but disable this feature by default, so you may need to enable inlay hint in the LSP server config.
-  -- vim.lsp.inlay_hint.enable(true, {buffer=bufnr})
-
-  api.nvim_create_autocmd("CursorHold", {
-    buffer = bufnr,
-    callback = function()
-      local float_opts = {
-        focusable = false,
-        close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
-        border = "rounded",
-        source = "always", -- show source in diagnostic popup window
-        prefix = " ",
-      }
-
-      if not vim.b.diagnostics_pos then
-        vim.b.diagnostics_pos = { nil, nil }
-      end
-
-      local cursor_pos = api.nvim_win_get_cursor(0)
-      if
-        (cursor_pos[1] ~= vim.b.diagnostics_pos[1] or cursor_pos[2] ~= vim.b.diagnostics_pos[2])
-        and #diagnostic.get() > 0
-      then
-        diagnostic.open_float(nil, float_opts)
-      end
-
-      vim.b.diagnostics_pos = cursor_pos
-    end,
-  })
-
-  -- The blow command will highlight the current variable and its usages in the buffer.
-  if client.server_capabilities.documentHighlightProvider then
-    vim.cmd([[
-      hi! link LspReferenceRead Visual
-      hi! link LspReferenceText Visual
-      hi! link LspReferenceWrite Visual
-    ]])
-
-    local gid = api.nvim_create_augroup("lsp_document_highlight", { clear = true })
-    api.nvim_create_autocmd("CursorHold", {
-      group = gid,
-      buffer = bufnr,
-      callback = function()
-        lsp.buf.document_highlight()
-      end,
-    })
-
-    api.nvim_create_autocmd("CursorMoved", {
-      group = gid,
-      buffer = bufnr,
-      callback = function()
-        lsp.buf.clear_references()
-      end,
-    })
-  end
-
-  if vim.g.logging_level == "debug" then
-    local msg = string.format("Language server %s started!", client.name)
-    vim.notify(msg, vim.log.levels.DEBUG, { title = "Nvim-config" })
-  end
-end
-
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
-
--- required by nvim-ufo
-capabilities.textDocument.foldingRange = {
-  dynamicRegistration = false,
-  lineFoldingOnly = true,
-}
-
--- For what diagnostic is enabled in which type checking mode, check doc:
--- https://github.com/microsoft/pyright/blob/main/docs/configuration.md#diagnostic-settings-defaults
--- Currently, the pyright also has some issues displaying hover documentation:
--- https://www.reddit.com/r/neovim/comments/1gdv1rc/what_is_causeing_the_lsp_hover_docs_to_looks_like/
-
-if utils.executable("pyright") then
-  local new_capability = {
-    -- this will remove some of the diagnostics that duplicates those from ruff, idea taken and adapted from
-    -- here: https://github.com/astral-sh/ruff-lsp/issues/384#issuecomment-1989619482
-    textDocument = {
-      publishDiagnostics = {
-        tagSupport = {
-          valueSet = { 2 },
-        },
-      },
-      hover = {
-        contentFormat = { "plaintext" },
-        dynamicRegistration = true,
-      },
-    },
-  }
-  local merged_capability = vim.tbl_deep_extend("force", capabilities, new_capability)
-
-  lspconfig.pyright.setup {
-    cmd = { "delance-langserver", "--stdio" },
-    on_attach = custom_attach,
-    capabilities = merged_capability,
-    settings = {
-      pyright = {
-        -- disable import sorting and use Ruff for this
-        disableOrganizeImports = true,
-        disableTaggedHints = false,
-      },
-      python = {
-        analysis = {
-          autoSearchPaths = true,
-          diagnosticMode = "workspace",
-          typeCheckingMode = "standard",
-          useLibraryCodeForTypes = true,
-          -- we can this setting below to redefine some diagnostics
-          diagnosticSeverityOverrides = {
-            deprecateTypingAliases = false,
-          },
-          -- inlay hint settings are provided by pylance?
-          inlayHints = {
-            callArgumentNames = "partial",
-            functionReturnTypes = true,
-            pytestParameters = true,
-            variableTypes = true,
-          },
-        },
-      },
-    },
-  }
-else
-  vim.notify("pyright not found!", vim.log.levels.WARN, { title = "Nvim-config" })
-end
-
-if utils.executable("ruff") then
-  require("lspconfig").ruff.setup {
-    on_attach = custom_attach,
-    capabilities = capabilities,
-    init_options = {
-      -- the settings can be found here: https://docs.astral.sh/ruff/editors/settings/
-      settings = {
-        organizeImports = true,
-      },
-    },
-  }
-end
-
--- Disable ruff hover feature in favor of Pyright
 vim.api.nvim_create_autocmd("LspAttach", {
-  group = vim.api.nvim_create_augroup("lsp_attach_disable_ruff_hover", { clear = true }),
+  group = vim.api.nvim_create_augroup("lsp_buf_conf", { clear = true }),
-  callback = function(args)
+  callback = function(event_context)
-    local client = vim.lsp.get_client_by_id(args.data.client_id)
+    local client = vim.lsp.get_client_by_id(event_context.data.client_id)
     -- vim.print(client.name, client.server_capabilities)
 
-    if client == nil then
+    if not client then
       return
     end
+
+    local bufnr = event_context.buf
+
+    -- Mappings.
+    local map = function(mode, l, r, opts)
+      opts = opts or {}
+      opts.silent = true
+      opts.buffer = bufnr
+      vim.keymap.set(mode, l, r, opts)
+    end
+
+    map("n", "gd", function()
+      vim.lsp.buf.definition {
+        on_list = function(options)
+          -- custom logic to avoid showing multiple definition when you use this style of code:
+          -- `local M.my_fn_name = function() ... end`.
+          -- See also post here: https://www.reddit.com/r/neovim/comments/19cvgtp/any_way_to_remove_redundant_definition_in_lua_file/
+
+          -- vim.print(options.items)
+          local unique_defs = {}
+          local def_loc_hash = {}
+
+          -- each item in options.items contain the location info for a definition provided by LSP server
+          for _, def_location in pairs(options.items) do
+            -- use filename and line number to uniquelly indentify a definition,
+            -- we do not expect/want multiple definition in single line!
+            local hash_key = def_location.filename .. def_location.lnum
+
+            if not def_loc_hash[hash_key] then
+              def_loc_hash[hash_key] = true
+              table.insert(unique_defs, def_location)
+            end
+          end
+
+          options.items = unique_defs
+
+          -- set the location list
+          ---@diagnostic disable-next-line: param-type-mismatch
+          vim.fn.setloclist(0, {}, " ", options)
+
+          -- open the location list when we have more than 1 definitions found,
+          -- otherwise, jump directly to the definition
+          if #options.items > 1 then
+            vim.cmd.lopen()
+          else
+            vim.cmd([[silent! lfirst]])
+          end
+        end,
+      }
+    end, { desc = "go to definition" })
+    map("n", "<C-]>", vim.lsp.buf.definition)
+    map("n", "K", function()
+      vim.lsp.buf.hover { border = "single", max_height = 25, max_width = 120 }
+    end)
+    map("n", "<C-k>", vim.lsp.buf.signature_help)
+    map("n", "<space>rn", vim.lsp.buf.rename, { desc = "varialbe rename" })
+    map("n", "<space>ca", vim.lsp.buf.code_action, { desc = "LSP code action" })
+    map("n", "<space>wa", vim.lsp.buf.add_workspace_folder, { desc = "add workspace folder" })
+    map("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, { desc = "remove workspace folder" })
+    map("n", "<space>wl", function()
+      vim.print(vim.lsp.buf.list_workspace_folders())
+    end, { desc = "list workspace folder" })
+
+    -- Set some key bindings conditional on server capabilities
+    -- Disable ruff hover feature in favor of Pyright
     if client.name == "ruff" then
       client.server_capabilities.hoverProvider = false
     end
+
+    -- Uncomment code below to enable inlay hint from language server, some LSP server supports inlay hint,
+    -- but disable this feature by default, so you may need to enable inlay hint in the LSP server config.
+    -- vim.lsp.inlay_hint.enable(true, {buffer=bufnr})
+
+    -- The blow command will highlight the current variable and its usages in the buffer.
+    if client.server_capabilities.documentHighlightProvider then
+      local gid = vim.api.nvim_create_augroup("lsp_document_highlight", { clear = true })
+      vim.api.nvim_create_autocmd("CursorHold", {
+        group = gid,
+        buffer = bufnr,
+        callback = function()
+          vim.lsp.buf.document_highlight()
+        end,
+      })
+
+      vim.api.nvim_create_autocmd("CursorMoved", {
+        group = gid,
+        buffer = bufnr,
+        callback = function()
+          vim.lsp.buf.clear_references()
+        end,
+      })
+    end
   end,
-  desc = "LSP: Disable hover capability from Ruff",
+  nested = true,
+  desc = "Configure buffer keymap and behavior based on LSP",
 })
 
-if utils.executable("ltex-ls") then
+-- Enable lsp servers when they are available
-  lspconfig.ltex.setup {
-    on_attach = custom_attach,
-    cmd = { "ltex-ls" },
-    filetypes = { "text", "plaintex", "tex", "markdown" },
-    settings = {
-      ltex = {
-        language = "en",
-      },
-    },
-    flags = { debounce_text_changes = 300 },
-  }
-end
 
-if utils.executable("clangd") then
+local capabilities = require("lsp_utils").get_default_capabilities()
-  lspconfig.clangd.setup {
-    on_attach = custom_attach,
-    capabilities = capabilities,
-    filetypes = { "c", "cpp", "cc" },
-    flags = {
-      debounce_text_changes = 500,
-    },
-  }
-end
 
--- set up vim-language-server
+vim.lsp.config("*", {
-if utils.executable("vim-language-server") then
+  capabilities = capabilities,
-  lspconfig.vimls.setup {
+  flags = {
-    on_attach = custom_attach,
+    debounce_text_changes = 500,
-    flags = {
+  },
-      debounce_text_changes = 500,
+})
-    },
-    capabilities = capabilities,
-  }
-else
-  vim.notify("vim-language-server not found!", vim.log.levels.WARN, { title = "Nvim-config" })
-end
 
--- set up bash-language-server
+-- A mapping from lsp server name to the executable name
-if utils.executable("bash-language-server") then
+local enabled_lsp_servers = {
-  lspconfig.bashls.setup {
+  pyright = "delance-langserver",
-    on_attach = custom_attach,
+  ruff = "ruff",
-    capabilities = capabilities,
+  lua_ls = "lua-language-server",
-  }
+  -- ltex = "ltex-ls",
-end
+  -- clangd = "clangd",
-
+  vimls = "vim-language-server",
--- settings for lua-language-server can be found on https://luals.github.io/wiki/settings/
+  bashls = "bash-language-server",
-if utils.executable("lua-language-server") then
+  yamlls = "yaml-language-server",
-  lspconfig.lua_ls.setup {
-    on_attach = custom_attach,
-    settings = {
-      Lua = {
-        runtime = {
-          -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-          version = "LuaJIT",
-        },
-        hint = {
-          enable = true,
-        },
-      },
-    },
-    capabilities = capabilities,
-  }
-end
-
--- Change diagnostic signs.
-fn.sign_define("DiagnosticSignError", { text = "🆇", texthl = "DiagnosticSignError" })
-fn.sign_define("DiagnosticSignWarn", { text = "⚠️", texthl = "DiagnosticSignWarn" })
-fn.sign_define("DiagnosticSignInfo", { text = "ℹ️", texthl = "DiagnosticSignInfo" })
-fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
-
--- global config for diagnostic
-diagnostic.config {
-  underline = false,
-  virtual_text = false,
-  signs = true,
-  severity_sort = true,
 }
 
--- lsp.handlers["textDocument/publishDiagnostics"] = lsp.with(lsp.diagnostic.on_publish_diagnostics, {
+for server_name, lsp_executable in pairs(enabled_lsp_servers) do
---   underline = false,
+  if utils.executable(lsp_executable) then
---   virtual_text = false,
+    vim.lsp.enable(server_name)
---   signs = true,
+  else
---   update_in_insert = false,
+    local msg = string.format(
--- })
+      "Executable '%s' for server '%s' not found! Server will not be enabled",
-
+      lsp_executable,
--- Change border of documentation hover window, See https://github.com/neovim/neovim/pull/13998.
+      server_name
-lsp.handlers["textDocument/hover"] = lsp.with(vim.lsp.handlers.hover, {
+    )
-  border = "rounded",
+    vim.notify(msg, vim.log.levels.WARN, { title = "Nvim-config" })
-})
+  end
+end

lua/config/lualine.lua

@@ -1,5 +1,70 @@
 local fn = vim.fn
 
+local git_status_cache = {}
+
+local on_exit_fetch = function(result)
+  if result.code == 0 then
+    git_status_cache.fetch_success = true
+  end
+end
+
+local function handle_numeric_result(cache_key)
+  return function(result)
+    if result.code == 0 then
+      git_status_cache[cache_key] = tonumber(result.stdout:match("(%d+)")) or 0
+    end
+  end
+end
+
+local async_cmd = function(cmd_str, on_exit)
+  local cmd = vim.tbl_filter(function(element)
+    return element ~= ""
+  end, vim.split(cmd_str, " "))
+
+  vim.system(cmd, { text = true }, on_exit)
+end
+
+local async_git_status_update = function()
+  -- Fetch the latest changes from the remote repository (replace 'origin' if needed)
+  async_cmd("git fetch origin", on_exit_fetch)
+  if not git_status_cache.fetch_success then
+    return
+  end
+
+  -- Get the number of commits behind
+  -- the @{upstream} notation is inspired by post: https://www.reddit.com/r/neovim/comments/t48x5i/git_branch_aheadbehind_info_status_line_component/
+  -- note that here we should use double dots instead of triple dots
+  local behind_cmd_str = "git rev-list --count HEAD..@{upstream}"
+  async_cmd(behind_cmd_str, handle_numeric_result("behind_count"))
+
+  -- Get the number of commits ahead
+  local ahead_cmd_str = "git rev-list --count @{upstream}..HEAD"
+  async_cmd(ahead_cmd_str, handle_numeric_result("ahead_count"))
+end
+
+local function get_git_ahead_behind_info()
+  async_git_status_update()
+
+  local status = git_status_cache
+  if not status then
+    return ""
+  end
+
+  local msg = ""
+
+  if type(status.ahead_count) == "number" and status.ahead_count > 0 then
+    local ahead_str = string.format("↑[%d] ", status.ahead_count)
+    msg = msg .. ahead_str
+  end
+
+  if type(status.behind_count) == "number" and status.behind_count > 0 then
+    local behind_str = string.format("↓[%d] ", status.behind_count)
+    msg = msg .. behind_str
+  end
+
+  return msg
+end
+
 local function spell()
   if vim.o.spell then
     return string.format("[SPELL]")
@@ -119,7 +184,7 @@ local virtual_env = function()
 end
 
 local get_active_lsp = function()
-  local msg = "No Active Lsp"
+  local msg = "🚫"
   local buf_ft = vim.api.nvim_get_option_value("filetype", {})
   local clients = vim.lsp.get_clients { bufnr = 0 }
   if next(clients) == nil then
@@ -144,10 +209,18 @@ require("lualine").setup {
     section_separators = "",
     disabled_filetypes = {},
     always_divide_middle = true,
+    refresh = {
+      statusline = 1000,
+    },
   },
   sections = {
     lualine_a = {
-      "mode",
+      {
+        "filename",
+        symbols = {
+          readonly = "[🔒]",
+        },
+      },
     },
     lualine_b = {
       {
@@ -159,21 +232,19 @@ require("lualine").setup {
         color = { gui = "italic,bold" },
       },
       {
-        virtual_env,
+        get_git_ahead_behind_info,
-        color = { fg = "black", bg = "#F1CA81" },
+        color = { fg = "#E0C479" },
-      },
-    },
-    lualine_c = {
-      {
-        "filename",
-        symbols = {
-          readonly = "[🔒]",
-        },
       },
       {
         "diff",
         source = diff,
       },
+      {
+        virtual_env,
+        color = { fg = "black", bg = "#F1CA81" },
+      },
+    },
+    lualine_c = {
       {
         "%S",
         color = { gui = "bold", fg = "cyan" },
@@ -184,22 +255,29 @@ require("lualine").setup {
       },
     },
     lualine_x = {
-      {
-        ime_state,
-        color = { fg = "black", bg = "#f46868" },
-      },
       {
         get_active_lsp,
-        icon = " LSP:",
+        icon = "📡",
       },
       {
         "diagnostics",
         sources = { "nvim_diagnostic" },
         symbols = { error = "🆇 ", warn = "⚠️ ", info = "ℹ️ ", hint = " " },
       },
+      {
+        trailing_space,
+        color = "WarningMsg",
+      },
+      {
+        mixed_indent,
+        color = "WarningMsg",
+      },
     },
     lualine_y = {
-      { "encoding", fmt = string.upper },
+      {
+        "encoding",
+        fmt = string.upper,
+      },
       {
         "fileformat",
         symbols = {
@@ -209,16 +287,12 @@ require("lualine").setup {
         },
       },
       "filetype",
+      {
+        ime_state,
+        color = { fg = "black", bg = "#f46868" },
+      },
     },
     lualine_z = {
-      {
-        trailing_space,
-        color = "WarningMsg",
-      },
-      {
-        mixed_indent,
-        color = "WarningMsg",
-      },
       "location",
       "progress",
     },

lua/config/nvim-cmp.lua

@@ -1,6 +1,15 @@
 -- Setup nvim-cmp.
 local cmp = require("cmp")
-local lspkind = require("lspkind")
+
+-- The extentions needed by nvim-cmp should be loaded beforehand
+require("cmp_nvim_lsp")
+require("cmp_path")
+require("cmp_buffer")
+require("cmp_omni")
+require("cmp_nvim_ultisnips")
+require("cmp_cmdline")
+
+local MiniIcons = require("mini.icons")
 
 cmp.setup {
   snippet = {
@@ -43,21 +52,14 @@ cmp.setup {
   view = {
     entries = "custom",
   },
+  -- solution taken from https://github.com/echasnovski/mini.nvim/issues/1007#issuecomment-2258929830
   formatting = {
-    format = lspkind.cmp_format {
+    format = function(_, vim_item)
-      mode = "symbol_text",
+      local icon, hl = MiniIcons.get("lsp", vim_item.kind)
-      menu = {
+      vim_item.kind = icon .. " " .. vim_item.kind
-        nvim_lsp = "[LSP]",
+      vim_item.kind_hl_group = hl
-        ultisnips = "[US]",
+      return vim_item
-        path = "[Path]",
+    end,
-        buffer = "[Buffer]",
-        emoji = "[Emoji]",
-        omni = "[Omni]",
-      },
-      show_labelDetails = true,
-      maxwidth = 40,
-      ellipsis_char = "...",
-    },
   },
 }
 
@@ -70,6 +72,23 @@ cmp.setup.filetype("tex", {
   },
 })
 
+cmp.setup.cmdline("/", {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = {
+    { name = "buffer" },
+  },
+})
+
+cmp.setup.cmdline(":", {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = "path" },
+  }, {
+    { name = "cmdline" },
+  }),
+  matching = { disallow_symbol_nonprefix_matching = false },
+})
+
 --  see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu
 vim.cmd([[
   highlight! link CmpItemMenu Comment

lua/config/treesitter-textobjects.lua

@@ -0,0 +1,44 @@
+require("nvim-treesitter.configs").setup {
+  textobjects = {
+    select = {
+      enable = true,
+
+      -- Automatically jump forward to textobj, similar to targets.vim
+      lookahead = true,
+
+      keymaps = {
+        -- You can use the capture groups defined in textobjects.scm
+        ["af"] = "@function.outer",
+        ["if"] = "@function.inner",
+        ["ac"] = "@class.outer",
+        -- You can optionally set descriptions to the mappings (used in the desc parameter of
+        -- nvim_buf_set_keymap) which plugins like which-key display
+        ["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
+      },
+      -- You can choose the select mode (default is charwise 'v')
+      --
+      -- Can also be a function which gets passed a table with the keys
+      -- * query_string: eg '@function.inner'
+      -- * method: eg 'v' or 'o'
+      -- and should return the mode ('v', 'V', or '<c-v>') or a table
+      -- mapping query_strings to modes.
+      selection_modes = {
+        ["@function.inner"] = "V", -- linewise
+        ["@function.outer"] = "V", -- linewise
+        ["@class.outer"] = "V", -- linewise
+        ["@class.inner"] = "V", -- linewise
+        ["@parameter.outer"] = "v", -- charwise
+      },
+      -- If you set this to `true` (default is `false`) then any textobject is
+      -- extended to include preceding or succeeding whitespace. Succeeding
+      -- whitespace has priority in order to act similarly to eg the built-in
+      -- `ap`.
+      --
+      -- Can also be a function which gets passed a table with the keys
+      -- * query_string: eg '@function.inner'
+      -- * selection_mode: eg 'v'
+      -- and should return true or false
+      include_surrounding_whitespace = false,
+    },
+  },
+}

lua/custom-autocmd.lua

@@ -22,7 +22,7 @@ api.nvim_create_autocmd({ "TextYankPost" }, {
   pattern = "*",
   group = yank_group,
   callback = function()
-    vim.highlight.on_yank { higroup = "YankColor", timeout = 300 }
+    vim.hl.on_yank { higroup = "YankColor", timeout = 300 }
   end,
 })
 
@@ -37,7 +37,8 @@ api.nvim_create_autocmd({ "CursorMoved" }, {
 api.nvim_create_autocmd("TextYankPost", {
   pattern = "*",
   group = yank_group,
-  callback = function(ev)
+  ---@diagnostic disable-next-line: unused-local
+  callback = function(context)
     if vim.v.event.operator == "y" then
       vim.fn.setpos(".", vim.g.current_cursor_pos)
     end
@@ -135,49 +136,6 @@ api.nvim_create_autocmd("TermOpen", {
   end,
 })
 
--- Return to last cursor position when opening a file, note that here we cannot use BufReadPost
--- as event. It seems that when BufReadPost is triggered, FileType event is still not run.
--- So the filetype for this buffer is empty string.
-api.nvim_create_autocmd("FileType", {
-  group = api.nvim_create_augroup("resume_cursor_position", { clear = true }),
-  pattern = "*",
-  callback = function(ev)
-    local mark_pos = api.nvim_buf_get_mark(ev.buf, '"')
-    local last_cursor_line = mark_pos[1]
-
-    local max_line = vim.fn.line("$")
-    local buf_filetype = api.nvim_get_option_value("filetype", { buf = ev.buf })
-    local buftype = api.nvim_get_option_value("buftype", { buf = ev.buf })
-
-    -- only handle normal files
-    if buf_filetype == "" or buftype ~= "" then
-      return
-    end
-
-    -- Only resume last cursor position when there is no go-to-line command (something like '+23').
-    if vim.fn.match(vim.v.argv, [[\v^\+(\d){1,}$]]) ~= -1 then
-      return
-    end
-
-    if last_cursor_line > 1 and last_cursor_line <= max_line then
-      -- vim.print(string.format("mark_pos: %s", vim.inspect(mark_pos)))
-      -- it seems that without vim.schedule, the cursor position can not be set correctly
-      vim.schedule(function()
-        local status, result = pcall(api.nvim_win_set_cursor, 0, mark_pos)
-        if not status then
-          api.nvim_err_writeln(
-            string.format("Failed to resume cursor position. Context %s, error: %s", vim.inspect(ev), result)
-          )
-        end
-      end)
-      -- the following two ways also seem to work,
-      -- ref: https://www.reddit.com/r/neovim/comments/104lc26/how_can_i_press_escape_key_using_lua/
-      -- vim.api.nvim_feedkeys("g`\"", "n", true)
-      -- vim.fn.execute("normal! g`\"")
-    end
-  end,
-})
-
 local number_toggle_group = api.nvim_create_augroup("numbertoggle", { clear = true })
 api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
   pattern = "*",
@@ -213,7 +171,11 @@ api.nvim_create_autocmd("ColorScheme", {
     vim.api.nvim_set_hl(0, "Cursor2", { fg = "red", bg = "red" })
 
     -- For floating windows border highlight
-    vim.api.nvim_set_hl(0, "FloatBorder", { fg = "LightGreen" })
+    vim.api.nvim_set_hl(0, "FloatBorder", { fg = "LightGreen", bg = "None", bold = true })
+
+    local hl = vim.api.nvim_get_hl(0, { name = "NormalFloat" })
+    -- change the background color of floating window to None, so it blenders better
+    vim.api.nvim_set_hl(0, "NormalFloat", { fg = hl.fg, bg = "None" })
 
     -- highlight for matching parentheses
     vim.api.nvim_set_hl(0, "MatchParen", { bold = true, underline = true })
@@ -224,7 +186,8 @@ api.nvim_create_autocmd("BufEnter", {
   pattern = "*",
   group = api.nvim_create_augroup("auto_close_win", { clear = true }),
   desc = "Quit Nvim if we have only one window, and its filetype match our pattern",
-  callback = function(ev)
+  ---@diagnostic disable-next-line: unused-local
+  callback = function(context)
     local quit_filetypes = { "qf", "vista", "NvimTree" }
 
     local should_quit = true
@@ -232,9 +195,9 @@ api.nvim_create_autocmd("BufEnter", {
 
     for _, win in pairs(tabwins) do
       local buf = api.nvim_win_get_buf(win)
-      local bf = fn.getbufvar(buf, "&filetype")
+      local buf_type = vim.api.nvim_get_option_value("filetype", { buf = buf })
 
-      if fn.index(quit_filetypes, bf) == -1 then
+      if not vim.tbl_contains(quit_filetypes, buf_type) then
         should_quit = false
       end
     end
@@ -249,22 +212,29 @@ api.nvim_create_autocmd({ "VimEnter", "DirChanged" }, {
   group = api.nvim_create_augroup("git_repo_check", { clear = true }),
   pattern = "*",
   desc = "check if we are inside Git repo",
-  command = "call utils#Inside_git_repo()",
+  callback = function()
+    utils.inside_git_repo()
+  end,
 })
 
 -- ref: https://vi.stackexchange.com/a/169/15292
 api.nvim_create_autocmd("BufReadPre", {
   group = api.nvim_create_augroup("large_file", { clear = true }),
   pattern = "*",
-  desc = "check if we are inside Git repo",
+  desc = "optimize for large file",
   callback = function(ev)
     local file_size_limit = 524288 -- 0.5MB
     local f = ev.file
 
     if fn.getfsize(f) > file_size_limit or fn.getfsize(f) == -2 then
       vim.o.eventignore = "all"
+
+      -- show ruler
+      vim.o.ruler = true
+
       --  turning off relative number helps a lot
       vim.wo.relativenumber = false
+      vim.wo.number = false
 
       vim.bo.swapfile = false
       vim.bo.bufhidden = "unload"

lua/diagnostic-conf.lua

@@ -0,0 +1,66 @@
+local diagnostic = vim.diagnostic
+local api = vim.api
+
+-- global config for diagnostic
+diagnostic.config {
+  underline = false,
+  virtual_text = false,
+  virtual_lines = false,
+  signs = {
+    text = {
+      [diagnostic.severity.ERROR] = "🆇",
+      [diagnostic.severity.WARN] = "⚠️",
+      [diagnostic.severity.INFO] = "ℹ️",
+      [diagnostic.severity.HINT] = "",
+    },
+  },
+  severity_sort = true,
+  float = {
+    source = true,
+    header = "Diagnostics:",
+    prefix = " ",
+    border = "single",
+  },
+}
+
+-- set quickfix list from diagnostics in a certain buffer, not the whole workspace
+local set_qflist = function(buf_num, severity)
+  local diagnostics = nil
+  diagnostics = diagnostic.get(buf_num, { severity = severity })
+
+  local qf_items = diagnostic.toqflist(diagnostics)
+  vim.fn.setqflist({}, " ", { title = "Diagnostics", items = qf_items })
+
+  -- open quickfix by default
+  vim.cmd([[copen]])
+end
+
+-- this puts diagnostics from opened files to quickfix
+vim.keymap.set("n", "<space>qw", diagnostic.setqflist, { desc = "put window diagnostics to qf" })
+
+-- this puts diagnostics from current buffer to quickfix
+vim.keymap.set("n", "<space>qb", function()
+  set_qflist(0)
+end, { desc = "put buffer diagnostics to qf" })
+
+-- automatically show diagnostic in float win for current line
+api.nvim_create_autocmd("CursorHold", {
+  pattern = "*",
+  callback = function()
+    if #vim.diagnostic.get(0) == 0 then
+      return
+    end
+
+    if not vim.b.diagnostics_pos then
+      vim.b.diagnostics_pos = { nil, nil }
+    end
+
+    local cursor_pos = api.nvim_win_get_cursor(0)
+
+    if not vim.deep_equal(cursor_pos, vim.b.diagnostics_pos) then
+      diagnostic.open_float { width = 100 }
+    end
+
+    vim.b.diagnostics_pos = cursor_pos
+  end,
+})

lua/globals.lua

@@ -10,7 +10,7 @@ vim.g.is_win = (utils.has("win32") or utils.has("win64")) and true or false
 vim.g.is_linux = (utils.has("unix") and (not utils.has("macunix"))) and true or false
 vim.g.is_mac = utils.has("macunix") and true or false
 
-vim.g.logging_level = "info"
+vim.g.logging_level = vim.log.levels.INFO
 
 ------------------------------------------------------------------------
 --                         builtin variables                          --
@@ -27,7 +27,8 @@ if utils.executable("python3") then
     vim.g.python3_host_prog = fn.exepath("python3")
   end
 else
-  api.nvim_err_writeln("Python3 executable not found! You must install Python3 and set its PATH correctly!")
+  local msg = "Python3 executable not found! You must install Python3 and set its PATH correctly!"
+  api.nvim_echo({ { msg } }, true, { err = true })
   return
 end
 
@@ -68,3 +69,6 @@ vim.g.loaded_matchparen = 1
 
 -- Disable sql omni completion, it is broken.
 vim.g.loaded_sql_completion = 1
+
+-- control how to show health check window
+vim.g.health = { style = nil }

lua/lsp_utils.lua

@@ -0,0 +1,15 @@
+local M = {}
+
+M.get_default_capabilities = function()
+  local capabilities = vim.lsp.protocol.make_client_capabilities()
+
+  -- required by nvim-ufo
+  capabilities.textDocument.foldingRange = {
+    dynamicRegistration = false,
+    lineFoldingOnly = true,
+  }
+
+  return capabilities
+end
+
+return M

lua/mappings.lua

@@ -23,19 +23,6 @@ keymap.set("n", "<leader>q", "<cmd>x<cr>", { silent = true, desc = "quit current
 -- Quit all opened buffers
 keymap.set("n", "<leader>Q", "<cmd>qa!<cr>", { silent = true, desc = "quit nvim" })
 
--- Navigation in the location and quickfix list
-keymap.set("n", "[l", "<cmd>lprevious<cr>zv", { silent = true, desc = "previous location item" })
-keymap.set("n", "]l", "<cmd>lnext<cr>zv", { silent = true, desc = "next location item" })
-
-keymap.set("n", "[L", "<cmd>lfirst<cr>zv", { silent = true, desc = "first location item" })
-keymap.set("n", "]L", "<cmd>llast<cr>zv", { silent = true, desc = "last location item" })
-
-keymap.set("n", "[q", "<cmd>cprevious<cr>zv", { silent = true, desc = "previous qf item" })
-keymap.set("n", "]q", "<cmd>cnext<cr>zv", { silent = true, desc = "next qf item" })
-
-keymap.set("n", "[Q", "<cmd>cfirst<cr>zv", { silent = true, desc = "first qf item" })
-keymap.set("n", "]Q", "<cmd>clast<cr>zv", { silent = true, desc = "last qf item" })
-
 -- Close location list or quickfix list if they are present, see https://superuser.com/q/355325/736190
 keymap.set("n", [[\x]], "<cmd>windo lclose <bar> cclose <cr>", {
   silent = true,
@@ -117,7 +104,7 @@ keymap.set("n", "<leader>v", "printf('`[%s`]', getregtype()[0])", {
 })
 
 -- Always use very magic mode for searching
-keymap.set("n", "/", [[/\v]])
+-- keymap.set("n", "/", [[/\v]])
 
 -- Search in selected region
 -- xnoremap / :<C-U>call feedkeys('/\%>'.(line("'<")-1).'l\%<'.(line("'>")+1)."l")<CR>
@@ -143,9 +130,6 @@ keymap.set("x", "c", '"_c')
 -- Remove trailing whitespace characters
 keymap.set("n", "<leader><space>", "<cmd>StripTrailingWhitespace<cr>", { desc = "remove trailing space" })
 
--- check the syntax group of current cursor position
-keymap.set("n", "<leader>st", "<cmd>call utils#SynGroup()<cr>", { desc = "check syntax group" })
-
 -- Copy entire buffer.
 keymap.set("n", "<leader>y", "<cmd>%yank<cr>", { desc = "yank entire buffer" })
 

lua/plugin_specs.lua

@@ -22,23 +22,83 @@ end
 
 local plugin_specs = {
   -- auto-completion engine
+  { "hrsh7th/cmp-nvim-lsp", lazy = true },
+  { "hrsh7th/cmp-path", lazy = true },
+  { "hrsh7th/cmp-buffer", lazy = true },
+  { "hrsh7th/cmp-omni", lazy = true },
+  { "hrsh7th/cmp-cmdline", lazy = true },
+  { "quangnguyen30192/cmp-nvim-ultisnips", lazy = true },
   {
-    "iguanacucumber/magazine.nvim",
+    "hrsh7th/nvim-cmp",
     name = "nvim-cmp",
-    -- event = 'InsertEnter',
     event = "VeryLazy",
-    dependencies = {
-      "hrsh7th/cmp-nvim-lsp",
-      "onsails/lspkind-nvim",
-      "hrsh7th/cmp-path",
-      "hrsh7th/cmp-buffer",
-      "hrsh7th/cmp-omni",
-      "quangnguyen30192/cmp-nvim-ultisnips",
-    },
     config = function()
       require("config.nvim-cmp")
     end,
   },
+  --{
+  --  "saghen/blink.cmp",
+  --  -- optional: provides snippets for the snippet source
+  --  dependencies = { "rafamadriz/friendly-snippets" },
+
+  --  -- use a release tag to download pre-built binaries
+  --  version = "1.*",
+
+  --  ---@module 'blink.cmp'
+  --  ---@type blink.cmp.Config
+  --  opts = {
+  --    -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
+  --    -- 'super-tab' for mappings similar to vscode (tab to accept)
+  --    -- 'enter' for enter to accept
+  --    -- 'none' for no mappings
+  --    --
+  --    keymap = {
+  --      preset = "default",
+  --      ["<Tab>"] = { "select_next", "fallback" },
+  --      ["<S-Tab>"] = { "select_prev", "fallback" },
+  --      ["<Enter>"] = { "select_and_accept", "fallback" },
+  --      ["<C-U>"] = { "scroll_documentation_up", "fallback" },
+  --      ["<C-D>"] = { "scroll_documentation_down", "fallback" },
+  --    },
+
+  --    appearance = {
+  --      -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
+  --      -- Adjusts spacing to ensure icons are aligned
+  --      nerd_font_variant = "mono",
+  --    },
+
+  --    -- (Default) Only show the documentation popup when manually triggered
+  --    completion = {
+  --      documentation = {
+  --        auto_show = true,
+  --      },
+  --    },
+
+  --    -- Default list of enabled providers defined so that you can extend it
+  --    -- elsewhere in your config, without redefining it, due to `opts_extend`
+  --    sources = {
+  --      default = { "lsp", "path", "buffer" },
+  --    },
+
+  --    -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
+  --    -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
+  --    -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
+  --    --
+  --    -- See the fuzzy documentation for more information
+  --    fuzzy = { implementation = "prefer_rust_with_warning" },
+  --    cmdline = {
+  --      completion = {
+  --        menu = {
+  --          auto_show = true,
+  --        },
+  --      },
+  --      keymap = {
+  --        ["<Enter>"] = { "select_and_accept", "fallback" },
+  --      },
+  --    },
+  --  },
+  --  opts_extend = { "sources.default" },
+  --},
   {
     "neovim/nvim-lspconfig",
     event = { "BufRead", "BufNewFile" },
@@ -46,25 +106,29 @@ local plugin_specs = {
       require("config.lsp")
     end,
   },
-
   {
-    "nvim-treesitter/nvim-treesitter",
+    "dnlhc/glance.nvim",
-    enabled = function()
+    config = function()
-      if vim.g.is_mac then
+      require("config.glance")
-        return true
-      end
-      return false
     end,
     event = "VeryLazy",
+  },
+  {
+    "nvim-treesitter/nvim-treesitter",
+    lazy = true,
     build = ":TSUpdate",
     config = function()
       require("config.treesitter")
     end,
   },
-
+  {
-  -- Python-related text object
+    "nvim-treesitter/nvim-treesitter-textobjects",
-  { "jeetsukumaran/vim-pythonsense", ft = { "python" } },
+    event = "VeryLazy",
-
+    branch = "master",
+    config = function()
+      require("config.treesitter-textobjects")
+    end,
+  },
   { "machakann/vim-swap", event = "VeryLazy" },
 
   -- IDE for Lisp
@@ -72,10 +136,7 @@ local plugin_specs = {
   {
     "vlime/vlime",
     enabled = function()
-      if utils.executable("sbcl") then
+      return utils.executable("sbcl")
-        return true
-      end
-      return false
     end,
     config = function(plugin)
       vim.opt.rtp:append(plugin.dir .. "/vim")
@@ -86,7 +147,7 @@ local plugin_specs = {
   -- Super fast buffer jump
   {
     "smoka7/hop.nvim",
-    event = "VeryLazy",
+    keys = { "f" },
     config = function()
       require("config.nvim_hop")
     end,
@@ -101,20 +162,6 @@ local plugin_specs = {
       require("config.hlslens")
     end,
   },
-  {
-    "Yggdroot/LeaderF",
-    cmd = "Leaderf",
-    build = function()
-      local leaderf_path = plugin_dir .. "/LeaderF"
-      vim.opt.runtimepath:append(leaderf_path)
-      vim.cmd("runtime! plugin/leaderf.vim")
-
-      if not vim.g.is_win then
-        vim.cmd("LeaderfInstallCExtension")
-      end
-    end,
-  },
-  "nvim-lua/plenary.nvim",
   {
     "nvim-telescope/telescope.nvim",
     cmd = "Telescope",
@@ -124,18 +171,16 @@ local plugin_specs = {
   },
   {
     "ibhagwan/fzf-lua",
-    -- optional for icon support
-    dependencies = { "nvim-tree/nvim-web-devicons" },
     config = function()
-      -- calling `setup` is optional for customization
+      require("config.fzf-lua")
-      require("fzf-lua").setup {}
     end,
+    event = "VeryLazy",
   },
   {
     "MeanderingProgrammer/markdown.nvim",
     main = "render-markdown",
     opts = {},
-    dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" },
+    ft = { "markdown" },
   },
   -- A list of colorscheme plugin you may want to try. Find what suits you.
   { "navarasu/onedark.nvim", lazy = true },
@@ -154,11 +199,32 @@ local plugin_specs = {
     branch = "v2",
   },
   { "rebelot/kanagawa.nvim", lazy = true },
-  { "nvim-tree/nvim-web-devicons", event = "VeryLazy" },
+  { "miikanissi/modus-themes.nvim", priority = 1000 },
+  { "wtfox/jellybeans.nvim", priority = 1000 },
+  { "projekt0n/github-nvim-theme", name = "github-theme" },
+  { "e-ink-colorscheme/e-ink.nvim", priority = 1000 },
+  { "ficcdaf/ashen.nvim", priority = 1000 },
+  { "savq/melange-nvim", priority = 1000 },
+  { "Skardyy/makurai-nvim", priority = 1000 },
+  { "vague2k/vague.nvim", priority = 1000 },
+  { "webhooked/kanso.nvim", priority = 1000 },
+  { "zootedb0t/citruszest.nvim", priority = 1000 },
+
+  -- plugins to provide nerdfont icons
+  {
+    "echasnovski/mini.icons",
+    version = false,
+    config = function()
+      -- this is the compatibility fix for plugins that only support nvim-web-devicons
+      require("mini.icons").mock_nvim_web_devicons()
+      require("mini.icons").tweak_lsp_kind()
+    end,
+    lazy = true,
+  },
 
   {
     "nvim-lualine/lualine.nvim",
-    event = "VeryLazy",
+    event = "BufRead",
     cond = firenvim_not_active,
     config = function()
       require("config.lualine")
@@ -184,11 +250,16 @@ local plugin_specs = {
   },
 
   {
-    "lukas-reineke/indent-blankline.nvim",
+    "echasnovski/mini.indentscope",
-    event = "VeryLazy",
+    version = false,
-    main = "ibl",
     config = function()
-      require("config.indent-blankline")
+      local mini_indent = require("mini.indentscope")
+      mini_indent.setup {
+        draw = {
+          animation = mini_indent.gen_animation.none(),
+        },
+        symbol = "▏",
+      }
     end,
   },
   {
@@ -214,7 +285,7 @@ local plugin_specs = {
     end,
   },
   -- Highlight URLs inside vim
-  { "itchyny/vim-highlighturl", event = "VeryLazy" },
+  { "itchyny/vim-highlighturl", event = "BufReadPost" },
 
   -- notification plugin
   {
@@ -225,6 +296,8 @@ local plugin_specs = {
     end,
   },
 
+  { "nvim-lua/plenary.nvim", lazy = true },
+
   -- For Windows and Mac, we can open an URL in the browser. For Linux, it may
   -- not be possible since we maybe in a server which disables GUI.
   {
@@ -235,13 +308,8 @@ local plugin_specs = {
       vim.g.netrw_nogx = 1 -- disable netrw gx
     end,
     enabled = function()
-      if vim.g.is_win or vim.g.is_mac then
+      return vim.g.is_win or vim.g.is_mac
-        return true
-      else
-        return false
-      end
     end,
-    dependencies = { "nvim-lua/plenary.nvim" },
     config = true, -- default settings
     submodules = false, -- not needed, submodules are required only for tests
   },
@@ -251,19 +319,19 @@ local plugin_specs = {
   {
     "liuchengxu/vista.vim",
     enabled = function()
-      if utils.executable("ctags") then
+      return utils.executable("ctags")
-        return true
-      else
-        return false
-      end
     end,
     cmd = "Vista",
   },
 
   -- Snippet engine and snippet template
-  { "SirVer/ultisnips", dependencies = {
+  {
-    "honza/vim-snippets",
+    "SirVer/ultisnips",
-  }, event = "InsertEnter" },
+    dependencies = {
+      "honza/vim-snippets",
+    },
+    event = "InsertEnter",
+  },
 
   -- Automatic insertion and deletion of a pair of characters
   {
@@ -273,27 +341,27 @@ local plugin_specs = {
   },
 
   -- Comment plugin
-  { "tpope/vim-commentary", event = "VeryLazy" },
+  {
+    "tpope/vim-commentary",
+    keys = {
+      { "gc", mode = "n" },
+      { "gc", mode = "v" },
+    },
+  },
 
   -- Multiple cursor plugin like Sublime Text?
   -- 'mg979/vim-visual-multi'
 
-  -- Autosave files on certain events
-  { "907th/vim-auto-save", event = "InsertEnter" },
-
   -- Show undo history visually
   { "simnalamburt/vim-mundo", cmd = { "MundoToggle", "MundoShow" } },
 
-  -- better UI for some nvim actions
-  { "stevearc/dressing.nvim" },
-
   -- Manage your yank history
   {
     "gbprod/yanky.nvim",
     config = function()
       require("config.yanky")
     end,
-    event = "VeryLazy",
+    cmd = "YankyRingHistory",
   },
 
   -- Handy unix command inside Vim (Rename, Move etc.)
@@ -307,10 +375,7 @@ local plugin_specs = {
   {
     "lyokha/vim-xkbswitch",
     enabled = function()
-      if vim.g.is_mac and utils.executable("xkbswitch") then
+      return vim.g.is_mac and utils.executable("xkbswitch")
-        return true
-      end
-      return false
     end,
     event = { "InsertEnter" },
   },
@@ -318,17 +383,11 @@ local plugin_specs = {
   {
     "Neur1n/neuims",
     enabled = function()
-      if vim.g.is_win then
+      return vim.g.is_win
-        return true
-      end
-      return false
     end,
     event = { "InsertEnter" },
   },
 
-  -- Auto format tools
-  { "sbdchd/neoformat", cmd = { "Neoformat" } },
-
   -- Git command inside vim
   {
     "tpope/vim-fugitive",
@@ -337,10 +396,27 @@ local plugin_specs = {
       require("config.fugitive")
     end,
   },
+  {
+    "NeogitOrg/neogit",
+    dependencies = {
+      "nvim-lua/plenary.nvim", -- required
+      "sindrets/diffview.nvim", -- optional - Diff integration
+      -- Only one of these is needed.
+      "ibhagwan/fzf-lua", -- optional
+    },
+    event = "User InGitRepo",
+  },
 
   -- Better git log display
   { "rbong/vim-flog", cmd = { "Flog" } },
-  { "akinsho/git-conflict.nvim", version = "*", config = true },
+  {
+    "akinsho/git-conflict.nvim",
+    version = "*",
+    event = "VeryLazy",
+    config = function()
+      require("config.git-conflict")
+    end,
+  },
   {
     "ruifm/gitlinker.nvim",
     event = "User InGitRepo",
@@ -355,10 +431,12 @@ local plugin_specs = {
     config = function()
       require("config.gitsigns")
     end,
+    event = "BufRead",
   },
 
   {
     "sindrets/diffview.nvim",
+    cmd = { "DiffviewOpen" },
   },
 
   {
@@ -369,40 +447,31 @@ local plugin_specs = {
     end,
   },
 
-  -- Another markdown plugin
-  { "preservim/vim-markdown", ft = { "markdown" } },
-
   -- Faster footnote generation
   { "vim-pandoc/vim-markdownfootnotes", ft = { "markdown" } },
 
   -- Vim tabular plugin for manipulate tabular, required by markdown plugins
-  { "godlygeek/tabular", cmd = { "Tabularize" } },
+  { "godlygeek/tabular", ft = { "markdown" } },
 
   -- Markdown previewing (only for Mac and Windows)
   {
     "iamcco/markdown-preview.nvim",
     enabled = function()
-      if vim.g.is_win or vim.g.is_mac then
+      return vim.g.is_win or vim.g.is_mac
-        return true
-      end
-      return false
     end,
-    build = "cd app && npm install",
+    build = "cd app && npm install && git restore .",
     ft = { "markdown" },
   },
 
   {
     "rhysd/vim-grammarous",
     enabled = function()
-      if vim.g.is_mac then
+      return vim.g.is_mac
-        return true
-      end
-      return false
     end,
     ft = { "markdown" },
   },
 
-  { "chrisbra/unicode.vim", event = "VeryLazy" },
+  { "chrisbra/unicode.vim", keys = { "ga" }, cmd = { "UnicodeSearch" } },
 
   -- Additional powerful text object for vim, this plugin should be studied
   -- carefully to use its full power
@@ -411,17 +480,11 @@ local plugin_specs = {
   -- Plugin to manipulate character pairs quickly
   { "machakann/vim-sandwich", event = "VeryLazy" },
 
-  -- Add indent object for vim (useful for languages like Python)
-  { "michaeljsmith/vim-indent-object", event = "VeryLazy" },
-
   -- Only use these plugin on Windows and Mac and when LaTeX is installed
   {
     "lervag/vimtex",
     enabled = function()
-      if utils.executable("latex") then
+      return utils.executable("latex")
-        return true
-      end
-      return false
     end,
     ft = { "tex" },
   },
@@ -432,10 +495,7 @@ local plugin_specs = {
   {
     "tmux-plugins/vim-tmux",
     enabled = function()
-      if utils.executable("tmux") then
+      return utils.executable("tmux")
-        return true
-      end
-      return false
     end,
     ft = { "tmux" },
   },
@@ -452,8 +512,7 @@ local plugin_specs = {
   {
     "glacambre/firenvim",
     enabled = function()
-      local result = vim.g.is_win or vim.g.is_mac
+      return vim.g.is_win or vim.g.is_mac
-      return result
     end,
     -- it seems that we can only call the firenvim function directly.
     -- Using vim.fn or vim.cmd to call this function will fail.
@@ -476,10 +535,7 @@ local plugin_specs = {
   {
     "sakhnik/nvim-gdb",
     enabled = function()
-      if vim.g.is_win or vim.g.is_linux then
+      return vim.g.is_win or vim.g.is_linux
-        return true
-      end
-      return false
     end,
     build = { "bash install.sh" },
     lazy = true,
@@ -491,20 +547,11 @@ local plugin_specs = {
   {
     "ojroques/vim-oscyank",
     enabled = function()
-      if vim.g.is_linux then
+      return vim.g.is_linux
-        return true
-      end
-      return false
     end,
     cmd = { "OSCYank", "OSCYankReg" },
   },
 
-  -- The missing auto-completion for cmdline!
-  {
-    "gelguy/wilder.nvim",
-    build = ":UpdateRemotePlugins",
-  },
-
   -- showing keybindings
   {
     "folke/which-key.nvim",
@@ -513,15 +560,30 @@ local plugin_specs = {
       require("config.which-key")
     end,
   },
-
+  {
+    "folke/snacks.nvim",
+    priority = 1000,
+    lazy = false,
+    opts = {
+      -- more beautiful vim.ui.input
+      input = {
+        enabled = true,
+        win = {
+          relative = "cursor",
+          backdrop = true,
+        },
+      },
+      -- more beautiful vim.ui.select
+      picker = { enabled = true },
+    },
+  },
   -- show and trim trailing whitespaces
   { "jdhao/whitespace.nvim", event = "VeryLazy" },
 
   -- file explorer
   {
     "nvim-tree/nvim-tree.lua",
-    event = "VeryLazy",
+    keys = { "<space>s" },
-    dependencies = { "nvim-tree/nvim-web-devicons" },
     config = function()
       require("config.nvim-tree")
     end,
@@ -529,8 +591,7 @@ local plugin_specs = {
 
   {
     "j-hui/fidget.nvim",
-    event = "VeryLazy",
+    event = "BufRead",
-    tag = "legacy",
     config = function()
       require("config.fidget-nvim")
     end,
@@ -538,19 +599,24 @@ local plugin_specs = {
   {
     "folke/lazydev.nvim",
     ft = "lua", -- only load on lua files
-    opts = {},
+    opts = {
+      library = {
+        -- See the configuration section for more details
+        -- Load luvit types when the `vim.uv` word is found
+        { path = "${3rd}/luv/library", words = { "vim%.uv" } },
+      },
+    },
   },
   {
     "CopilotC-Nvim/CopilotChat.nvim",
     dependencies = {
       { "zbirenbaum/copilot.lua" }, -- or github/copilot.vim
-      { "nvim-lua/plenary.nvim" }, -- for curl, log wrapper
     },
     opts = {
       debug = true, -- Enable debugging
       -- See Configuration section for rest
     },
-    -- See Commands section for default commands if you want to lazy load on them
+    cmd = { "CopilotChat" },
   },
   {
     "zbirenbaum/copilot.lua",
@@ -567,29 +633,29 @@ local plugin_specs = {
     config = function()
       require("config.live-command")
     end,
-    event = "VeryLazy",
   },
   {
     -- show hint for code actions, the user can also implement code actions themselves,
     -- see discussion here: https://github.com/neovim/neovim/issues/14869
     "kosayoda/nvim-lightbulb",
     config = function()
-      require("nvim-lightbulb").setup { autocmd = { enabled = true } }
+      require("config.lightbulb")
     end,
+    event = "LspAttach",
   },
   {
     "Bekaboo/dropbar.nvim",
+    event = "VeryLazy",
   },
   {
-    "vhyrro/luarocks.nvim",
+    "catgoose/nvim-colorizer.lua",
-    priority = 1000, -- Very high priority is required, luarocks.nvim should run as the first plugin in your config.
+    event = "BufReadPre",
-    opts = {
+    opts = { -- set to setup table
-      rocks = { "lua-toml" }, -- specifies a list of rocks to install
-      -- luarocks_build_args = { "--with-lua=/my/path" }, -- extra options to pass to luarocks's configuration script
     },
   },
 }
 
+---@diagnostic disable-next-line: missing-fields
 require("lazy").setup {
   spec = plugin_specs,
   ui = {

lua/utils.lua

@@ -3,12 +3,11 @@ local version = vim.version
 
 local M = {}
 
+--- Check if an executable exists
+--- @param name string An executable name/path
+--- @return boolean
 function M.executable(name)
-  if fn.executable(name) > 0 then
+  return fn.executable(name) > 0
-    return true
-  end
-
-  return false
 end
 
 --- check whether a feature exists in Nvim
@@ -61,7 +60,7 @@ function M.is_compatible_version(expected_version)
 
   if expect_ver == nil then
     local msg = string.format("Unsupported version string: %s", expected_version)
-    vim.api.nvim_err_writeln(msg)
+    vim.api.nvim_echo({ { msg } }, true, { err = true })
     return false
   end
 
@@ -73,10 +72,24 @@ function M.is_compatible_version(expected_version)
       expected_version,
       _ver
     )
-    vim.api.nvim_err_writeln(msg)
+    vim.api.nvim_echo({ { msg } }, true, { err = true })
   end
 
   return true
 end
 
+--- check if we are inside a git repo
+--- @return boolean
+function M.inside_git_repo()
+  local result = vim.system({ "git", "rev-parse", "--is-inside-work-tree" }, { text = true }):wait()
+  if result.code ~= 0 then
+    return false
+  end
+
+  -- Manually trigger a special user autocmd InGitRepo (used lazyloading.
+  vim.cmd([[doautocmd User InGitRepo]])
+
+  return true
+end
+
 return M

my_snippets/markdown.snippets

@@ -54,6 +54,10 @@ snippet link "Markdown links"
 [$1]($2)$0
 endsnippet
 
+snippet rlink "Markdown ref link"
+[${1:link_text}][${2:label}]
+endsnippet
+
 post_jump "gen_header(snip)"
 snippet "h([1-6])" "Markdown header" br
 `!p snip.rv = match.group(1)`

plugin/command.lua

@@ -50,7 +50,8 @@ vim.api.nvim_create_user_command("JSONFormat", function(context)
     local cmd_str = string.format("%s,%s!python -m json.tool", line1, line2)
     vim.fn.execute(cmd_str)
   else
-    vim.api.nvim_err_write(string.format("unsupported range: %s", range))
+    local msg = string.format("unsupported range: %s", range)
+    vim.api.nvim_echo({ { msg } }, true, { err = true })
   end
 end, {
   desc = "Format JSON string",

viml_conf/options.vim

@@ -72,7 +72,7 @@ set wildmode=list:longest
 set scrolloff=3
 
 " Use mouse to select and resize windows, etc.
-set mouse=
+set mouse=n
 set mousemodel=popup  " Set the behaviour of mouse
 set mousescroll=ver:1,hor:0
 
@@ -115,6 +115,8 @@ set shortmess+=S
 " Disable showing intro message (:intro)
 set shortmess+=I
 
+set messagesopt=hit-enter,history:500
+
 " Completion behaviour
 " set completeopt+=noinsert  " Auto select the first completion entry
 set completeopt+=menuone  " Show menu even if there is only one item
@@ -124,6 +126,7 @@ set pumheight=10  " Maximum number of items to show in popup menu
 set pumblend=5  " pseudo transparency for completion menu
 
 set winblend=0  " pseudo transparency for floating window
+set winborder=none
 
 " Insert mode key word completion setting
 set complete+=kspell complete-=w complete-=b complete-=u complete-=t

viml_conf/plugins.vim

@@ -34,85 +34,6 @@ let g:UltiSnipsSnippetDirectories=['UltiSnips', 'my_snippets']
 """""""""""""""""""""""""" vlime settings """"""""""""""""""""""""""""""""
 command! -nargs=0 StartVlime call jobstart(printf("sbcl --load %s/vlime/lisp/start-vlime.lisp", g:package_home))
 
-"""""""""""""""""""""""""""""LeaderF settings"""""""""""""""""""""
-" Do not use cache file
-let g:Lf_UseCache = 0
-" Refresh each time we call leaderf
-let g:Lf_UseMemoryCache = 0
-
-" Ignore certain files and directories when searching files
-let g:Lf_WildIgnore = {
-  \ 'dir': ['.git', '__pycache__', '.DS_Store', '*_cache'],
-  \ 'file': ['*.exe', '*.dll', '*.so', '*.o', '*.pyc', '*.jpg', '*.png',
-  \ '*.gif', '*.svg', '*.ico', '*.db', '*.tgz', '*.tar.gz', '*.gz',
-  \ '*.zip', '*.bin', '*.pptx', '*.xlsx', '*.docx', '*.pdf', '*.tmp',
-  \ '*.wmv', '*.mkv', '*.mp4', '*.rmvb', '*.ttf', '*.ttc', '*.otf',
-  \ '*.mp3', '*.aac']
-  \}
-
-" Do not show fancy icons for Linux server.
-if g:is_linux
-  let g:Lf_ShowDevIcons = 0
-endif
-
-" Only fuzzy-search files names
-let g:Lf_DefaultMode = 'FullPath'
-
-" Do not use version control tool to list files under a directory since
-" submodules are not searched by default.
-let g:Lf_UseVersionControlTool = 0
-
-" Use rg as the default search tool
-let g:Lf_DefaultExternalTool = "rg"
-
-" show dot files
-let g:Lf_ShowHidden = 1
-
-" Disable default mapping
-let g:Lf_ShortcutF = ''
-let g:Lf_ShortcutB = ''
-
-" set up working directory for git repository
-let g:Lf_WorkingDirectoryMode = 'a'
-
-" Search files in popup window
-nnoremap <silent> <leader>ff :<C-U>Leaderf file --popup<CR>
-
-" Grep project files in popup window
-nnoremap <silent> <leader>fg :<C-U>Leaderf rg --no-messages --popup  --nameOnly<CR>
-
-" Search vim help files
-nnoremap <silent> <leader>fh :<C-U>Leaderf help --popup<CR>
-
-" Search tags in current buffer
-nnoremap <silent> <leader>ft :<C-U>Leaderf bufTag --popup<CR>
-
-" Switch buffers
-nnoremap <silent> <leader>fb :<C-U>Leaderf buffer --popup<CR>
-
-" Search recent files
-nnoremap <silent> <leader>fr :<C-U>Leaderf mru --popup --absolute-path<CR>
-
-let g:Lf_PopupColorscheme = 'gruvbox_material'
-
-" Change keybinding in LeaderF prompt mode, use ctrl-n and ctrl-p to navigate
-" items.
-let g:Lf_CommandMap = {'<C-J>': ['<C-N>'], '<C-K>': ['<C-P>']}
-
-" do not preview results, it will add the file to buffer list
-let g:Lf_PreviewResult = {
-      \ 'File': 0,
-      \ 'Buffer': 0,
-      \ 'Mru': 0,
-      \ 'Tag': 0,
-      \ 'BufTag': 1,
-      \ 'Function': 1,
-      \ 'Line': 0,
-      \ 'Colorscheme': 0,
-      \ 'Rg': 0,
-      \ 'Gtags': 0
-      \}
-
 """"""""""""""""""""""""""" vista settings """"""""""""""""""""""""""""""""""
 let g:vista#renderer#icons = {
       \ 'member': '',
@@ -137,39 +58,6 @@ let g:better_escape_interval = 200
 """"""""""""""""""""""""""""vim-xkbswitch settings"""""""""""""""""""""""""
 let g:XkbSwitchEnabled = 1
 
-"""""""""""""""""""""""""""""" neoformat settings """""""""""""""""""""""
-let g:neoformat_enabled_python = ['black', 'yapf']
-let g:neoformat_cpp_clangformat = {
-      \ 'exe': 'clang-format',
-      \ 'args': ['--style="{IndentWidth: 4}"']
-      \ }
-let g:neoformat_c_clangformat = {
-      \ 'exe': 'clang-format',
-      \ 'args': ['--style="{IndentWidth: 4}"']
-      \ }
-
-let g:neoformat_enabled_cpp = ['clangformat']
-let g:neoformat_enabled_c = ['clangformat']
-
-"""""""""""""""""""""""""vim-markdown settings"""""""""""""""""""
-" Disable header folding
-let g:vim_markdown_folding_disabled = 1
-
-" Whether to use conceal feature in markdown
-let g:vim_markdown_conceal = 1
-
-" Disable math tex conceal and syntax highlight
-let g:tex_conceal = ''
-let g:vim_markdown_math = 0
-
-" Support front matter of various format
-let g:vim_markdown_frontmatter = 1  " for YAML format
-let g:vim_markdown_toml_frontmatter = 1  " for TOML format
-let g:vim_markdown_json_frontmatter = 1  " for JSON format
-
-" Let the TOC window autofit so that it doesn't take too much space
-let g:vim_markdown_toc_autofit = 1
-
 """""""""""""""""""""""""markdown-preview settings"""""""""""""""""""
 " Only setting this for suitable platforms
 if g:is_win || g:is_mac
@@ -338,52 +226,3 @@ endif
 
 """"""""""""""""""""""""""""""nvim-gdb settings""""""""""""""""""""""""""""""
 nnoremap <leader>dp :<C-U>GdbStartPDB python -m pdb %<CR>
-
-""""""""""""""""""""""""""""""wilder.nvim settings""""""""""""""""""""""""""""""
-call timer_start(250, { -> s:wilder_init() })
-
-function! s:wilder_init() abort
-  try
-    call wilder#setup({
-          \ 'modes': [':', '/', '?'],
-          \ 'next_key': '<Tab>',
-          \ 'previous_key': '<S-Tab>',
-          \ 'accept_key': '<C-y>',
-          \ 'reject_key': '<C-e>'
-          \ })
-
-    call wilder#set_option('pipeline', [
-          \   wilder#branch(
-          \     wilder#cmdline_pipeline({
-          \       'language': 'python',
-          \       'fuzzy': 1,
-          \       'sorter': wilder#python_difflib_sorter(),
-          \       'debounce': 30,
-          \     }),
-          \     wilder#python_search_pipeline({
-          \       'pattern': wilder#python_fuzzy_pattern(),
-          \       'sorter': wilder#python_difflib_sorter(),
-          \       'engine': 're',
-          \       'debounce': 30,
-          \     }),
-          \   ),
-          \ ])
-
-    let l:hl = wilder#make_hl('WilderAccent', 'Pmenu', [{}, {}, {'foreground': '#f4468f'}])
-    call wilder#set_option('renderer', wilder#popupmenu_renderer({
-          \ 'highlighter': wilder#basic_highlighter(),
-          \ 'max_height': 15,
-          \ 'highlights': {
-          \   'accent': l:hl,
-          \ },
-          \ 'left': [' ', wilder#popupmenu_devicons(),],
-          \ 'right': [' ', wilder#popupmenu_scrollbar(),],
-          \ 'apply_incsearch_fix': 0,
-          \ }))
-  catch /^Vim\%((\a\+)\)\=:E117/
-    echohl Error |echomsg "Wilder.nvim missing"| echohl None
-  endtry
-endfunction
-
-""""""""""""""""""""""""""""""vim-auto-save settings""""""""""""""""""""""""""""""
-let g:auto_save = 1  " enable AutoSave on Vim startup