Merge 4d289d16b3 into ce1e13e2c9

update nvim-ufo
add nvim-ufo for folding
2025-06-08 14:14:33 +02:00 · 2024-07-15 21:06:33 +02:00 · 2024-01-24 22:50:18 +08:00 · 2024-01-19 15:44:08 +08:00
52 changed files with 1167 additions and 1457 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@ en.utf-8.add.spl
 .netrwhist
 *.log
 .DS_Store
-lazy-lock.json
--- a/README.md
+++ b/README.md
@@ -9,8 +9,11 @@
    <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.11.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
+      <img src="https://img.shields.io/badge/Neovim-0.9.5-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"/>
@@ -18,6 +21,9 @@
    <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.9.5">
+      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.9.5?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>
@@ -56,7 +62,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 [fzf-lua](https://github.com/ibhagwan/fzf-lua).
+ Ultra-fast project-wide fuzzy searching via [LeaderF](https://github.com/Yggdroot/LeaderF).
 + 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).
@@ -66,6 +72,7 @@ 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).
@@ -75,8 +82,8 @@ 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)
 + ......

 # UI Demo
@@ -89,10 +96,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 fzf-lua
+## File fuzzy finding using LeaderF

 <p align="center">
-<img src="https://github.com/user-attachments/assets/3199e35d-121a-487b-bfd1-58eb69b0b48a" width="800">
+<img src="https://user-images.githubusercontent.com/16662357/183257017-2d9d7605-3c4b-4e1d-8955-30998f9b6f28.gif" width="800">
 </p>

 ## Code autocompletion with nvim-cmp
@@ -107,6 +114,12 @@ 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">
@@ -127,12 +140,6 @@ Go to a string starting with `se`
 <img src="https://user-images.githubusercontent.com/16662357/128589873-aadb8264-1098-4834-9876-fa66a309be05.gif" width="800">
 </p>

-## code folding with nvim-ufo and statuscol.nvim
-
-<p align="center">
-<img src="https://github.com/user-attachments/assets/a01a56b2-7c91-43de-b305-f2fbaa81dcec" width="800">
-</p>
-
 # Shortcuts

 Some of the shortcuts I use frequently are listed here. In the following shortcuts, `<leader>` represents ASCII character `,`.
@@ -158,14 +165,12 @@ Some of the shortcuts I use frequently are listed here. In the following shortcu
 | `<space>t`        | Normal        | Linux/macOS/Win | Toggle tag window (show project tags in the right window)                |
 | `<leader>gs`      | Normal        | Linux/macOS/Win | Show Git status result                                                   |
 | `<leader>gw`      | Normal        | Linux/macOS/Win | Run Git add for current file                                             |
+| `<leader>gd`      | Normal        | Linux/macOS/Win | Run git diff for current file                                            |
 | `<leader>gc`      | Normal        | Linux/macOS/Win | Run git commit                                                           |
 | `<leader>gpl`     | Normal        | Linux/macOS/Win | Run git pull                                                             |
 | `<leader>gpu`     | Normal        | Linux/macOS/Win | Run git push                                                             |
-| `<leader>gbd`     | Normal        | Linux/macOS/Win | Delete a branch                                                          |
-| `<leader>gbn`     | Normal        | Linux/macOS/Win | Create a new branch                                                      |
-| `<leader>gl`      | Normal/Visual | Linux/macOS/Win | Get perm link for current/visually-select lines                          |
-| `<leader>gbr`     | Normal        | macOS           | Browse current git repo in browser                                       |
-| `<leader>gb`      | Visual        | macOS           | Blame current line                                                       |
+| `<leader>gl`      | Normal/Visual | Linux/macOS/Win | Get perm link for current/visually-select lines
+| `<leader>gb`      | Normal        | macOS           | Browse current git repo in browser
 | `<F9>`            | Normal        | Linux/macOS/Win | Compile&run current source file (for C++, LaTeX, Lua, Python)            |
 | `<F11>`           | Normal        | Linux/macOS/Win | Toggle spell checking                                                    |
 | `<F12>`           | Normal        | Linux/macOS/Win | Toggle paste mode                                                        |
@@ -177,6 +182,7 @@ Some of the shortcuts I use frequently are listed here. In the following shortcu
 | `Alt-j`           | Normal        | Linux/macOS/Win | Move current line or selected lines down                                 |
 | `Alt-m`           | Normal        | macOS/Win       | Markdown previewing in system browser                                    |
 | `Alt-Shift-m`     | Normal        | macOS/Win       | Stopping Markdown previewing in system browser                           |
+| `ob`              | Normal/Visual | macOS/Win       | Open link under cursor or search visual selection                        |
 | `ctrl-u`          | Insert        | Linux/macOS/Win | Turn word under cursor to upper case                                     |
 | `ctrl-t`          | Insert        | Linux/macOS/Win | Turn word under cursor to title case                                     |
 | `jk`              | Insert        | Linux/macOS/Win | Return to Normal mode without lagging                                    |
@@ -185,13 +191,11 @@ Some of the shortcuts I use frequently are listed here. In the following shortcu

 In addition to commands provided by various plugins, I have also created some custom commands for personal use.

-| command      | description                                                             | example                        |
-|--------------|-------------------------------------------------------------------------|--------------------------------|
-| `Redir`      | capture command output to a tabpage for easier inspection.              | `Redir hi`                     |
-| `Edit`       | edit multiple files at the same time, supports globing                  | `Edit *.vim`                   |
-| `Datetime`   | print current date and time or convert Unix time stamp to date and time | `Datetime 12345` or `Datetime` |
-| `JSONFormat` | format a JSON file                                                      | `JSONFormat`                   |
-| `CopyPath`   | copy current file path to clipboard                                     | `CopyPath relative`            |
+| command    | description                                                             | example                        |
+|------------|-------------------------------------------------------------------------|--------------------------------|
+| `Redir`    | capture command output to a tabpage for easier inspection.              | `Redir hi`                     |
+| `Edit`     | edit multiple files at the same time, supports globing                  | `Edit *.vim`                   |
+| `Datetime` | print current date and time or convert Unix time stamp to date and time | `Datetime 12345` or `Datetime` |

 # Contributing

--- a/after/ftplugin/json.vim
+++ b/after/ftplugin/json.vim
@@ -0,0 +1,2 @@
+" let the initial folding state be that all folds are closed.
+setlocal foldlevel=0
--- a/after/ftplugin/lua.vim
+++ b/after/ftplugin/lua.vim
@@ -4,4 +4,6 @@ set formatoptions-=r

 nnoremap <buffer><silent> <F9> :luafile %<CR>

-nnoremap <buffer><silent> <space>f <cmd>silent !stylua %<CR>
+" Use nvim-treesitter for folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
--- a/after/ftplugin/python.vim
+++ b/after/ftplugin/python.vim
@@ -13,4 +13,6 @@ 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>
+" Use nvim-treesitter for folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
--- a/after/lsp/clangd.lua
+++ b/after/lsp/clangd.lua
@@ -1,3 +0,0 @@
-return {
-  filetypes = { "c", "cpp", "cc" },
-}
--- a/after/lsp/ltex.lua
+++ b/after/lsp/ltex.lua
@@ -1,8 +0,0 @@
-return {
-  filetypes = { "text", "plaintex", "tex", "markdown" },
-  settings = {
-    ltex = {
-      language = "en",
-    },
-  },
-}
--- a/after/lsp/lua_ls.lua
+++ b/after/lsp/lua_ls.lua
@@ -1,14 +0,0 @@
-- 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,
-      },
-    },
-  },
-}
--- a/after/lsp/pyright.lua
+++ b/after/lsp/pyright.lua
@@ -1,51 +0,0 @@
-- 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,
-}
--- a/after/lsp/ruff.lua
+++ b/after/lsp/ruff.lua
@@ -1,8 +0,0 @@
-return {
-  init_options = {
-    -- the settings can be found here: https://docs.astral.sh/ruff/editors/settings/
-    settings = {
-      organizeImports = true,
-    },
-  },
-}
--- a/autoload/utils.vim
+++ b/autoload/utils.vim
@@ -10,6 +10,23 @@ 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
@@ -129,6 +146,27 @@ 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
--- a/docs/README.md
+++ b/docs/README.md
@@ -118,16 +118,16 @@ The version of Git on the Linux system may be too old so that plugins may break.
 Check [here](https://jdhao.github.io/2021/03/27/upgrade_git_on_linux/) on how to install and set up the latest version of Git.
 For Windows, install [Git for Windows](https://git-scm.com/download/win) and make sure you can run `git` from command line.

-### universal-ctags
+### ctags

 In order to use tags related plugins such as [vista.vim](https://github.com/liuchengxu/vista.vim), we need to install a ctags distribution.
 Universal-ctags is preferred.

 To install it on Linux, we need to build it from source. See [here](https://askubuntu.com/a/836521/768311) for the details.
-To install ctags on macOS, use [Homebrew](https://formulae.brew.sh/formula/universal-ctags):
+To install ctags on macOS, use [Homebrew](https://github.com/universal-ctags/homebrew-universal-ctags):

 ```bash
-brew install universal-ctags
+brew install ctags
 ```

 To install it Windows, use [chocolatey](https://chocolatey.org/) or [scoop](https://scoop.sh/)
@@ -166,9 +166,35 @@ Set their PATH properly and make sure you can run `pylint`, `flake8` and `vint`
 There are various ways to install Nvim depending on your system.
 This config is only maintained for [the latest nvim stable release](https://github.com/neovim/neovim/releases/tag/stable).

-Please check the official doc on how to install Neovim on different systems: https://github.com/neovim/neovim/blob/master/INSTALL.md
+### Linux

-After installing Nvim, we need to set the PATH to nvim correctly.
+You can directly download the binary release from [here](https://github.com/neovim/neovim/releases/download/stable/nvim-linux64.tar.gz).
+You can also use the system package manager to install nvim,
+but that is not reliable since the latest version may not be available.
+
+### Windows
+
+You may download from [nvim release](https://github.com/neovim/neovim/releases/download/stable/nvim-win64.zip) from GitHub and manually extract it.
+
+Another way to install Nvim on Windows is via chocolatey or scoop:
+
+```
+choco install neovim
+
+# via scoop
+# scoop bucket add versions
+# scoop install neovim
+```
+
+### macOS
+
+It is recommended to install neovim via [Homebrew](https://brew.sh/) on macOS. Simply run the following command:
+
+```bash
+brew install neovim
+```
+
+After installing Nvim, we need to set the path to nvim correctly.
 **Make sure that you can run `nvim` from the command line after all these setups**.

 ## Setting up Nvim
--- a/docs/nvim_setup_linux.sh
+++ b/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-linux-x86_64.tar.gz"
+NVIM_LINK="https://github.com/neovim/neovim/releases/download/stable/nvim-linux64.tar.gz"
 if [[ ! -f "$NVIM_DIR/bin/nvim" ]]; then
    echo "Installing Nvim"
    echo "Creating nvim directory under tools directory"
--- a/init.lua
+++ b/init.lua
@@ -11,30 +11,40 @@
 -- StackOverflow: https://stackoverflow.com/users/6064933/jdhao
 vim.loader.enable()

-local utils = require("utils")
+local version = vim.version

-local expected_version = "0.11.1"
-utils.is_compatible_version(expected_version)
+-- check if we have the latest stable version of nvim
+local expected_ver = "0.10.0"
+local ev = version.parse(expected_ver)
+local actual_ver = version()

-local config_dir = vim.fn.stdpath("config")
---@cast config_dir string
+local result = version.cmp(ev, {actual_ver.major, actual_ver.minor, actual_ver.patch})

-- some global settings
-require("globals")
-- setting options in nvim
-vim.cmd("source " .. vim.fs.joinpath(config_dir, "viml_conf/options.vim"))
-- various autocommands
-require("custom-autocmd")
-- all the user-defined mappings
-require("mappings")
-- all the plugins installed and their configurations
-vim.cmd("source " .. vim.fs.joinpath(config_dir, "viml_conf/plugins.vim"))
+if  result ~= 0 then
+  local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
+  local msg = string.format("Expect nvim %s, but got %s instead. Use at your own risk!", expected_ver, _ver)
+  vim.api.nvim_err_writeln(msg)
+end

-- diagnostic related config
-require("diagnostic-conf")
+local core_conf_files = {
+  "globals.lua", -- some global settings
+  "options.vim", -- setting options in nvim
+  "autocommands.vim", -- various autocommands
+  "mappings.lua", -- all the user-defined mappings
+  "plugins.vim", -- all the plugins installed and their configurations
+  "colorschemes.lua", -- colorscheme settings
+}

-- colorscheme settings
-local color_scheme = require("colorschemes")
-
-- Load a random colorscheme
-color_scheme.rand_colorscheme()
+local viml_conf_dir = vim.fn.stdpath("config") .. "/viml_conf"
+-- source all the core config files
+for _, file_name in ipairs(core_conf_files) do
+  if vim.endswith(file_name, 'vim') then
+    local path = string.format("%s/%s", viml_conf_dir, file_name)
+    local source_cmd = "source " .. path
+    vim.cmd(source_cmd)
+  else
+    local module_name, _ = string.gsub(file_name, "%.lua", "")
+    package.loaded[module_name] = nil
+    require(module_name)
+  end
+end
--- a/lua/colorschemes.lua
+++ b/lua/colorschemes.lua
@@ -1,4 +1,5 @@
 --- This module will load a random colorscheme on nvim startup process.
+
 local utils = require("utils")

 local M = {}
@@ -7,14 +8,9 @@ local M = {}
 -- the same as the colorscheme name itself.
 M.colorscheme_conf = {
  onedark = function()
-    -- Lua
-    require("onedark").setup {
-      style = "darker",
-    }
-    require("onedark").load()
+    vim.cmd([[colorscheme onedark]])
  end,
  edge = function()
-    vim.g.edge_style = "default"
    vim.g.edge_enable_italic = 1
    vim.g.edge_better_performance = 1

@@ -28,38 +24,37 @@ M.colorscheme_conf = {
  end,
  gruvbox_material = function()
    -- foreground option can be material, mix, or original
-    vim.g.gruvbox_material_foreground = "original"
+    vim.g.gruvbox_material_foreground = "material"
    --background option can be hard, medium, soft
-    vim.g.gruvbox_material_background = "hard"
+    vim.g.gruvbox_material_background = "soft"
    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 carbonfox]])
+    vim.cmd([[colorscheme nordfox]])
+  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
-    -- onedark_vivid does not enough contrast
-    vim.cmd("colorscheme onedark_dark")
+    vim.cmd('colorscheme onedark_vivid')
  end,
  material = function()
-    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.g.material_style = "oceanic"
+    vim.cmd('colorscheme material')
  end,
 }

@@ -67,8 +62,22 @@ 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

-return M
+-- Load a random colorscheme
+M.rand_colorscheme()
--- a/lua/config/bufferline.lua
+++ b/lua/config/bufferline.lua
@@ -1,6 +1,6 @@
 require("bufferline").setup {
  options = {
-    numbers = "none",
+    numbers = "buffer_id",
    close_command = "bdelete! %d",
    right_mouse_command = nil,
    left_mouse_command = "buffer %d",
@@ -44,7 +44,3 @@ require("bufferline").setup {
    sort_by = "id",
  },
 }
-
-vim.keymap.set("n", "<space>bp", "<cmd>BufferLinePick<CR>", {
-  desc = "pick a buffer",
-})
--- a/lua/config/dashboard-nvim.lua
+++ b/lua/config/dashboard-nvim.lua
@@ -23,19 +23,19 @@ conf.center = {
  {
    icon = "󰈞  ",
    desc = "Find  File                              ",
-    action = "FzfLua files",
+    action = "Leaderf file --popup",
    key = "<Leader> f f",
  },
  {
    icon = "󰈢  ",
    desc = "Recently opened files                   ",
-    action = "FzfLua oldfiles",
+    action = "Leaderf mru --popup",
    key = "<Leader> f r",
  },
  {
    icon = "󰈬  ",
    desc = "Project grep                            ",
-    action = "FzfLua live_grep",
+    action = "Leaderf rg --popup",
    key = "<Leader> f g",
  },
  {
@@ -59,17 +59,17 @@ conf.center = {
  },
 }

-dashboard.setup {
-  theme = "doom",
-  shortcut_type = "number",
-  config = conf,
-}
+dashboard.setup({
+  theme = 'doom',
+  shortcut_type = 'number',
+  config = conf
+})

 api.nvim_create_autocmd("FileType", {
  pattern = "dashboard",
  group = api.nvim_create_augroup("dashboard_enter", { clear = true }),
-  callback = function()
+  callback = function ()
    keymap.set("n", "q", ":qa<CR>", { buffer = true, silent = true })
    keymap.set("n", "e", ":enew<CR>", { buffer = true, silent = true })
-  end,
+  end
 })
--- a/lua/config/fugitive.lua
+++ b/lua/config/fugitive.lua
@@ -1,27 +1,11 @@
 local keymap = vim.keymap

-keymap.set("n", "<leader>gs", "<cmd>Git<cr>", { desc = "Git: show status" })
-keymap.set("n", "<leader>gw", "<cmd>Gwrite<cr>", { desc = "Git: add file" })
-keymap.set("n", "<leader>gc", "<cmd>Git commit<cr>", { desc = "Git: commit changes" })
-keymap.set("n", "<leader>gpl", "<cmd>Git pull<cr>", { desc = "Git: pull changes" })
-keymap.set("n", "<leader>gpu", "<cmd>15 split|term git push<cr>", { desc = "Git: push changes" })
-keymap.set("v", "<leader>gb", ":Git blame<cr>", { desc = "Git: blame selected line" })
+keymap.set("n", "<leader>gs", "<cmd>Git<cr>", { desc = "Git status" })
+keymap.set("n", "<leader>gw", "<cmd>Gwrite<cr>", { desc = "Git add" })
+keymap.set("n", "<leader>gc", "<cmd>Git commit<cr>", { desc = "Git commit" })
+keymap.set("n", "<leader>gd", "<cmd>Gdiffsplit<cr>", { desc = "Git diff" })
+keymap.set("n", "<leader>gpl", "<cmd>Git pull<cr>", { desc = "Git pull" })
+keymap.set("n", "<leader>gpu", "<cmd>15 split|term git push<cr>", { desc = "Git push" })

 -- convert git to Git in command line mode
-vim.fn["utils#Cabbrev"]("git", "Git")
-
-keymap.set("n", "<leader>gbn", function()
-  vim.ui.input({ prompt = "Enter a new branch name" }, function(user_input)
-    if user_input == nil or user_input == "" then
-      return
-    end
-
-    local cmd_str = string.format("G checkout -b %s", user_input)
-    vim.cmd(cmd_str)
-  end)
-end, {
-  desc = "Git: create new branch",
-})
-
-keymap.set("n", "<leader>gf", ":Git fetch ", { desc = "Git: prune branches" })
-keymap.set("n", "<leader>gbd", ":Git branch -D ", { desc = "Git: delete branch" })
+vim.fn['utils#Cabbrev']('git', 'Git')
--- a/lua/config/fzf-lua.lua
+++ b/lua/config/fzf-lua.lua
@@ -1,18 +0,0 @@
-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" })
--- a/lua/config/git-conflict.lua
+++ b/lua/config/git-conflict.lua
@@ -1,12 +0,0 @@
-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,
-})
--- a/lua/config/git-linker.lua
+++ b/lua/config/git-linker.lua
@@ -5,26 +5,16 @@ gitlinker.setup {
  callbacks = {
    ["dev.azure.com"] = function(url_data)
      vim.print(url_data)
-      local url = require("gitlinker.hosts").get_base_https_url(url_data)
+      local url = require"gitlinker.hosts".get_base_https_url(url_data)

      if url_data.lstart then
        if url_data.lend == nil then
          url_data.lend = url_data.lstart
        end
-        url = url
-          .. "?path=/"
-          .. url_data.file
-          .. "&version=GC"
-          .. url_data.rev
-          .. "&line="
-          .. url_data.lstart
-          .. "&lineEnd="
-          .. url_data.lend
-          .. "&lineStartColumn=1"
-          .. "&lineEndColumn=120"
+        url = url .. "?path=/" .. url_data.file .. "&version=GC" .. url_data.rev .. "&line=" .. url_data.lstart .. "&lineEnd=" .. url_data.lend .. "&lineStartColumn=1" .. "&lineEndColumn=120"
      end
      return url
-    end,
+    end
  },
  mappings = nil,
 }
@@ -34,14 +24,14 @@ keymap.set({ "n", "v" }, "<leader>gl", function()
  gitlinker.get_buf_range_url(mode)
 end, {
  silent = true,
-  desc = "Git: get permlink",
+  desc = "get git permlink",
 })

-keymap.set("n", "<leader>gbr", function()
-  gitlinker.get_repo_url {
-    action_callback = gitlinker.actions.open_in_browser,
-  }
+keymap.set("n", "<leader>gb", function()
+  gitlinker.get_repo_url({
+    action_callback = gitlinker.actions.open_in_browser
+  })
 end, {
  silent = true,
-  desc = "Git: browse repo in browser",
+  desc = "browse repo in browser",
 })
--- a/lua/config/gitsigns.lua
+++ b/lua/config/gitsigns.lua
@@ -8,7 +8,7 @@ gs.setup {
    topdelete = { text = "‾" },
    changedelete = { text = "│" },
  },
-  word_diff = false,
+  word_diff = true,
  on_attach = function(bufnr)
    local function map(mode, l, r, opts)
      opts = opts or {}
@@ -38,20 +38,20 @@ gs.setup {
    end, { expr = true, desc = "previous hunk" })

    -- Actions
-    map("n", "<leader>hp", gs.preview_hunk, { desc = "preview hunk" })
+    map("n", "<leader>hp", gs.preview_hunk)
    map("n", "<leader>hb", function()
      gs.blame_line { full = true }
-    end, { desc = "blame hunk" })
+    end)
  end,
 }

-vim.api.nvim_create_autocmd("ColorScheme", {
+vim.api.nvim_create_autocmd('ColorScheme', {
  pattern = "*",
  callback = function()
-    vim.cmd([[
+    vim.cmd [[
      hi GitSignsChangeInline gui=reverse
      hi GitSignsAddInline gui=reverse
      hi GitSignsDeleteInline gui=reverse
-    ]])
-  end,
+    ]]
+  end
 })
--- a/lua/config/glance.lua
+++ b/lua/config/glance.lua
@@ -1,12 +0,0 @@
-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>")
--- a/lua/config/hlslens.lua
+++ b/lua/config/hlslens.lua
@@ -14,9 +14,9 @@ local activate_hlslens = function(direction)

  -- Deal with the case that there is no such pattern in current buffer.
  if not status then
-    local start_idx, _ = string.find(msg, "E486", 1, true)
+    local start_idx, _ = string.find(msg, 'E486', 1, true)
    local msg_part = string.sub(msg, start_idx)
-    api.nvim_echo({ { msg_part } }, true, { err = true })
+    api.nvim_err_writeln(msg_part)
    return
  end

@@ -35,48 +35,15 @@ keymap.set("n", "N", "", {
  end,
 })

-local check_cursor_word = function()
-  local cursor_word = vim.fn.expand("<cword>")
-  local result = cursor_word == ""
-  if result then
-    local msg = "E348: No string under cursor"
-    api.nvim_echo({ { msg } }, true, { err = true })
-  end
-
-  return result, cursor_word
-end
-
 keymap.set("n", "*", "", {
  callback = function()
-    local cursor_word_empty, cursor_word = check_cursor_word()
-    if cursor_word_empty then
-      return
-    end
-
-    local cmd = string.format([[normal! /\v<%s>]], cursor_word)
-
-    -- In order to say that we are pressing Enter key, instead of typing literally the character,
-    -- we need to replace special notation with their internal representation.
-    local escaped_enter = vim.api.nvim_replace_termcodes("<CR>", true, false, true)
-
-    -- character `N` is used to keep the cursor when pressing `*`
-    local full_cmd = cmd .. escaped_enter .. "N"
-    vim.fn.execute(full_cmd)
+    vim.fn.execute("normal! *N")
    hlslens.start()
  end,
 })
 keymap.set("n", "#", "", {
  callback = function()
-    local cursor_word_empty, cursor_word = check_cursor_word()
-    if cursor_word_empty then
-      return
-    end
-
-    local cmd = string.format([[normal! ?\v<%s>]], cursor_word)
-    local escaped_enter = vim.api.nvim_replace_termcodes("<CR>", true, false, true)
-
-    local full_cmd = cmd .. escaped_enter .. "N"
-    vim.fn.execute(full_cmd)
+    vim.fn.execute("normal! #N")
    hlslens.start()
  end,
 })
--- a/lua/config/indent-blankline.lua
+++ b/lua/config/indent-blankline.lua
@@ -0,0 +1,36 @@
+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,
+})
--- a/lua/config/lightbulb.lua
+++ b/lua/config/lightbulb.lua
@@ -1,20 +0,0 @@
---@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,
-}
--- a/lua/config/live-command.lua
+++ b/lua/config/live-command.lua
@@ -1,4 +0,0 @@
-require("live-command").setup {
-  enable_highlighting = true,
-  inline_highlighting = true,
-}
--- a/lua/config/lsp.lua
+++ b/lua/config/lsp.lua
@@ -1,143 +1,273 @@
+local fn = vim.fn
+local api = vim.api
+local keymap = vim.keymap
+local lsp = vim.lsp
+local diagnostic = vim.diagnostic
+
 local utils = require("utils")

-vim.api.nvim_create_autocmd("LspAttach", {
-  group = vim.api.nvim_create_augroup("lsp_buf_conf", { clear = true }),
-  callback = function(event_context)
-    local client = vim.lsp.get_client_by_id(event_context.data.client_id)
-    -- vim.print(client.name, client.server_capabilities)
+-- 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 })

-    if not client then
-      return
-    end
+  local qf_items = diagnostic.toqflist(diagnostics)
+  vim.fn.setqflist({}, ' ', { title = 'Diagnostics', items = qf_items })

-    local bufnr = event_context.buf
+  -- open quickfix by default
+  vim.cmd[[copen]]
+end

-    -- 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
+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", 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/
+  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()
+    inspect(vim.lsp.buf.list_workspace_folders())
+  end, { desc = "list workspace folder" })

-          -- vim.print(options.items)
-          local unique_defs = {}
-          local def_loc_hash = {}
+  -- Set some key bindings conditional on server capabilities
+  if client.server_capabilities.documentFormattingProvider then
+    map("n", "<space>f", vim.lsp.buf.format, { desc = "format code" })
+  end

-          -- 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,
+  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 = " ",
      }
-    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
+      if not vim.b.diagnostics_pos then
+        vim.b.diagnostics_pos = { nil, nil }
+      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})
+      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

-    -- 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.b.diagnostics_pos = cursor_pos
+    end,
+  })

-      vim.api.nvim_create_autocmd("CursorMoved", {
-        group = gid,
-        buffer = bufnr,
-        callback = function()
-          vim.lsp.buf.clear_references()
-        end,
-      })
-    end
-  end,
-  nested = true,
-  desc = "Configure buffer keymap and behavior based on LSP",
-})
+  -- 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
+    ]])

-- Enable lsp servers when they are available
+    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
+    })

-local capabilities = require("lsp_utils").get_default_capabilities()
+    api.nvim_create_autocmd("CursorMoved" , {
+      group = gid,
+      buffer = bufnr,
+      callback = function ()
+        lsp.buf.clear_references()
+      end
+    })
+  end

-vim.lsp.config("*", {
-  capabilities = capabilities,
-  flags = {
-    debounce_text_changes = 500,
-  },
-})
-
-- A mapping from lsp server name to the executable name
-local enabled_lsp_servers = {
-  pyright = "delance-langserver",
-  ruff = "ruff",
-  lua_ls = "lua-language-server",
-  -- ltex = "ltex-ls",
-  -- clangd = "clangd",
-  vimls = "vim-language-server",
-  bashls = "bash-language-server",
-  yamlls = "yaml-language-server",
-}
-
-for server_name, lsp_executable in pairs(enabled_lsp_servers) do
-  if utils.executable(lsp_executable) then
-    vim.lsp.enable(server_name)
-  else
-    local msg = string.format(
-      "Executable '%s' for server '%s' not found! Server will not be enabled",
-      lsp_executable,
-      server_name
-    )
-    vim.notify(msg, vim.log.levels.WARN, { title = "Nvim-config" })
+  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()
+
+local lspconfig = require("lspconfig")
+
+if utils.executable("pylsp") then
+  local venv_path = os.getenv('VIRTUAL_ENV')
+  local py_path = nil
+  -- decide which python executable to use for mypy
+  if venv_path ~= nil then
+    py_path = venv_path .. "/bin/python3"
+  else
+    py_path = vim.g.python3_host_prog
+  end
+
+  lspconfig.pylsp.setup {
+    on_attach = custom_attach,
+    settings = {
+      pylsp = {
+        plugins = {
+          -- formatter options
+          black = { enabled = true },
+          autopep8 = { enabled = false },
+          yapf = { enabled = false },
+          -- linter options
+          pylint = { enabled = true, executable = "pylint" },
+          ruff = { enabled = false },
+          pyflakes = { enabled = false },
+          pycodestyle = { enabled = false },
+          -- type checker
+          pylsp_mypy = {
+            enabled = true,
+            overrides = { "--python-executable", py_path, true },
+            report_progress = true,
+            live_mode = false
+          },
+          -- auto-completion options
+          jedi_completion = { fuzzy = true },
+          -- import sorting
+          isort = { enabled = true },
+        },
+      },
+    },
+    flags = {
+      debounce_text_changes = 200,
+    },
+    capabilities = capabilities,
+  }
+else
+  vim.notify("pylsp not found!", vim.log.levels.WARN, { title = "Nvim-config" })
+end
+
+-- if utils.executable('pyright') then
+--   lspconfig.pyright.setup{
+--     on_attach = custom_attach,
+--     capabilities = capabilities
+--   }
+-- else
+--   vim.notify("pyright not found!", vim.log.levels.WARN, {title = 'Nvim-config'})
+-- end
+
+if utils.executable("ltex-ls") then
+  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
+  lspconfig.clangd.setup {
+    on_attach = custom_attach,
+    capabilities = capabilities,
+    filetypes = { "c", "cpp", "cc" },
+    flags = {
+      debounce_text_changes = 500,
+    },
+  }
+end
+
+-- set up vim-language-server
+if utils.executable("vim-language-server") then
+  lspconfig.vimls.setup {
+    on_attach = custom_attach,
+    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
+if utils.executable("bash-language-server") then
+  lspconfig.bashls.setup {
+    on_attach = custom_attach,
+    capabilities = capabilities,
+  }
+end
+
+if utils.executable("lua-language-server") then
+  -- settings for lua-language-server can be found on https://github.com/LuaLS/lua-language-server/wiki/Settings .
+  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",
+        },
+        diagnostics = {
+          -- Get the language server to recognize the `vim` global
+          globals = { "vim" },
+        },
+        workspace = {
+          -- Make the server aware of Neovim runtime files,
+          -- see also https://github.com/LuaLS/lua-language-server/wiki/Libraries#link-to-workspace .
+          -- Lua-dev.nvim also has similar settings for lua ls, https://github.com/folke/neodev.nvim/blob/main/lua/neodev/luals.lua .
+          library = {
+            vim.env.VIMRUNTIME,
+            fn.stdpath("config"),
+          },
+          maxPreload = 2000,
+          preloadFileSize = 50000,
+        },
+      },
+    },
+    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, {
+--   underline = false,
+--   virtual_text = false,
+--   signs = true,
+--   update_in_insert = false,
+-- })
+
+-- Change border of documentation hover window, See https://github.com/neovim/neovim/pull/13998.
+lsp.handlers["textDocument/hover"] = lsp.with(vim.lsp.handlers.hover, {
+  border = "rounded",
+})
--- a/lua/config/nvim-cmp.lua
+++ b/lua/config/nvim-cmp.lua
@@ -1,15 +1,6 @@
 -- Setup nvim-cmp.
 local cmp = require("cmp")
-
-- 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")
+local lspkind = require("lspkind")

 cmp.setup {
  snippet = {
@@ -44,6 +35,7 @@ cmp.setup {
    { name = "ultisnips" }, -- For ultisnips user.
    { name = "path" }, -- for path completion
    { name = "buffer", keyword_length = 2 }, -- for buffer word completion
+    { name = "emoji", insert = true }, -- emoji completion
  },
  completion = {
    keyword_length = 1,
@@ -52,14 +44,19 @@ cmp.setup {
  view = {
    entries = "custom",
  },
-  -- solution taken from https://github.com/echasnovski/mini.nvim/issues/1007#issuecomment-2258929830
  formatting = {
-    format = function(_, vim_item)
-      local icon, hl = MiniIcons.get("lsp", vim_item.kind)
-      vim_item.kind = icon .. " " .. vim_item.kind
-      vim_item.kind_hl_group = hl
-      return vim_item
-    end,
+    format = lspkind.cmp_format {
+      mode = "symbol_text",
+      menu = {
+        nvim_lsp = "[LSP]",
+        ultisnips = "[US]",
+        nvim_lua = "[Lua]",
+        path = "[Path]",
+        buffer = "[Buffer]",
+        emoji = "[Emoji]",
+        omni = "[Omni]",
+      },
+    },
  },
 }

@@ -72,23 +69,6 @@ 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
--- a/lua/config/nvim-statuscol.lua
+++ b/lua/config/nvim-statuscol.lua
@@ -1,23 +0,0 @@
-local builtin = require("statuscol.builtin")
-local ffi = require("statuscol.ffidef")
-local C = ffi.C
-
-- only show fold level up to this level
-local fold_level_limit = 3
-local function foldfunc(args)
-  local foldinfo = C.fold_info(args.wp, args.lnum)
-  if foldinfo.level > fold_level_limit then
-    return " "
-  end
-
-  return builtin.foldfunc(args)
-end
-
-require("statuscol").setup {
-  relculright = false,
-  segments = {
-    { text = { "%s" }, click = "v:lua.ScSa" },
-    { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
-    { text = { foldfunc, " " }, condition = { true, builtin.not_empty }, click = "v:lua.ScFa" },
-  },
-}
--- a/lua/config/nvim_hop.lua
+++ b/lua/config/nvim_hop.lua
@@ -4,7 +4,7 @@ hop.setup {
  case_insensitive = true,
  char2_fallback_key = "<CR>",
  quit_key = "<Esc>",
-  match_mappings = { "zh_sc" },
+  match_mappings = { "zh_sc" }
 }

 keymap.set({ "n", "v", "o" }, "f", "", {
@@ -24,5 +24,5 @@ vim.api.nvim_create_autocmd("ColorScheme", {
      hi HopNextKey1 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff
      hi HopNextKey2 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff
    ]])
-  end,
+  end
 })
--- a/lua/config/nvim_ufo.lua
+++ b/lua/config/nvim_ufo.lua
@@ -1,44 +0,0 @@
-local handler = function(virtText, lnum, endLnum, width, truncate)
-  local newVirtText = {}
-  local foldedLines = endLnum - lnum
-  local suffix = (" 󰁂  %d"):format(foldedLines)
-  local sufWidth = vim.fn.strdisplaywidth(suffix)
-  local targetWidth = width - sufWidth
-  local curWidth = 0
-
-  for _, chunk in ipairs(virtText) do
-    local chunkText = chunk[1]
-    local chunkWidth = vim.fn.strdisplaywidth(chunkText)
-    if targetWidth > curWidth + chunkWidth then
-      table.insert(newVirtText, chunk)
-    else
-      chunkText = truncate(chunkText, targetWidth - curWidth)
-      local hlGroup = chunk[2]
-      table.insert(newVirtText, { chunkText, hlGroup })
-      chunkWidth = vim.fn.strdisplaywidth(chunkText)
-      -- str width returned from truncate() may less than 2nd argument, need padding
-      if curWidth + chunkWidth < targetWidth then
-        suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
-      end
-      break
-    end
-    curWidth = curWidth + chunkWidth
-  end
-  local rAlignAppndx = math.max(math.min(vim.opt.textwidth["_value"], width - 1) - curWidth - sufWidth, 0)
-  suffix = (" "):rep(rAlignAppndx) .. suffix
-  table.insert(newVirtText, { suffix, "MoreMsg" })
-  return newVirtText
-end
-
-require("ufo").setup {
-  fold_virt_text_handler = handler,
-}
-
-vim.keymap.set("n", "zR", require("ufo").openAllFolds)
-vim.keymap.set("n", "zM", require("ufo").closeAllFolds)
-vim.keymap.set("n", "zr", require("ufo").openFoldsExceptKinds)
-vim.keymap.set("n", "<leader>K", function()
-  local _ = require("ufo").peekFoldedLinesUnderCursor()
-end, {
-  desc = "Preview folded maps",
-})
--- a/lua/config/statusline.lua
+++ b/lua/config/statusline.lua
@@ -1,70 +1,5 @@
 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]")
@@ -164,12 +99,12 @@ end

 local virtual_env = function()
  -- only show virtual env for Python
-  if vim.bo.filetype ~= "python" then
+  if vim.bo.filetype ~= 'python' then
    return ""
  end

-  local conda_env = os.getenv("CONDA_DEFAULT_ENV")
-  local venv_path = os.getenv("VIRTUAL_ENV")
+  local conda_env = os.getenv('CONDA_DEFAULT_ENV')
+  local venv_path = os.getenv('VIRTUAL_ENV')

  if venv_path == nil then
    if conda_env == nil then
@@ -178,106 +113,53 @@ local virtual_env = function()
      return string.format("  %s (conda)", conda_env)
    end
  else
-    local venv_name = vim.fn.fnamemodify(venv_path, ":t")
+    local venv_name = vim.fn.fnamemodify(venv_path, ':t')
    return string.format("  %s (venv)", venv_name)
  end
 end

-local get_active_lsp = function()
-  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
-    return msg
-  end
-
-  for _, client in ipairs(clients) do
-    ---@diagnostic disable-next-line: undefined-field
-    local filetypes = client.config.filetypes
-    if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
-      return client.name
-    end
-  end
-  return msg
-end
-
 require("lualine").setup {
  options = {
    icons_enabled = true,
    theme = "auto",
-    component_separators = { left = "⏐", right = "⏐" },
+    -- component_separators = { left = "", right = "" },
+    -- section_separators = { left = "", right = "" },
    section_separators = "",
+    component_separators = "",
    disabled_filetypes = {},
    always_divide_middle = true,
-    refresh = {
-      statusline = 1000,
-    },
  },
  sections = {
-    lualine_a = {
-      {
-        "filename",
-        symbols = {
-          readonly = "[🔒]",
-        },
-      },
-    },
+    lualine_a = { "mode" },
    lualine_b = {
-      {
-        "branch",
-        fmt = function(name, _)
-          -- truncate branch name in case the name is too long
-          return string.sub(name, 1, 20)
-        end,
-        color = { gui = "italic,bold" },
-      },
-      {
-        get_git_ahead_behind_info,
-        color = { fg = "#E0C479" },
-      },
+      "branch",
      {
        "diff",
        source = diff,
      },
      {
        virtual_env,
-        color = { fg = "black", bg = "#F1CA81" },
-      },
+        color = { fg = 'black', bg = "#F1CA81" }
+      }
    },
    lualine_c = {
+      "filename",
      {
-        "%S",
-        color = { gui = "bold", fg = "cyan" },
+        ime_state,
+        color = { fg = "black", bg = "#f46868" },
      },
      {
        spell,
        color = { fg = "black", bg = "#a7c080" },
      },
-    },
-    lualine_x = {
-      {
-        get_active_lsp,
-        icon = "📡",
-      },
      {
        "diagnostics",
        sources = { "nvim_diagnostic" },
-        symbols = { error = "🆇 ", warn = "⚠️ ", info = "ℹ️ ", hint = " " },
-      },
-      {
-        trailing_space,
-        color = "WarningMsg",
-      },
-      {
-        mixed_indent,
-        color = "WarningMsg",
+        symbols = {error = '🆇 ', warn = '⚠️ ', info = 'ℹ️ ', hint = ' '},
      },
    },
-    lualine_y = {
-      {
-        "encoding",
-        fmt = string.upper,
-      },
+    lualine_x = {
+      "encoding",
      {
        "fileformat",
        symbols = {
@@ -287,14 +169,19 @@ require("lualine").setup {
        },
      },
      "filetype",
-      {
-        ime_state,
-        color = { fg = "black", bg = "#f46868" },
-      },
+    },
+    lualine_y = {
+      "location",
    },
    lualine_z = {
-      "location",
-      "progress",
+      {
+        trailing_space,
+        color = "WarningMsg",
+      },
+      {
+        mixed_indent,
+        color = "WarningMsg",
+      },
    },
  },
  inactive_sections = {
--- a/lua/config/treesitter-textobjects.lua
+++ b/lua/config/treesitter-textobjects.lua
@@ -1,44 +0,0 @@
-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,
-    },
-  },
-}
--- a/lua/config/treesitter.lua
+++ b/lua/config/treesitter.lua
@@ -3,6 +3,6 @@ require("nvim-treesitter.configs").setup {
  ignore_install = {}, -- List of parsers to ignore installing
  highlight = {
    enable = true, -- false will disable the whole extension
-    disable = { "help" }, -- list of language that will be disabled
+    disable = { 'help' }, -- list of language that will be disabled
  },
 }
--- a/lua/config/ufo.lua
+++ b/lua/config/ufo.lua
@@ -0,0 +1,22 @@
+local keymap = vim.keymap
+
+-- disable foldcolumn, see https://github.com/kevinhwang91/nvim-ufo/issues/4
+vim.o.foldcolumn = '0'
+vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
+vim.o.foldlevelstart = 99
+vim.o.foldenable = true -- Don't set nofoldenable in ftplugin
+
+-- treesitter as a main provider instead
+-- Only depend on `nvim-treesitter/queries/filetype/folds.scm`,
+-- performance and stability are better than `foldmethod=nvim_treesitter#foldexpr()`
+require('ufo').setup({
+    provider_selector = function(bufnr, filetype, buftype)
+        return {'treesitter', 'indent'}
+    end
+})
+
+local ufo = require('ufo')
+keymap.set('n', 'zR', ufo.openAllFolds, { desc = 'Open all folds' })
+keymap.set('n', 'zM', ufo.closeAllFolds, { desc = 'Close all folds' })
+keymap.set('n', 'zr', ufo.openFoldsExceptKinds, { desc = 'Fold less' })
+keymap.set('n', 'zm', ufo.closeFoldsWith, { desc = 'Fold more' })
--- a/lua/config/which-key.lua
+++ b/lua/config/which-key.lua
@@ -1,6 +1,60 @@
 require("which-key").setup {
-  preset = "modern",
+  plugins = {
+    marks = true, -- shows a list of your marks on ' and `
+    registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode
+    spelling = {
+      enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions
+      suggestions = 9, -- how many suggestions should be shown in the list?
+    },
+    -- the presets plugin, adds help for a bunch of default keybindings in Neovim
+    -- No actual key bindings are created
+    presets = {
+      operators = true, -- adds help for operators like d, y, ... and registers them for motion / text object completion
+      motions = true, -- adds help for motions
+      text_objects = true, -- help for text objects triggered after entering an operator
+      windows = true, -- default bindings on <c-w>
+      nav = true, -- misc bindings to work with windows
+      z = true, -- bindings for folds, spelling and others prefixed with z
+      g = true, -- bindings for prefixed with g
+    },
+  },
+  -- add operators that will trigger motion and text object completion
+  -- to enable all native operators, set the preset / operators plugin above
+  operators = { gc = "Comments" },
+  key_labels = {
+    -- override the label used to display some keys. It doesn't effect WK in any other way.
+    -- For example:
+    -- ["<space>"] = "SPC",
+    -- ["<cr>"] = "RET",
+    -- ["<tab>"] = "TAB",
+  },
  icons = {
-    mappings = false,
+    breadcrumb = "»", -- symbol used in the command line area that shows your active key combo
+    separator = "➜", -- symbol used between a key and it's label
+    group = "+", -- symbol prepended to a group
+  },
+  window = {
+    border = "none", -- none, single, double, shadow
+    position = "bottom", -- bottom, top
+    margin = { 0, 0, 0, 0 }, -- extra window margin [top, right, bottom, left]
+    padding = { 1, 0, 1, 0 }, -- extra window padding [top, right, bottom, left]
+  },
+  layout = {
+    height = { min = 1, max = 25 }, -- min and max height of the columns
+    width = { min = 20, max = 50 }, -- min and max width of the columns
+    spacing = 1, -- spacing between columns
+    align = "center", -- align columns left, center or right
+  },
+  ignore_missing = false, -- enable this to hide mappings for which you didn't specify a label
+  hidden = { "<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ " }, -- hide mapping boilerplate
+  show_help = true, -- show help message on the command line when the popup is visible
+  triggers = "auto", -- automatically setup triggers
+  -- triggers = {"<leader>"} -- or specify a list manually
+
+  triggers_blacklist = {
+    -- list of mode / prefixes that should never be hooked by WhichKey
+    -- this is mostly relevant for key maps that start with a native binding
+    -- most people should not need to change this
+    n = { "o", "O" },
  },
 }
--- a/lua/config/yanky.lua
+++ b/lua/config/yanky.lua
@@ -1,17 +1,13 @@
-require("yanky").setup {
+require("yanky").setup({
+  ring = {
+    history_length = 50,
+    storage = "memory",
+  },
  preserve_cursor_position = {
    enabled = false,
  },
-  highlight = {
-    on_put = true,
-    on_yank = false,
-    timer = 300,
-  },
-}
-
-vim.keymap.set({ "n", "x" }, "p", "<Plug>(YankyPutAfter)")
-vim.keymap.set({ "n", "x" }, "P", "<Plug>(YankyPutBefore)")
+})

 -- cycle through the yank history, only work after paste
-vim.keymap.set("n", "[y", "<Plug>(YankyPreviousEntry)")
-vim.keymap.set("n", "]y", "<Plug>(YankyNextEntry)")
+vim.keymap.set("n", "[y", "<Plug>(YankyCycleForward)")
+vim.keymap.set("n", "]y", "<Plug>(YankyCycleBackward)")
--- a/lua/config/zen-mode.lua
+++ b/lua/config/zen-mode.lua
@@ -0,0 +1,15 @@
+require("zen-mode").setup {
+  window = {
+    backdrop = 0.8, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
+    width = 120,
+    options = {
+      -- signcolumn = "no", -- disable signcolumn
+      -- number = false, -- disable number column
+      -- relativenumber = false, -- disable relative numbers
+      cursorline = false, -- disable cursorline
+      cursorcolumn = false, -- disable cursor column
+      foldcolumn = "0", -- disable fold column
+      list = false, -- disable whitespace characters
+    },
+  },
+}
--- a/lua/custom-autocmd.lua
+++ b/lua/custom-autocmd.lua
@@ -22,7 +22,7 @@ api.nvim_create_autocmd({ "TextYankPost" }, {
  pattern = "*",
  group = yank_group,
  callback = function()
-    vim.hl.on_yank { higroup = "YankColor", timeout = 300 }
+    vim.highlight.on_yank { higroup = "YankColor", timeout = 300 }
  end,
 })

@@ -37,10 +37,9 @@ api.nvim_create_autocmd({ "CursorMoved" }, {
 api.nvim_create_autocmd("TextYankPost", {
  pattern = "*",
  group = yank_group,
-  ---@diagnostic disable-next-line: unused-local
-  callback = function(context)
-    if vim.v.event.operator == "y" then
-      vim.fn.setpos(".", vim.g.current_cursor_pos)
+  callback = function(ev)
+    if vim.v.event.operator == 'y' then
+      vim.fn.setpos('.', vim.g.current_cursor_pos)
    end
  end,
 })
@@ -103,142 +102,4 @@ local function open_nvim_tree(data)
  require("nvim-tree.api").tree.open()
 end

-api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
-
-- Do not use smart case in command line mode, extracted from https://vi.stackexchange.com/a/16511/15292.
-api.nvim_create_augroup("dynamic_smartcase", { clear = true })
-api.nvim_create_autocmd("CmdLineEnter", {
-  group = "dynamic_smartcase",
-  pattern = ":",
-  callback = function()
-    vim.o.smartcase = false
-  end,
-})
-
-api.nvim_create_autocmd("CmdLineLeave", {
-  group = "dynamic_smartcase",
-  pattern = ":",
-  callback = function()
-    vim.o.smartcase = true
-  end,
-})
-
-api.nvim_create_autocmd("TermOpen", {
-  group = api.nvim_create_augroup("term_start", { clear = true }),
-  pattern = "*",
-  callback = function()
-    -- Do not use number and relative number for terminal inside nvim
-    vim.wo.relativenumber = false
-    vim.wo.number = false
-
-    -- Go to insert mode by default to start typing command
-    vim.cmd("startinsert")
-  end,
-})
-
-local number_toggle_group = api.nvim_create_augroup("numbertoggle", { clear = true })
-api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
-  pattern = "*",
-  group = number_toggle_group,
-  desc = "togger line number",
-  callback = function()
-    if vim.wo.number then
-      vim.wo.relativenumber = true
-    end
-  end,
-})
-
-api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter", "WinLeave" }, {
-  group = number_toggle_group,
-  desc = "togger line number",
-  callback = function()
-    if vim.wo.number then
-      vim.wo.relativenumber = false
-    end
-  end,
-})
-
-api.nvim_create_autocmd("ColorScheme", {
-  group = api.nvim_create_augroup("custom_highlight", { clear = true }),
-  pattern = "*",
-  desc = "Define or overrride some highlight groups",
-  callback = function()
-    -- For yank highlight
-    vim.api.nvim_set_hl(0, "YankColor", { fg = "#34495E", bg = "#2ECC71", ctermfg = 59, ctermbg = 41 })
-
-    -- For cursor colors
-    vim.api.nvim_set_hl(0, "Cursor", { fg = "black", bg = "#00c918", bold = true })
-    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", 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 })
-  end,
-})
-
-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",
-  ---@diagnostic disable-next-line: unused-local
-  callback = function(context)
-    local quit_filetypes = { "qf", "vista", "NvimTree" }
-
-    local should_quit = true
-    local tabwins = api.nvim_tabpage_list_wins(0)
-
-    for _, win in pairs(tabwins) do
-      local buf = api.nvim_win_get_buf(win)
-      local buf_type = vim.api.nvim_get_option_value("filetype", { buf = buf })
-
-      if not vim.tbl_contains(quit_filetypes, buf_type) then
-        should_quit = false
-      end
-    end
-
-    if should_quit then
-      vim.cmd("qall")
-    end
-  end,
-})
-
-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",
-  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 = "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"
-      vim.bo.undolevels = -1
-    end
-  end,
-})
+vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
--- a/lua/diagnostic-conf.lua
+++ b/lua/diagnostic-conf.lua
@@ -1,66 +0,0 @@
-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,
-})
--- a/lua/globals.lua
+++ b/lua/globals.lua
@@ -1,50 +1,54 @@
 local fn = vim.fn
 local api = vim.api

-local utils = require("utils")
+local utils = require('utils')
+
+-- Inspect something
+function _G.inspect(item)
+  vim.print(item)
+end

 ------------------------------------------------------------------------
 --                          custom variables                          --
 ------------------------------------------------------------------------
 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.is_mac  = utils.has("macunix") and true or false

-vim.g.logging_level = vim.log.levels.INFO
+vim.g.logging_level = "info"

 ------------------------------------------------------------------------
 --                         builtin variables                          --
 ------------------------------------------------------------------------
-vim.g.loaded_perl_provider = 0 -- Disable perl provider
-vim.g.loaded_ruby_provider = 0 -- Disable ruby provider
-vim.g.loaded_node_provider = 0 -- Disable node provider
-vim.g.did_install_default_menus = 1 -- do not load menu
+vim.g.loaded_perl_provider = 0  -- Disable perl provider
+vim.g.loaded_ruby_provider = 0  -- Disable ruby provider
+vim.g.loaded_node_provider = 0  -- Disable node provider
+vim.g.did_install_default_menus = 1  -- do not load menu

-if utils.executable("python3") then
+if utils.executable('python3') then
  if vim.g.is_win then
-    vim.g.python3_host_prog = fn.substitute(fn.exepath("python3"), ".exe$", "", "g")
+    vim.g.python3_host_prog = fn.substitute(fn.exepath("python3"), ".exe$", '', 'g')
  else
    vim.g.python3_host_prog = fn.exepath("python3")
  end
 else
-  local msg = "Python3 executable not found! You must install Python3 and set its PATH correctly!"
-  api.nvim_echo({ { msg } }, true, { err = true })
+  api.nvim_err_writeln("Python3 executable not found! You must install Python3 and set its PATH correctly!")
  return
 end

 -- Custom mapping <leader> (see `:h mapleader` for more info)
-vim.g.mapleader = ","
+vim.g.mapleader = ','

 -- Enable highlighting for lua HERE doc inside vim script
-vim.g.vimsyn_embed = "l"
+vim.g.vimsyn_embed = 'l'

 -- Use English as main language
-vim.cmd([[language en_US.UTF-8]])
+vim.cmd [[language en_US.UTF-8]]

 -- Disable loading certain plugins

 -- Whether to load netrw by default, see https://github.com/bling/dotvim/issues/4
-vim.g.loaded_netrw = 1
+vim.g.loaded_netrw       = 1
 vim.g.loaded_netrwPlugin = 1
 vim.g.netrw_liststyle = 3
 if vim.g.is_win then
@@ -69,6 +73,3 @@ 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 }
--- a/lua/lsp_utils.lua
+++ b/lua/lsp_utils.lua
@@ -1,15 +0,0 @@
-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
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -1,4 +1,5 @@
 local keymap = vim.keymap
+local api = vim.api
 local uv = vim.uv

 -- Save key strokes (now we do not need to press shift to enter command mode).
@@ -23,6 +24,19 @@ 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,
@@ -32,21 +46,7 @@ keymap.set("n", [[\x]], "<cmd>windo lclose <bar> cclose <cr>", {
 -- Delete a buffer, without closing the window, see https://stackoverflow.com/q/4465095/6064933
 keymap.set("n", [[\d]], "<cmd>bprevious <bar> bdelete #<cr>", {
  silent = true,
-  desc = "delete current buffer",
-})
-
-keymap.set("n", [[\D]], function()
-  local buf_ids = vim.api.nvim_list_bufs()
-  local cur_buf = vim.api.nvim_win_get_buf(0)
-
-  for _, buf_id in pairs(buf_ids) do
-    -- do not Delete unlisted buffers, which may lead to unexpected errors
-    if vim.api.nvim_get_option_value("buflisted", { buf = buf_id }) and buf_id ~= cur_buf then
-      vim.api.nvim_buf_delete(buf_id, { force = true })
-    end
-  end
-end, {
-  desc = "delete other buffers",
+  desc = "delete buffer",
 })

 -- Insert a blank line below or above current line (do not move the cursor),
@@ -104,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>
@@ -130,6 +130,9 @@ 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" })

@@ -212,24 +215,17 @@ keymap.set("n", "<leader>cb", function()
  local cnt = 0
  local blink_times = 7
  local timer = uv.new_timer()
-  if timer == nil then
-    return
-  end

-  timer:start(
-    0,
-    100,
-    vim.schedule_wrap(function()
-      vim.cmd([[
+  timer:start(0, 100, vim.schedule_wrap(function()
+    vim.cmd[[
      set cursorcolumn!
      set cursorline!
-    ]])
+    ]]

-      if cnt == blink_times then
-        timer:close()
-      end
+    if cnt == blink_times then
+      timer:close()
+    end

-      cnt = cnt + 1
-    end)
-  )
-end, { desc = "show cursor" })
+    cnt = cnt + 1
+  end))
+end)
--- a/lua/plugin_specs.lua
+++ b/lua/plugin_specs.lua
@@ -1,7 +1,6 @@
 local utils = require("utils")

-local plugin_dir = vim.fn.stdpath("data") .. "/lazy"
-local lazypath = plugin_dir .. "/lazy.nvim"
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"

 if not vim.uv.fs_stat(lazypath) then
  vim.fn.system {
@@ -22,83 +21,24 @@ 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 },
  {
    "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",
+      "hrsh7th/cmp-emoji",
+      "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" },
@@ -106,29 +46,28 @@ local plugin_specs = {
      require("config.lsp")
    end,
  },
-  {
-    "dnlhc/glance.nvim",
-    config = function()
-      require("config.glance")
-    end,
-    event = "VeryLazy",
-  },
+
  {
    "nvim-treesitter/nvim-treesitter",
-    lazy = true,
+    enabled = function()
+      if vim.g.is_mac or vim.g.is_linux then
+        return true
+      end
+      return false
+    end,
+    event = "VeryLazy",
    build = ":TSUpdate",
    config = function()
      require("config.treesitter")
    end,
  },
-  {
-    "nvim-treesitter/nvim-treesitter-textobjects",
-    event = "VeryLazy",
-    branch = "master",
-    config = function()
-      require("config.treesitter-textobjects")
-    end,
-  },
+
+  -- Python indent (follows the PEP8 style)
+  { "Vimjas/vim-python-pep8-indent", ft = { "python" } },
+
+  -- Python-related text object
+  { "jeetsukumaran/vim-pythonsense", ft = { "python" } },
+
  { "machakann/vim-swap", event = "VeryLazy" },

  -- IDE for Lisp
@@ -136,7 +75,10 @@ local plugin_specs = {
  {
    "vlime/vlime",
    enabled = function()
-      return utils.executable("sbcl")
+      if utils.executable("sbcl") then
+        return true
+      end
+      return false
    end,
    config = function(plugin)
      vim.opt.rtp:append(plugin.dir .. "/vim")
@@ -147,7 +89,7 @@ local plugin_specs = {
  -- Super fast buffer jump
  {
    "smoka7/hop.nvim",
-    keys = { "f" },
+    event = "VeryLazy",
    config = function()
      require("config.nvim_hop")
    end,
@@ -162,6 +104,16 @@ local plugin_specs = {
      require("config.hlslens")
    end,
  },
+  {
+    "Yggdroot/LeaderF",
+    cmd = "Leaderf",
+    build = function()
+      if not vim.g.is_win then
+        vim.cmd(":LeaderfInstallCExtension")
+      end
+    end,
+  },
+  "nvim-lua/plenary.nvim",
  {
    "nvim-telescope/telescope.nvim",
    cmd = "Telescope",
@@ -170,17 +122,9 @@ local plugin_specs = {
    },
  },
  {
-    "ibhagwan/fzf-lua",
-    config = function()
-      require("config.fzf-lua")
-    end,
-    event = "VeryLazy",
-  },
-  {
-    "MeanderingProgrammer/markdown.nvim",
-    main = "render-markdown",
-    opts = {},
-    ft = { "markdown" },
+    "lukas-reineke/headlines.nvim",
+    dependencies = "nvim-treesitter/nvim-treesitter",
+    config = true, -- or `opts = {}`
  },
  -- A list of colorscheme plugin you may want to try. Find what suits you.
  { "navarasu/onedark.nvim", lazy = true },
@@ -192,32 +136,15 @@ local plugin_specs = {
  { "catppuccin/nvim", name = "catppuccin", lazy = true },
  { "olimorris/onedarkpro.nvim", lazy = true },
  { "marko-cerovac/material.nvim", lazy = true },
-  {
-    "rockyzhang24/arctic.nvim",
-    dependencies = { "rktjmp/lush.nvim" },
-    name = "arctic",
-    branch = "v2",
-  },
-  { "rebelot/kanagawa.nvim", lazy = true },

-  -- 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-tree/nvim-web-devicons", event = "VeryLazy" },

  {
    "nvim-lualine/lualine.nvim",
-    event = "BufRead",
+    event = "VeryLazy",
    cond = firenvim_not_active,
    config = function()
-      require("config.lualine")
+      require("config.statusline")
    end,
  },

@@ -240,42 +167,16 @@ local plugin_specs = {
  },

  {
-    "echasnovski/mini.indentscope",
-    version = false,
-    config = function()
-      local mini_indent = require("mini.indentscope")
-      mini_indent.setup {
-        draw = {
-          animation = mini_indent.gen_animation.none(),
-        },
-        symbol = "▏",
-      }
-    end,
-  },
-  {
-    "luukvbaal/statuscol.nvim",
-    opts = {},
-    config = function()
-      require("config.nvim-statuscol")
-    end,
-  },
-  {
-    "kevinhwang91/nvim-ufo",
-    dependencies = "kevinhwang91/promise-async",
+    "lukas-reineke/indent-blankline.nvim",
    event = "VeryLazy",
-    opts = {},
-    init = function()
-      vim.o.foldcolumn = "1" -- '0' is not bad
-      vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
-      vim.o.foldlevelstart = 99
-      vim.o.foldenable = true
-    end,
+    main = 'ibl',
    config = function()
-      require("config.nvim_ufo")
+      require("config.indent-blankline")
    end,
  },
+
  -- Highlight URLs inside vim
-  { "itchyny/vim-highlighturl", event = "BufReadPost" },
+  { "itchyny/vim-highlighturl", event = "VeryLazy" },

  -- notification plugin
  {
@@ -286,22 +187,18 @@ 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.
  {
-    "chrishrb/gx.nvim",
-    keys = { { "gx", "<cmd>Browse<cr>", mode = { "n", "x" } } },
-    cmd = { "Browse" },
-    init = function()
-      vim.g.netrw_nogx = 1 -- disable netrw gx
-    end,
+    "tyru/open-browser.vim",
    enabled = function()
-      return vim.g.is_win or vim.g.is_mac
+      if vim.g.is_win or vim.g.is_mac then
+        return true
+      else
+        return false
+      end
    end,
-    config = true, -- default settings
-    submodules = false, -- not needed, submodules are required only for tests
+    event = "VeryLazy",
  },

  -- Only install these plugins if ctags are installed on the system
@@ -309,49 +206,49 @@ local plugin_specs = {
  {
    "liuchengxu/vista.vim",
    enabled = function()
-      return utils.executable("ctags")
+      if utils.executable("ctags") then
+        return true
+      else
+        return false
+      end
    end,
    cmd = "Vista",
  },

  -- Snippet engine and snippet template
-  {
-    "SirVer/ultisnips",
-    dependencies = {
-      "honza/vim-snippets",
-    },
-    event = "InsertEnter",
-  },
+  { "SirVer/ultisnips", dependencies = {
+    "honza/vim-snippets",
+  }, event = "InsertEnter" },

  -- Automatic insertion and deletion of a pair of characters
  {
-    "windwp/nvim-autopairs",
-    event = "InsertEnter",
-    config = true,
+      'windwp/nvim-autopairs',
+      event = "InsertEnter",
+      config = true
  },

  -- Comment plugin
-  {
-    "tpope/vim-commentary",
-    keys = {
-      { "gc", mode = "n" },
-      { "gc", mode = "v" },
-    },
-  },
+  { "tpope/vim-commentary", event = "VeryLazy" },

  -- 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",
+    cmd = { "YankyRingHistory" },
    config = function()
      require("config.yanky")
    end,
-    cmd = "YankyRingHistory",
  },

  -- Handy unix command inside Vim (Rename, Move etc.)
@@ -365,7 +262,10 @@ local plugin_specs = {
  {
    "lyokha/vim-xkbswitch",
    enabled = function()
-      return vim.g.is_mac and utils.executable("xkbswitch")
+      if vim.g.is_mac and utils.executable("xkbswitch") then
+        return true
+      end
+      return false
    end,
    event = { "InsertEnter" },
  },
@@ -373,11 +273,17 @@ local plugin_specs = {
  {
    "Neur1n/neuims",
    enabled = function()
-      return vim.g.is_win
+      if vim.g.is_win then
+        return true
+      end
+      return false
    end,
    event = { "InsertEnter" },
  },

+  -- Auto format tools
+  { "sbdchd/neoformat", cmd = { "Neoformat" } },
+
  -- Git command inside vim
  {
    "tpope/vim-fugitive",
@@ -389,14 +295,7 @@ local plugin_specs = {

  -- Better git log display
  { "rbong/vim-flog", cmd = { "Flog" } },
-  {
-    "akinsho/git-conflict.nvim",
-    version = "*",
-    event = "VeryLazy",
-    config = function()
-      require("config.git-conflict")
-    end,
-  },
+  { "akinsho/git-conflict.nvim", version = "*", config = true },
  {
    "ruifm/gitlinker.nvim",
    event = "User InGitRepo",
@@ -411,12 +310,13 @@ local plugin_specs = {
    config = function()
      require("config.gitsigns")
    end,
-    event = "BufRead",
  },

+  -- Better git commit experience
+  { "rhysd/committia.vim", lazy = true },
+
  {
-    "sindrets/diffview.nvim",
-    cmd = { "DiffviewOpen" },
+    "sindrets/diffview.nvim"
  },

  {
@@ -427,31 +327,48 @@ 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", ft = { "markdown" } },
+  { "godlygeek/tabular", cmd = { "Tabularize" } },

  -- Markdown previewing (only for Mac and Windows)
  {
    "iamcco/markdown-preview.nvim",
    enabled = function()
-      return vim.g.is_win or vim.g.is_mac
+      if vim.g.is_win or vim.g.is_mac then
+        return true
+      end
+      return false
    end,
-    build = "cd app && npm install && git restore .",
+    build = "cd app && npm install",
    ft = { "markdown" },
  },

+  {
+    "folke/zen-mode.nvim",
+    cmd = "ZenMode",
+    config = function()
+      require("config.zen-mode")
+    end,
+  },
+
  {
    "rhysd/vim-grammarous",
    enabled = function()
-      return vim.g.is_mac
+      if vim.g.is_mac then
+        return true
+      end
+      return false
    end,
    ft = { "markdown" },
  },

-  { "chrisbra/unicode.vim", keys = { "ga" }, cmd = { "UnicodeSearch" } },
+  { "chrisbra/unicode.vim", event = "VeryLazy" },

  -- Additional powerful text object for vim, this plugin should be studied
  -- carefully to use its full power
@@ -460,11 +377,17 @@ 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()
-      return utils.executable("latex")
+      if utils.executable("latex") then
+        return true
+      end
+      return false
    end,
    ft = { "tex" },
  },
@@ -475,14 +398,17 @@ local plugin_specs = {
  {
    "tmux-plugins/vim-tmux",
    enabled = function()
-      return utils.executable("tmux")
+      if utils.executable("tmux") then
+        return true
+      end
+      return false
    end,
    ft = { "tmux" },
  },

  -- Modern matchit implementation
  { "andymass/vim-matchup", event = "BufRead" },
-  { "tpope/vim-scriptease", cmd = { "Scriptnames", "Messages", "Verbose" } },
+  { "tpope/vim-scriptease", cmd = { "Scriptnames", "Message", "Verbose" } },

  -- Asynchronous command execution
  { "skywind3000/asyncrun.vim", lazy = true, cmd = { "AsyncRun" } },
@@ -492,30 +418,25 @@ local plugin_specs = {
  {
    "glacambre/firenvim",
    enabled = function()
-      return vim.g.is_win or vim.g.is_mac
+      if vim.g.is_win or vim.g.is_mac then
+        return true
+      end
+      return false
    end,
-    -- it seems that we can only call the firenvim function directly.
-    -- Using vim.fn or vim.cmd to call this function will fail.
    build = function()
-      local firenvim_path = plugin_dir .. "/firenvim"
-      vim.opt.runtimepath:append(firenvim_path)
-      vim.cmd("runtime! firenvim.vim")
-
-      -- macOS will reset the PATH when firenvim starts a nvim process, causing the PATH variable to change unexpectedly.
-      -- Here we are trying to get the correct PATH and use it for firenvim.
-      -- See also https://github.com/glacambre/firenvim/blob/master/TROUBLESHOOTING.md#make-sure-firenvims-path-is-the-same-as-neovims
-      local path_env = vim.env.PATH
-      local prologue = string.format('export PATH="%s"', path_env)
-      -- local prologue = "echo"
-      local cmd_str = string.format(":call firenvim#install(0, '%s')", prologue)
-      vim.cmd(cmd_str)
+      vim.fn["firenvim#install"](0)
    end,
+    lazy = true,
  },
+
  -- Debugger plugin
  {
    "sakhnik/nvim-gdb",
    enabled = function()
-      return vim.g.is_win or vim.g.is_linux
+      if vim.g.is_win or vim.g.is_linux then
+        return true
+      end
+      return false
    end,
    build = { "bash install.sh" },
    lazy = true,
@@ -527,11 +448,20 @@ local plugin_specs = {
  {
    "ojroques/vim-oscyank",
    enabled = function()
-      return vim.g.is_linux
+      if vim.g.is_linux then
+        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",
@@ -540,23 +470,7 @@ 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" },

@@ -564,6 +478,7 @@ local plugin_specs = {
  {
    "nvim-tree/nvim-tree.lua",
    keys = { "<space>s" },
+    dependencies = { "nvim-tree/nvim-web-devicons" },
    config = function()
      require("config.nvim-tree")
    end,
@@ -571,80 +486,29 @@ local plugin_specs = {

  {
    "j-hui/fidget.nvim",
-    event = "BufRead",
+    event = "VeryLazy",
+    tag = "legacy",
    config = function()
      require("config.fidget-nvim")
    end,
  },
  {
-    "folke/lazydev.nvim",
-    ft = "lua", -- only load on lua files
-    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
-    },
-    opts = {
-      debug = true, -- Enable debugging
-      -- See Configuration section for rest
-    },
-    cmd = { "CopilotChat" },
-  },
-  {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
+    'kevinhwang91/nvim-ufo',
+    dependencies = {'kevinhwang91/promise-async'},
+    event = { "VeryLazy" },
    config = function()
-      require("copilot").setup {}
-    end,
-  },
-  {
-    "smjonas/live-command.nvim",
-    -- live-command supports semantic versioning via Git tags
-    -- tag = "2.*",
-    cmd = "Preview",
-    config = function()
-      require("config.live-command")
-    end,
-  },
-  {
-    -- 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("config.lightbulb")
-    end,
-    event = "LspAttach",
-  },
-  {
-    "Bekaboo/dropbar.nvim",
-    event = "VeryLazy",
-  },
-  {
-    "catgoose/nvim-colorizer.lua",
-    event = "BufReadPre",
-    opts = { -- set to setup table
-    },
-  },
+      require("config.ufo")
+    end
+  }
 }

---@diagnostic disable-next-line: missing-fields
-require("lazy").setup {
-  spec = plugin_specs,
+-- configuration for lazy itself.
+local lazy_opts = {
  ui = {
    border = "rounded",
    title = "Plugin Manager",
    title_pos = "center",
  },
-  rocks = {
-    enabled = false,
-    hererocks = false,
-  },
 }
+
+require("lazy").setup(plugin_specs, lazy_opts)
--- a/lua/utils.lua
+++ b/lua/utils.lua
@@ -1,18 +1,19 @@
 local fn = vim.fn
-local version = vim.version

 local M = {}

--- Check if an executable exists
--- @param name string An executable name/path
--- @return boolean
 function M.executable(name)
-  return fn.executable(name) > 0
+  if fn.executable(name) > 0 then
+    return true
+  end
+
+  return false
 end

 --- check whether a feature exists in Nvim
--- @param feat string the feature name, like `nvim-0.7` or `unix`.
--- @return boolean
+--- @feat: string
+---   the feature name, like `nvim-0.7` or `unix`.
+--- return: bool
 M.has = function(feat)
  if fn.has(feat) == 1 then
    return true
@@ -32,9 +33,8 @@ end

 --- Generate random integers in the range [Low, High], inclusive,
 --- adapted from https://stackoverflow.com/a/12739441/6064933
--- @param low integer the lower value for this range
--- @param high integer the upper value for this range
--- @return integer
+--- @low: the lower value for this range
+--- @high: the upper value for this range
 function M.rand_int(low, high)
  -- Use lua to generate random int, see also: https://stackoverflow.com/a/20157671/6064933
  math.randomseed(os.time())
@@ -43,53 +43,17 @@ function M.rand_int(low, high)
 end

 --- Select a random element from a sequence/list.
--- @param seq any[] the sequence to choose an element
+--- @seq: the sequence to choose an element
 function M.rand_element(seq)
  local idx = M.rand_int(1, #seq)

  return seq[idx]
 end

--- check if the current nvim version is compatible with the allowed version
--- @param expected_version string
--- @return boolean
-function M.is_compatible_version(expected_version)
-  -- check if we have the latest stable version of nvim
-  local expect_ver = version.parse(expected_version)
-  local actual_ver = vim.version()
+function M.add_pack(name)
+  local status, error = pcall(vim.cmd, "packadd " .. name)

-  if expect_ver == nil then
-    local msg = string.format("Unsupported version string: %s", expected_version)
-    vim.api.nvim_echo({ { msg } }, true, { err = true })
-    return false
-  end
-
-  local result = version.cmp(expect_ver, actual_ver)
-  if result ~= 0 then
-    local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
-    local msg = string.format(
-      "Expect nvim version %s, but your current nvim version is %s. Use at your own risk!",
-      expected_version,
-      _ver
-    )
-    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
+  return status
 end

 return M
--- a/plugin/command.lua
+++ b/plugin/command.lua
@@ -1,59 +0,0 @@
-- Copy file path to clipboard
-vim.api.nvim_create_user_command("CopyPath", function(context)
-  local full_path = vim.fn.glob("%:p")
-
-  local file_path = nil
-  if context["args"] == "nameonly" then
-    file_path = vim.fn.fnamemodify(full_path, ":t")
-  end
-
-  -- get the file path relative to project root
-  if context["args"] == "relative" then
-    local project_marker = { ".git", "pyproject.toml" }
-    local project_root = vim.fs.root(0, project_marker)
-    if project_root == nil then
-      vim.print("can not find project root")
-      return
-    end
-
-    file_path = vim.fn.substitute(full_path, project_root, "<project-root>", "g")
-  end
-
-  if context["args"] == "absolute" then
-    file_path = full_path
-  end
-
-  vim.fn.setreg("+", file_path)
-  vim.print("Filepath copied to clipboard!")
-end, {
-  bang = false,
-  nargs = 1,
-  force = true,
-  desc = "Copy current file path to clipboard",
-  complete = function()
-    return { "nameonly", "relative", "absolute" }
-  end,
-})
-
-- JSON format part of or the whole file
-vim.api.nvim_create_user_command("JSONFormat", function(context)
-  local range = context["range"]
-  local line1 = context["line1"]
-  local line2 = context["line2"]
-
-  if range == 0 then
-    -- the command is invoked without range, then we assume whole buffer
-    local cmd_str = string.format("%s,%s!python -m json.tool", line1, line2)
-    vim.fn.execute(cmd_str)
-  elseif range == 2 then
-    -- the command is invoked with some range
-    local cmd_str = string.format("%s,%s!python -m json.tool", line1, line2)
-    vim.fn.execute(cmd_str)
-  else
-    local msg = string.format("unsupported range: %s", range)
-    vim.api.nvim_echo({ { msg } }, true, { err = true })
-  end
-end, {
-  desc = "Format JSON string",
-  range = "%",
-})
--- a/plugin/command.vim
+++ b/plugin/command.vim
@@ -45,3 +45,6 @@ function! s:md_to_pdf() abort
    echoerr "Error running command"
  endif
 endfunction
+
+" json format
+command! -range JSONFormat <line1>,<line2>!python -m json.tool
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -467,12 +467,3 @@ pylintrc
 PYTHONPATH
 Uvicorn
 qpdf
-Elasticsearch
-kibana
-submodule
-unix
-GCP
-Kubernetes
-pubsub
-Luarocks
-luarocks
--- a/viml_conf/autocommands.vim
+++ b/viml_conf/autocommands.vim
@@ -0,0 +1,123 @@
+" Do not use smart case in command line mode, extracted from https://vi.stackexchange.com/a/16511/15292.
+augroup dynamic_smartcase
+  autocmd!
+  autocmd CmdLineEnter : set nosmartcase
+  autocmd CmdLineLeave : set smartcase
+augroup END
+
+augroup term_settings
+  autocmd!
+  " Do not use number and relative number for terminal inside nvim
+  autocmd TermOpen * setlocal norelativenumber nonumber
+  " Go to insert mode by default to start typing command
+  autocmd TermOpen * startinsert
+augroup END
+
+" More accurate syntax highlighting? (see `:h syn-sync`)
+augroup accurate_syn_highlight
+  autocmd!
+  autocmd BufEnter * :syntax sync fromstart
+augroup END
+
+" Return to last cursor position when opening a file
+augroup resume_cursor_position
+  autocmd!
+  autocmd BufReadPost * call s:resume_cursor_position()
+augroup END
+
+" Only resume last cursor position when there is no go-to-line command (something like '+23').
+function s:resume_cursor_position() abort
+  if line("'\"") > 1 && line("'\"") <= line("$") && &ft !~# 'commit'
+    let l:args = v:argv  " command line arguments
+    for l:cur_arg in l:args
+      " Check if a go-to-line command is given.
+      let idx = match(l:cur_arg, '\v^\+(\d){1,}$')
+      if idx != -1
+        return
+      endif
+    endfor
+
+    execute "normal! g`\"zvzz"
+  endif
+endfunction
+
+augroup numbertoggle
+  autocmd!
+  autocmd BufEnter,FocusGained,InsertLeave,WinEnter * if &nu | set rnu   | endif
+  autocmd BufLeave,FocusLost,InsertEnter,WinLeave   * if &nu | set nornu | endif
+augroup END
+
+" Define or override some highlight groups
+augroup custom_highlight
+  autocmd!
+  autocmd ColorScheme * call s:custom_highlight()
+augroup END
+
+function! s:custom_highlight() abort
+  " For yank highlight
+  highlight YankColor ctermfg=59 ctermbg=41 guifg=#34495E guibg=#2ECC71
+
+  " For cursor colors
+  highlight Cursor cterm=bold gui=bold guibg=#00c918 guifg=black
+  highlight Cursor2 guifg=red guibg=red
+
+  " For floating windows border highlight
+  highlight FloatBorder guifg=LightGreen guibg=NONE
+
+  " highlight for matching parentheses
+  highlight MatchParen cterm=bold,underline gui=bold,underline
+endfunction
+
+augroup auto_close_win
+  autocmd!
+  autocmd BufEnter * call s:quit_current_win()
+augroup END
+
+" Quit Nvim if we have only one window, and its filetype match our pattern.
+function! s:quit_current_win() abort
+  let l:quit_filetypes = ['qf', 'vista', 'NvimTree']
+
+  let l:should_quit = v:true
+
+  let l:tabwins = nvim_tabpage_list_wins(0)
+  for w in l:tabwins
+    let l:buf = nvim_win_get_buf(w)
+    let l:bf = getbufvar(l:buf, '&filetype')
+
+    if index(l:quit_filetypes, l:bf) == -1
+      let l:should_quit = v:false
+    endif
+  endfor
+
+  if l:should_quit
+    qall
+  endif
+endfunction
+
+augroup git_repo_check
+  autocmd!
+  autocmd VimEnter,DirChanged * call utils#Inside_git_repo()
+augroup END
+
+" ref: https://vi.stackexchange.com/a/169/15292
+function! s:handle_large_file() abort
+  let g:large_file = 10485760 " 10MB
+  let f = expand("<afile>")
+
+  if getfsize(f) > g:large_file || getfsize(f) == -2
+    set eventignore+=all
+    " turning off relative number helps a lot
+    set norelativenumber
+    setlocal noswapfile bufhidden=unload buftype=nowrite undolevels=-1
+  else
+    set eventignore-=all relativenumber
+  endif
+endfunction
+
+augroup LargeFile
+  autocmd!
+  autocmd BufReadPre * call s:handle_large_file()
+augroup END
+
+" Load auto-command defined in Lua
+lua require("custom-autocmd")
--- a/viml_conf/options.vim
+++ b/viml_conf/options.vim
@@ -1,14 +1,11 @@
 scriptencoding utf-8

 " change fillchars for folding, vertical split, end of buffer, and message separator
-set fillchars=fold:\ ,foldsep:\ ,foldopen:,foldclose:,vert:\│,eob:\ ,msgsep:‾,diff:╱
+set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾,diff:╱

 " Split window below/right when creating horizontal/vertical windows
 set splitbelow splitright

-" avoid the flickering when splitting window horizontal
-set splitkeep=screen
-
 " Time in milliseconds to wait for a mapped sequence to complete,
 " see https://unix.stackexchange.com/q/36882/221410 for more info
 set timeoutlen=500
@@ -72,7 +69,7 @@ set wildmode=list:longest
 set scrolloff=3

 " Use mouse to select and resize windows, etc.
-set mouse=n
+set mouse=nic  " Enable mouse in several mode
 set mousemodel=popup  " Set the behaviour of mouse
 set mousescroll=ver:1,hor:0

@@ -115,18 +112,15 @@ 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
 set completeopt-=preview  " Disable the preview window

 set pumheight=10  " Maximum number of items to show in popup menu
-set pumblend=5  " pseudo transparency for completion menu
+set pumblend=10  " 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
@@ -182,5 +176,3 @@ set diffopt+=linematch:60

 set nowrap  " do no wrap
 set noruler
-
-set showcmdloc=statusline
--- a/viml_conf/plugins.vim
+++ b/viml_conf/plugins.vim
@@ -34,6 +34,105 @@ 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'
+
+" Popup window settings
+let w = float2nr(&columns * 0.8)
+if w > 140
+  let g:Lf_PopupWidth = 140
+else
+  let g:Lf_PopupWidth = w
+endif
+
+let g:Lf_PopupPosition = [0, float2nr((&columns - g:Lf_PopupWidth)/2)]
+
+" 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<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
+      \}
+
+""""""""""""""""""""""""""""open-browser.vim settings"""""""""""""""""""
+if g:is_win || g:is_mac
+  " Disable netrw's gx mapping.
+  let g:netrw_nogx = 1
+
+  " Use another mapping for the open URL method
+  nmap ob <Plug>(openbrowser-smart-search)
+  xmap ob <Plug>(openbrowser-smart-search)
+endif
+
 """"""""""""""""""""""""""" vista settings """"""""""""""""""""""""""""""""""
 let g:vista#renderer#icons = {
      \ 'member': '',
@@ -72,6 +171,25 @@ let g:neoformat_c_clangformat = {
 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
@@ -240,3 +358,52 @@ 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
Author	SHA1	Message	Date
Martin	dbb8190a93	Merge `4d289d16b3` into `ce1e13e2c9`	2024-07-15 21:06:33 +02:00
martin	4d289d16b3	update nvim-ufo	2024-01-24 22:50:18 +08:00
martin	90a0645d42	add nvim-ufo for folding	2024-01-19 15:44:08 +08:00