use a cmp-fork for now

Until cmp is maintained again or switch??

README.md

@@ -13,7 +13,7 @@
       <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.8.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
+      <img src="https://img.shields.io/badge/Neovim-0.10.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
     </a>
     <a href="https://github.com/jdhao/nvim-config/search?l=vim-script">
       <img src="https://img.shields.io/github/languages/top/jdhao/nvim-config" alt="Top languages"/>
@@ -21,8 +21,8 @@
     <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.8.1">
-      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.8.1?style=flat-square" />
+    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.10.0">
+      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.10.0?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" />
@@ -57,14 +57,14 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 
 # Features #
 
-+ Plugin management via [Packer.nvim](https://github.com/wbthomason/packer.nvim).
++ Plugin management via [Lazy.nvim](https://github.com/folke/lazy.nvim).
 + Code, snippet, word auto-completion via [nvim-cmp](https://github.com/hrsh7th/nvim-cmp).
 + Language server protocol (LSP) support via [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig).
 + Git integration via [vim-fugitive](https://github.com/tpope/vim-fugitive).
 + Better escaping from insert mode via [better-escape.vim](https://github.com/nvim-zh/better-escape.vim).
 + Ultra-fast project-wide fuzzy searching via [LeaderF](https://github.com/Yggdroot/LeaderF).
 + Faster code commenting via [vim-commentary](https://github.com/tpope/vim-commentary).
-+ Faster matching pair insertion and jump via [delimitMate](https://github.com/Raimondi/delimitMate).
++ 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).
 + Fast buffer jump via [hop.nvim](https://github.com/phaazon/hop.nvim).
 + Powerful snippet insertion via [Ultisnips](https://github.com/SirVer/ultisnips).
@@ -84,6 +84,7 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + 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
@@ -140,6 +141,12 @@ 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 `,`.
@@ -165,12 +172,14 @@ 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>gl`      | Normal/Visual | Linux/macOS/Win | Get perm link for current/visually-select lines
-| `<leader>gb`      | Normal        | macOS           | Browse current git repo in browser
+| `<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                                                       |
 | `<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                                                        |
@@ -191,11 +200,12 @@ 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` |
+| 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`                   |
 
 # Contributing
 

after/ftplugin/cpp.vim

@@ -34,6 +34,3 @@ function s:create_term_buf(_type, size) abort
   endif
   execute 'resize ' . a:size
 endfunction
-
-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"

after/ftplugin/lua.vim

@@ -3,6 +3,3 @@ set formatoptions-=o
 set formatoptions-=r
 
 nnoremap <buffer><silent> <F9> :luafile %<CR>
-
-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"

after/ftplugin/python.vim

@@ -12,6 +12,3 @@ set tabstop=4       " number of visual spaces per TAB
 set softtabstop=4   " number of spaces in tab when editing
 set shiftwidth=4    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces
-
-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"

autoload/utils.vim

@@ -128,11 +128,22 @@ endfunction
 
 " Output current time or unix timestamp in human-readable format.
 function! utils#iso_time(timestamp) abort
-  if a:timestamp
-    return strftime('%Y-%m-%d %H:%M:%S%z', a:timestamp)
+  " Get current datetime
+  if !a:timestamp
+    return strftime('%Y-%m-%d %H:%M:%S%z')
   endif
 
-  return strftime('%Y-%m-%d %H:%M:%S%z')
+  " this timestamp in expressed in milliseconds
+  if len(a:timestamp) == 13
+    let l:timestamp = a:timestamp[:-4]
+  " this timestamp in expressed in microseconds
+  elseif len(a:timestamp) == 16
+    let l:timestamp = a:timestamp[:-7]
+  else
+    let l:timestamp = a:timestamp
+  endif
+  return strftime('%Y-%m-%d %H:%M:%S%z', l:timestamp)
+
 endfunction
 
 " Check if we are inside a Git repo.
@@ -141,9 +152,7 @@ function! utils#Inside_git_repo() abort
   if match(res, 'true') == -1
     return v:false
   else
-    " Manually trigger a special user autocmd InGitRepo (to use it for
-    " lazyloading of fugitive by packer.nvim).
-    " See also https://github.com/wbthomason/packer.nvim/discussions/534.
+    " Manually trigger a special user autocmd InGitRepo (used lazyloading.
     doautocmd User InGitRepo
     return v:true
   endif

core/autocommands.vim

@@ -1,123 +0,0 @@
-" 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")

core/colorschemes.lua

@@ -1,153 +0,0 @@
---- This module will load a random colorscheme on nvim startup process.
-
-local utils = require("utils")
-
-local M = {}
-
--- Colorscheme to its directory name mapping, because colorscheme repo name is not necessarily
--- the same as the colorscheme name itself.
-M.colorscheme2dir = {
-  onedark = "onedark.nvim",
-  edge = "edge",
-  sonokai = "sonokai",
-  gruvbox_material = "gruvbox-material",
-  nord = "nord.nvim",
-  everforest = "everforest",
-  nightfox = "nightfox.nvim",
-  kanagawa = "kanagawa.nvim",
-  catppuccin = "catppuccin",
-  rose_pine = "rose-pine",
-  onedarkpro = "onedarkpro.nvim",
-  monokai = "monokai.nvim",
-  material = "material.nvim",
-}
-
-M.gruvbox8 = function()
-  -- Italic options should be put before colorscheme setting,
-  -- see https://github.com/morhetz/gruvbox/wiki/Terminal-specific#1-italics-is-disabled
-  vim.g.gruvbox_italics = 1
-  vim.g.gruvbox_italicize_strings = 1
-  vim.g.gruvbox_filetype_hi_groups = 1
-  vim.g.gruvbox_plugin_hi_groups = 1
-
-  vim.cmd([[colorscheme gruvbox8_hard]])
-end
-
-M.onedark = function()
-  vim.cmd([[colorscheme onedark]])
-end
-
-M.edge = function()
-  vim.g.edge_enable_italic = 1
-  vim.g.edge_better_performance = 1
-
-  vim.cmd([[colorscheme edge]])
-end
-
-M.sonokai = function()
-  vim.g.sonokai_enable_italic = 1
-  vim.g.sonokai_better_performance = 1
-
-  vim.cmd([[colorscheme sonokai]])
-end
-
-M.gruvbox_material = function()
-  -- foreground option can be material, mix, or original
-  vim.g.gruvbox_material_foreground = "material"
-  --background option can be hard, medium, soft
-  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
-
-M.nord = function()
-  vim.cmd([[colorscheme nord]])
-end
-
-M.doom_one = function()
-  vim.cmd([[colorscheme doom-one]])
-end
-
-M.everforest = function()
-  vim.g.everforest_enable_italic = 1
-  vim.g.everforest_better_performance = 1
-
-  vim.cmd([[colorscheme everforest]])
-end
-
-M.nightfox = function()
-  vim.cmd([[colorscheme nordfox]])
-end
-
-M.kanagawa = function()
-  vim.cmd([[colorscheme kanagawa]])
-end
-
-M.catppuccin = function()
-  -- available option: latte, frappe, macchiato, mocha
-  vim.g.catppuccin_flavour = "frappe"
-
-  require("catppuccin").setup()
-
-  vim.cmd([[colorscheme catppuccin]])
-end
-
-M.rose_pine = function()
-  require('rose-pine').setup({
-    --- @usage 'main' | 'moon'
-    dark_variant = 'moon',
-  })
-
-  -- set colorscheme after options
-  vim.cmd('colorscheme rose-pine')
-end
-
-M.onedarkpro = function()
-  -- set colorscheme after options
-  vim.cmd('colorscheme onedark_vivid')
-end
-
-M.monokai = function()
-  vim.cmd('colorscheme monokai_pro')
-end
-
-M.material = function ()
-  vim.g.material_style = "oceanic"
-  vim.cmd('colorscheme material')
-end
-
---- Use a random colorscheme from the pre-defined list of colorschemes.
-M.rand_colorscheme = function()
-  local colorscheme = utils.rand_element(vim.tbl_keys(M.colorscheme2dir))
-
-  if not vim.tbl_contains(vim.tbl_keys(M), colorscheme) then
-    local msg = "Invalid colorscheme: " .. colorscheme
-    vim.notify(msg, vim.log.levels.ERROR, { title = "nvim-config" })
-
-    return
-  end
-
-  -- Load the colorscheme, because all the colorschemes are declared as opt plugins, so the colorscheme isn't loaded yet.
-  local status = utils.add_pack(M.colorscheme2dir[colorscheme])
-
-  if not status then
-    local msg = string.format("Colorscheme %s is not installed. Run PackerSync to install.", colorscheme)
-    vim.notify(msg, vim.log.levels.ERROR, { title = "nvim-config" })
-
-    return
-  end
-
-  -- Load the colorscheme and its settings
-  M[colorscheme]()
-
-  if vim.g.logging_level == "debug" then
-    local msg = "Colorscheme: " .. colorscheme
-
-    vim.notify(msg, vim.log.levels.DEBUG, { title = "nvim-config" })
-  end
-end
-
--- Load a random colorscheme
-M.rand_colorscheme()

docs/README.md

@@ -65,7 +65,7 @@ pip install -U pynvim
 [python-lsp-server (pylsp)](https://github.com/python-lsp/python-lsp-server) is a Python [Language Server](https://microsoft.github.io/language-server-protocol/) for completion, linting, go to definition, etc.
 
 ```
-pip install 'python-lsp-server[all]' pylsp-mypy pyls-isort
+pip install 'python-lsp-server[all]' pylsp-mypy python-lsp-isort python-lsp-black
 ```
 
 Note the executable for pylsp is also named `pylsp`. You need to set its PATH correctly.
@@ -111,23 +111,23 @@ vim-language-server is installed in the same directory as the node executable.
 
 ### Git
 
-Git is required by plugin manager [packer.nvim](https://github.com/wbthomason/packer.nvim) and other git-related plugins.
+Git is required by plugin manager [lazy.nvim](https://github.com/folke/lazy.nvim) and other git-related plugins.
 
 For Linux and macOS, Git is usually pre-installed.
 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.
 
-### ctags
+### universal-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://github.com/universal-ctags/homebrew-universal-ctags):
+To install ctags on macOS, use [Homebrew](https://formulae.brew.sh/formula/universal-ctags):
 
 ```bash
-brew install ctags
+brew install universal-ctags
 ```
 
 To install it Windows, use [chocolatey](https://chocolatey.org/) or [scoop](https://scoop.sh/)
@@ -166,57 +166,15 @@ 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).
 
-### Linux
+Please check the official doc on how to install Neovim on different systems: https://github.com/neovim/neovim/blob/master/INSTALL.md
 
-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.
+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
 
 After installing nvim and all the dependencies, we will install plugin managers and set up this config.
 
-### Install plugin manager packer.nvim
-
-I use packer.nvim to manage my plugins. We need to install packer.nvim on our system first.
-
-For Windows, if curl is installed, run the following command (on PowerShell):
-
-```
-git clone --depth=1 https://github.com/wbthomason/packer.nvim "$env:LOCALAPPDATA\nvim-data\site\pack\packer\opt\packer.nvim"
-```
-
-For macOS and Linux, run the following command:
-
-```bash
-git clone --depth=1 https://github.com/wbthomason/packer.nvim ~/.local/share/nvim/site/pack/packer/opt/packer.nvim
-```
-
 ### How to install this configuration
 
 On Linux and macOS, the directory is `~/.config/nvim`.
@@ -228,7 +186,7 @@ then go to this directory, and run the following command:
 git clone --depth=1 https://github.com/jdhao/nvim-config.git .
 ```
 
-After that, when we first open nvim, run command `:PackerSync` to install all the plugins.
+After that, when we first open nvim, all the plugins will be installed automatically.
 Since I use quite a lot of plugins (more than 60), it may take some time to install all of them.
 
 [^1]: Use `echo %userprofile%` to see where your `$HOME` is.

docs/nvim_setup_linux.sh

@@ -68,7 +68,7 @@ fi
 
 # Install some Python packages used by Nvim plugins.
 echo "Installing Python packages"
-declare -a PY_PACKAGES=("pynvim" 'python-lsp-server[all]' "black" "vim-vint" "pyls-isort" "pylsp-mypy")
+declare -a PY_PACKAGES=("pynvim" 'python-lsp-server[all]' "vim-vint" "python-lsp-isort" "pylsp-mypy" "python-lsp-black")
 
 if [[ "$SYSTEM_PYTHON" = true ]]; then
     echo "Using system Python to install $(PY_PACKAGES)"
@@ -252,13 +252,7 @@ fi
 
 git clone --depth=1 https://github.com/jdhao/nvim-config.git "$NVIM_CONFIG_DIR"
 
-echo "Installing packer.nvim"
-if [[ ! -d ~/.local/share/nvim/site/pack/packer/opt/packer.nvim ]]; then
-    git clone --depth=1 https://github.com/wbthomason/packer.nvim \
-        ~/.local/share/nvim/site/pack/packer/opt/packer.nvim
-fi
-
 echo "Installing nvim plugins, please wait"
-"$NVIM_DIR/bin/nvim" -c "autocmd User PackerComplete quitall" -c "PackerSync"
+"$NVIM_DIR/bin/nvim" -c "autocmd User LazyInstall quitall"  -c "lua require('lazy').install()"
 
 echo "Finished installing Nvim and its dependencies!"

docs/nvim_setup_windows.ps1

@@ -27,7 +27,7 @@ scoop install miniconda3
 pip install -U pynvim
 
 # Install python-language-server
-pip install 'python-lsp-server[all]' pylsp-mypy pyls-isort
+pip install 'python-lsp-server[all]' pylsp-mypy python-lsp-isort
 
 # Install visual c++ redistribution
 scoop install vcredist2022

init.lua

@@ -9,34 +9,25 @@
 -- Blog: https://jdhao.github.io/
 -- GitHub: https://github.com/jdhao
 -- StackOverflow: https://stackoverflow.com/users/6064933/jdhao
+vim.loader.enable()
 
-local api = vim.api
-local version = vim.version
+local utils = require("utils")
 
--- check if we have the latest stable version of nvim
-local expected_ver = "0.9.0"
-local ev = version.parse(expected_ver)
-local actual_ver = version()
+local expected_version = "0.10.1"
+utils.is_compatible_version(expected_version)
 
-if version.cmp(ev, actual_ver) ~= 0 then
-  local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
-  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, _ver)
-  api.nvim_err_writeln(msg)
-  return
-end
+local config_dir = vim.fn.stdpath("config")
+---@cast config_dir string
 
-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
-}
-
--- source all the core config files
-for _, name in ipairs(core_conf_files) do
-  local path = string.format("%s/core/%s", vim.fn.stdpath("config"), name)
-  local source_cmd = "source " .. path
-  vim.cmd(source_cmd)
-end
+-- 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"))
+-- colorscheme settings
+require("colorschemes")

lua/colorschemes.lua

@@ -0,0 +1,89 @@
+--- This module will load a random colorscheme on nvim startup process.
+
+local utils = require("utils")
+
+local M = {}
+
+-- Colorscheme to its directory name mapping, because colorscheme repo name is not necessarily
+-- the same as the colorscheme name itself.
+M.colorscheme_conf = {
+  onedark = function()
+    vim.cmd([[colorscheme onedark]])
+  end,
+  edge = function()
+    vim.g.edge_enable_italic = 1
+    vim.g.edge_better_performance = 1
+
+    vim.cmd([[colorscheme edge]])
+  end,
+  sonokai = function()
+    vim.g.sonokai_enable_italic = 1
+    vim.g.sonokai_better_performance = 1
+
+    vim.cmd([[colorscheme sonokai]])
+  end,
+  gruvbox_material = function()
+    -- foreground option can be material, mix, or original
+    vim.g.gruvbox_material_foreground = "original"
+    --background option can be hard, medium, soft
+    vim.g.gruvbox_material_background = "medium"
+    vim.g.gruvbox_material_enable_italic = 1
+    vim.g.gruvbox_material_better_performance = 1
+
+    vim.cmd([[colorscheme gruvbox-material]])
+  end,
+  everforest = function()
+    vim.g.everforest_enable_italic = 1
+    vim.g.everforest_better_performance = 1
+
+    vim.cmd([[colorscheme everforest]])
+  end,
+  nightfox = function()
+    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
+    vim.cmd('colorscheme onedark_vivid')
+  end,
+  material = function()
+    vim.g.material_style = "oceanic"
+    vim.cmd('colorscheme material')
+  end,
+  arctic = function ()
+    vim.cmd("colorscheme arctic")
+  end,
+  kanagawa = function()
+    vim.cmd("colorscheme kanagawa-wave")
+  end
+}
+
+--- Use a random colorscheme from the pre-defined list of colorschemes.
+M.rand_colorscheme = function()
+  local colorscheme = utils.rand_element(vim.tbl_keys(M.colorscheme_conf))
+
+  if not vim.tbl_contains(vim.tbl_keys(M.colorscheme_conf), colorscheme) then
+    local msg = "Invalid colorscheme: " .. colorscheme
+    vim.notify(msg, vim.log.levels.ERROR, { title = "nvim-config" })
+
+    return
+  end
+
+  -- Load the colorscheme and its settings
+  M.colorscheme_conf[colorscheme]()
+
+  if vim.g.logging_level == "debug" then
+    local msg = "Colorscheme: " .. colorscheme
+
+    vim.notify(msg, vim.log.levels.DEBUG, { title = "nvim-config" })
+  end
+end
+
+-- Load a random colorscheme
+M.rand_colorscheme()

lua/config/bufferline.lua

@@ -1,6 +1,6 @@
 require("bufferline").setup {
   options = {
-    numbers = "buffer_id",
+    numbers = "none",
     close_command = "bdelete! %d",
     right_mouse_command = nil,
     left_mouse_command = "buffer %d",
@@ -9,7 +9,7 @@ require("bufferline").setup {
       icon = "▎", -- this should be omitted if indicator style is not 'icon'
       style = "icon",
     },
-    buffer_close_icon = "",
+    buffer_close_icon = "",
     modified_icon = "●",
     close_icon = "",
     left_trunc_marker = "",
@@ -44,3 +44,7 @@ require("bufferline").setup {
     sort_by = "id",
   },
 }
+
+vim.keymap.set("n", "<space>bp", "<cmd>BufferLinePick<CR>", {
+  desc = "pick a buffer",
+})

lua/config/dashboard-nvim.lua

@@ -2,7 +2,8 @@ local api = vim.api
 local keymap = vim.keymap
 local dashboard = require("dashboard")
 
-dashboard.custom_header = {
+local conf = {}
+conf.header = {
   "                                                       ",
   "                                                       ",
   "                                                       ",
@@ -18,46 +19,52 @@ dashboard.custom_header = {
   "                                                       ",
 }
 
-dashboard.custom_center = {
+conf.center = {
   {
-    icon = "  ",
+    icon = "󰈞  ",
     desc = "Find  File                              ",
     action = "Leaderf file --popup",
-    shortcut = "<Leader> f f",
+    key = "<Leader> f f",
   },
   {
-    icon = "  ",
+    icon = "󰈢  ",
     desc = "Recently opened files                   ",
     action = "Leaderf mru --popup",
-    shortcut = "<Leader> f r",
+    key = "<Leader> f r",
   },
   {
-    icon = "  ",
+    icon = "󰈬  ",
     desc = "Project grep                            ",
     action = "Leaderf rg --popup",
-    shortcut = "<Leader> f g",
+    key = "<Leader> f g",
   },
   {
-    icon = "  ",
+    icon = "  ",
     desc = "Open Nvim config                        ",
     action = "tabnew $MYVIMRC | tcd %:p:h",
-    shortcut = "<Leader> e v",
+    key = "<Leader> e v",
   },
   {
     icon = "  ",
     desc = "New file                                ",
     action = "enew",
-    shortcut = "e           ",
+    key = "e",
   },
   {
-    icon = "  ",
+    icon = "󰗼  ",
     desc = "Quit Nvim                               ",
     -- desc = "Quit Nvim                               ",
     action = "qa",
-    shortcut = "q           ",
+    key = "q",
   },
 }
 
+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 }),

lua/config/fugitive.lua

@@ -1,11 +1,27 @@
 local keymap = vim.keymap
 
-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" })
+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" })
 
 -- convert git to Git in command line mode
-vim.fn['utils#Cabbrev']('git', 'Git')
+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" })

lua/config/git-linker.lua

@@ -2,24 +2,36 @@ local keymap = vim.keymap
 local gitlinker = require("gitlinker")
 
 gitlinker.setup {
+  callbacks = {
+    ["dev.azure.com"] = function(url_data)
+      vim.print(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"
+      end
+      return url
+    end
+  },
   mappings = nil,
 }
 
-keymap.set({ "n", "v" }, "<leader>gl", "", {
+keymap.set({ "n", "v" }, "<leader>gl", function()
+  local mode = string.lower(vim.fn.mode())
+  gitlinker.get_buf_range_url(mode)
+end, {
   silent = true,
-  desc = "get git permlink",
-  callback = function()
-    local mode = string.lower(vim.fn.mode())
-    gitlinker.get_buf_range_url(mode)
-  end,
+  desc = "Git: get permlink",
 })
 
-keymap.set("n", "<leader>gb", "", {
+keymap.set("n", "<leader>gbr", function()
+  gitlinker.get_repo_url({
+    action_callback = gitlinker.actions.open_in_browser
+  })
+end, {
   silent = true,
-  desc = "browse repo in browser",
-  callback = function()
-    gitlinker.get_repo_url({
-      action_callback = gitlinker.actions.open_in_browser
-    })
-  end
+  desc = "Git: browse repo in browser",
 })

lua/config/gitsigns.lua

@@ -2,11 +2,11 @@ local gs = require("gitsigns")
 
 gs.setup {
   signs = {
-    add = { hl = "GitSignsAdd", text = "+", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
-    change = { hl = "GitSignsChange", text = "~", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
-    delete = { hl = "GitSignsDelete", text = "_", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
-    topdelete = { hl = "GitSignsDelete", text = "‾", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" },
-    changedelete = { hl = "GitSignsChange", text = "│", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
+    add = { text = "+" },
+    change = { text = "~" },
+    delete = { text = "_" },
+    topdelete = { text = "‾" },
+    changedelete = { text = "│" },
   },
   word_diff = true,
   on_attach = function(bufnr)

lua/config/hlslens.lua

@@ -12,10 +12,11 @@ local activate_hlslens = function(direction)
   local cmd = string.format("normal! %s%szzzv", vim.v.count1, direction)
   local status, msg = pcall(vim.cmd, cmd)
 
+  -- Deal with the case that there is no such pattern in current buffer.
   if not status then
-    -- 13 is the index where real error message starts
-    msg = msg:sub(13)
-    api.nvim_err_writeln(msg)
+    local start_idx, _ = string.find(msg, 'E486', 1, true)
+    local msg_part = string.sub(msg, start_idx)
+    api.nvim_err_writeln(msg_part)
     return
   end
 
@@ -34,15 +35,48 @@ 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_err_writeln(msg)
+  end
+
+  return result, cursor_word
+end
+
 keymap.set("n", "*", "", {
   callback = function()
-    vim.fn.execute("normal! *N")
+    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)
     hlslens.start()
   end,
 })
 keymap.set("n", "#", "", {
   callback = function()
-    vim.fn.execute("normal! #N")
+    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)
     hlslens.start()
   end,
 })

lua/config/indent-blankline.lua

@@ -1,21 +1,28 @@
 local api = vim.api
 
-local exclude_ft = { "help", "git", "markdown", "snippets", "text", "gitconfig", "alpha" }
-require("indent_blankline").setup {
-  -- U+2502 may also be a good choice, it will be on the middle of cursor.
-  -- U+250A is also a good choice
-  char = "▏",
-  show_end_of_line = false,
-  disable_with_nolist = true,
-  buftype_exclude = { "terminal" },
-  filetype_exclude = exclude_ft,
+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 = "IndentBlanklineDisable",
+  command = "IBLDisable",
 })
 
 api.nvim_create_autocmd("InsertLeave", {
@@ -23,7 +30,7 @@ api.nvim_create_autocmd("InsertLeave", {
   group = gid,
   callback = function()
     if not vim.tbl_contains(exclude_ft, vim.bo.filetype) then
-      vim.cmd([[IndentBlanklineEnable]])
+      vim.cmd([[IBLEnable]])
     end
   end,
 })

lua/config/live-command.lua

@@ -0,0 +1,4 @@
+require("live-command").setup {
+  enable_highlighting = true,
+  inline_highlighting = true,
+}

lua/config/lsp.lua

@@ -6,6 +6,18 @@ local diagnostic = vim.diagnostic
 
 local utils = require("utils")
 
+-- set quickfix list from diagnostics in a certain buffer, not the whole workspace
+local set_qflist = function(buf_num, severity)
+  local diagnostics = nil
+  diagnostics = diagnostic.get(buf_num, { severity = severity })
+
+  local qf_items = diagnostic.toqflist(diagnostics)
+  vim.fn.setqflist({}, ' ', { title = 'Diagnostics', items = qf_items })
+
+  -- open quickfix by default
+  vim.cmd[[copen]]
+end
+
 local custom_attach = function(client, bufnr)
   -- Mappings.
   local map = function(mode, l, r, opts)
@@ -23,12 +35,15 @@ local custom_attach = function(client, bufnr)
   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" })
-  map("n", "<space>q", diagnostic.setqflist, { desc = "put diagnostic to qf" })
+  -- 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())
+    vim.print(vim.lsp.buf.list_workspace_folders())
   end, { desc = "list workspace folder" })
 
   -- Set some key bindings conditional on server capabilities
@@ -95,21 +110,49 @@ local custom_attach = function(client, bufnr)
 end
 
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
+-- required by nvim-ufo
+capabilities.textDocument.foldingRange = {
+    dynamicRegistration = false,
+    lineFoldingOnly = true
+}
 
 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 },
-          pyls_isort = { enabled = true },
-          pylsp_mypy = { enabled = true },
+          -- import sorting
+          isort = { enabled = true },
         },
       },
     },
@@ -187,21 +230,6 @@ if utils.executable("lua-language-server") then
           -- 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 = {
-            fn.stdpath("data") .. "/site/pack/packer/opt/emmylua-nvim",
-            fn.stdpath("config"),
-          },
-          maxPreload = 2000,
-          preloadFileSize = 50000,
-        },
       },
     },
     capabilities = capabilities,
@@ -209,10 +237,10 @@ if utils.executable("lua-language-server") then
 end
 
 -- Change diagnostic signs.
-fn.sign_define("DiagnosticSignError", { text = "✗", texthl = "DiagnosticSignError" })
-fn.sign_define("DiagnosticSignWarn", { text = "!", texthl = "DiagnosticSignWarn" })
-fn.sign_define("DiagnosticSignInformation", { text = "", texthl = "DiagnosticSignInfo" })
-fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
+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 {

lua/config/lualine.lua

@@ -97,12 +97,49 @@ local diff = function()
   return info
 end
 
+local virtual_env = function()
+  -- only show virtual env for Python
+  if vim.bo.filetype ~= "python" then
+    return ""
+  end
+
+  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
+      return ""
+    else
+      return string.format("  %s (conda)", conda_env)
+    end
+  else
+    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 = "No Active Lsp"
+  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 = "" },
-    -- section_separators = { left = "", right = "" },
     section_separators = "",
     component_separators = "",
     disabled_filetypes = {},
@@ -111,14 +148,29 @@ require("lualine").setup {
   sections = {
     lualine_a = { "mode" },
     lualine_b = {
-      "branch",
+      {
+        "branch",
+        fmt = function(name, _)
+          -- truncate branch name in case the name is too long
+          return string.sub(name, 1, 20)
+        end,
+      },
+      {
+        virtual_env,
+        color = { fg = "black", bg = "#F1CA81" },
+      },
+    },
+    lualine_c = {
+      {
+        "filename",
+        symbols = {
+          readonly = "[🔒]",
+        },
+      },
       {
         "diff",
         source = diff,
       },
-    },
-    lualine_c = {
-      "filename",
       {
         ime_state,
         color = { fg = "black", bg = "#f46868" },
@@ -129,6 +181,17 @@ require("lualine").setup {
       },
     },
     lualine_x = {
+      {
+        get_active_lsp,
+        icon = " LSP:",
+      },
+      {
+        "diagnostics",
+        sources = { "nvim_diagnostic" },
+        symbols = { error = "🆇 ", warn = "⚠️ ", info = "ℹ️ ", hint = " " },
+      },
+    },
+    lualine_y = {
       "encoding",
       {
         "fileformat",
@@ -140,13 +203,7 @@ require("lualine").setup {
       },
       "filetype",
     },
-    lualine_y = { "progress" },
     lualine_z = {
-      "location",
-      {
-        "diagnostics",
-        sources = { "nvim_diagnostic" },
-      },
       {
         trailing_space,
         color = "WarningMsg",
@@ -155,6 +212,7 @@ require("lualine").setup {
         mixed_indent,
         color = "WarningMsg",
       },
+      "progress"
     },
   },
   inactive_sections = {

lua/config/nvim-cmp.lua

@@ -35,7 +35,6 @@ 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,
@@ -50,12 +49,14 @@ cmp.setup {
       menu = {
         nvim_lsp = "[LSP]",
         ultisnips = "[US]",
-        nvim_lua = "[Lua]",
         path = "[Path]",
         buffer = "[Buffer]",
         emoji = "[Emoji]",
         omni = "[Omni]",
       },
+      show_labelDetails = true,
+      maxwidth = 40,
+      ellipsis_char = "...",
     },
   },
 }

lua/config/nvim-statuscol.lua

@@ -0,0 +1,23 @@
+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 = 2
+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" },
+  },
+}

lua/config/nvim-tree.lua

@@ -4,26 +4,19 @@ local nvim_tree = require("nvim-tree")
 nvim_tree.setup {
   auto_reload_on_write = true,
   disable_netrw = false,
-  hijack_cursor = false,
   hijack_netrw = true,
+  hijack_cursor = false,
   hijack_unnamed_buffer_when_opening = false,
   open_on_tab = false,
   sort_by = "name",
   update_cwd = false,
   view = {
     width = 30,
-    hide_root_folder = false,
     side = "left",
     preserve_window_proportions = false,
     number = false,
     relativenumber = false,
     signcolumn = "yes",
-    mappings = {
-      custom_only = false,
-      list = {
-        -- user mappings go here
-      },
-    },
   },
   renderer = {
     indent_markers = {
@@ -85,7 +78,7 @@ nvim_tree.setup {
         enable = true,
         chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",
         exclude = {
-          filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
+          filetype = { "notify", "qf", "diff", "fugitive", "fugitiveblame" },
           buftype = { "nofile", "terminal", "help" },
         },
       },

lua/config/nvim_hop.lua

@@ -1,13 +1,10 @@
-vim.cmd([[hi HopNextKey cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff]])
-vim.cmd([[hi HopNextKey1 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff]])
-vim.cmd([[hi HopNextKey2 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff]])
-
 local keymap = vim.keymap
 local hop = require("hop")
 hop.setup {
   case_insensitive = true,
   char2_fallback_key = "<CR>",
   quit_key = "<Esc>",
+  match_mappings = { "zh_sc" }
 }
 
 keymap.set({ "n", "v", "o" }, "f", "", {
@@ -18,3 +15,14 @@ keymap.set({ "n", "v", "o" }, "f", "", {
   end,
   desc = "nvim-hop char2",
 })
+
+vim.api.nvim_create_autocmd("ColorScheme", {
+  pattern = "*",
+  callback = function()
+    vim.cmd([[
+      hi HopNextKey cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff
+      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
+})

lua/config/nvim_ufo.lua

@@ -0,0 +1,44 @@
+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",
+})

lua/config/treesitter.lua

@@ -1,5 +1,5 @@
 require("nvim-treesitter.configs").setup {
-  ensure_installed = { "python", "cpp", "lua", "vim" },
+  ensure_installed = { "python", "cpp", "lua", "vim", "json", "toml" },
   ignore_install = {}, -- List of parsers to ignore installing
   highlight = {
     enable = true, -- false will disable the whole extension

lua/config/which-key.lua

@@ -1,60 +1,6 @@
 require("which-key").setup {
-  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",
-  },
+  preset = "modern",
   icons = {
-    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" },
-  },
+    mappings = false
+  }
 }

lua/config/yanky.lua

@@ -1,13 +1,17 @@
-require("yanky").setup({
-  ring = {
-    history_length = 50,
-    storage = "memory",
-  },
+require("yanky").setup {
   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>(YankyCycleForward)")
-vim.keymap.set("n", "]y", "<Plug>(YankyCycleBackward)")
+vim.keymap.set("n", "[y", "<Plug>(YankyPreviousEntry)")
+vim.keymap.set("n", "]y", "<Plug>(YankyNextEntry)")

lua/config/zen-mode.lua

@@ -1,15 +0,0 @@
-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
-    },
-  },
-}

lua/custom-autocmd.lua

@@ -17,14 +17,33 @@ api.nvim_create_autocmd({ "BufRead" }, {
 })
 
 -- highlight yanked region, see `:h lua-highlight`
+local yank_group = api.nvim_create_augroup("highlight_yank", { clear = true })
 api.nvim_create_autocmd({ "TextYankPost" }, {
   pattern = "*",
-  group = api.nvim_create_augroup("highlight_yank", { clear = true }),
+  group = yank_group,
   callback = function()
     vim.highlight.on_yank { higroup = "YankColor", timeout = 300 }
   end,
 })
 
+api.nvim_create_autocmd({ "CursorMoved" }, {
+  pattern = "*",
+  group = yank_group,
+  callback = function()
+    vim.g.current_cursor_pos = vim.fn.getcurpos()
+  end,
+})
+
+api.nvim_create_autocmd("TextYankPost", {
+  pattern = "*",
+  group = yank_group,
+  callback = function(ev)
+    if vim.v.event.operator == "y" then
+      vim.fn.setpos(".", vim.g.current_cursor_pos)
+    end
+  end,
+})
+
 -- Auto-create dir when saving a file, in case some intermediate directory does not exist
 api.nvim_create_autocmd({ "BufWritePre" }, {
   pattern = "*",
@@ -64,3 +83,193 @@ api.nvim_create_autocmd("VimResized", {
   desc = "autoresize windows on resizing operation",
   command = "wincmd =",
 })
+
+local function open_nvim_tree(data)
+  -- check if buffer is a directory
+  local directory = vim.fn.isdirectory(data.file) == 1
+
+  if not directory then
+    return
+  end
+
+  -- create a new, empty buffer
+  vim.cmd.enew()
+
+  -- wipe the directory buffer
+  vim.cmd.bw(data.buf)
+
+  -- open the tree
+  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,
+})
+
+-- Return to last cursor position when opening a file, note that here we cannot use BufReadPost
+-- as event. It seems that when BufReadPost is triggered, FileType event is still not run.
+-- So the filetype for this buffer is empty string.
+api.nvim_create_autocmd("FileType", {
+  group = api.nvim_create_augroup("resume_cursor_position", { clear = true }),
+  pattern = "*",
+  callback = function(ev)
+    local mark_pos = api.nvim_buf_get_mark(ev.buf, '"')
+    local last_cursor_line = mark_pos[1]
+
+    local max_line = vim.fn.line("$")
+    local buf_filetype = api.nvim_get_option_value("filetype", { buf = ev.buf })
+    local buftype = api.nvim_get_option_value("buftype", { buf = ev.buf })
+
+    -- only handle normal files
+    if buf_filetype == "" or buftype ~= "" then
+      return
+    end
+
+    -- Only resume last cursor position when there is no go-to-line command (something like '+23').
+    if vim.fn.match(vim.v.argv, [[\v^\+(\d){1,}$]]) ~= -1 then
+      return
+    end
+
+    if last_cursor_line > 1 and last_cursor_line <= max_line then
+      -- vim.print(string.format("mark_pos: %s", vim.inspect(mark_pos)))
+      -- it seems that without vim.schedule, the cursor position can not be set correctly
+      vim.schedule(function()
+        local status, result = pcall(api.nvim_win_set_cursor, 0, mark_pos)
+        if not status then
+          api.nvim_err_writeln(string.format("Failed to resume cursor position. Context %s, error: %s",
+          vim.inspect(ev), result))
+        end
+      end)
+      -- the following two ways also seem to work,
+      -- ref: https://www.reddit.com/r/neovim/comments/104lc26/how_can_i_press_escape_key_using_lua/
+      -- vim.api.nvim_feedkeys("g`\"", "n", true)
+      -- vim.fn.execute("normal! g`\"")
+    end
+  end,
+})
+
+local number_toggle_group = api.nvim_create_augroup("numbertoggle", { clear = true })
+api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
+  pattern = "*",
+  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()
+    vim.cmd([[
+      " 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
+    ]])
+  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",
+  callback = function(ev)
+    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 bf = fn.getbufvar(buf, '&filetype')
+
+      if fn.index(quit_filetypes, bf) == -1 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",
+  command = "call utils#Inside_git_repo()"
+})
+
+-- ref: https://vi.stackexchange.com/a/169/15292
+api.nvim_create_autocmd("BufReadPre", {
+  group = api.nvim_create_augroup("large_file", { clear = true }),
+  pattern = "*",
+  desc = "check if we are inside Git repo",
+  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"
+      --  turning off relative number helps a lot
+      vim.wo.relativenumber = false
+
+      vim.bo.swapfile = false
+      vim.bo.bufhidden = "unload"
+      vim.bo.undolevels = -1
+    end
+  end
+})

lua/globals.lua

@@ -3,11 +3,6 @@ local api = vim.api
 
 local utils = require('utils')
 
--- Inspect something
-function _G.inspect(item)
-  vim.print(item)
-end
-
 ------------------------------------------------------------------------
 --                          custom variables                          --
 ------------------------------------------------------------------------

lua/mappings.lua

@@ -1,6 +1,5 @@
 local keymap = vim.keymap
-local api = vim.api
-local uv = vim.loop
+local uv = vim.uv
 
 -- Save key strokes (now we do not need to press shift to enter command mode).
 keymap.set({ "n", "x" }, ";", ":")
@@ -46,7 +45,21 @@ 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 buffer",
+  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",
 })
 
 -- Insert a blank line below or above current line (do not move the cursor),
@@ -170,7 +183,7 @@ keymap.set("n", "<Down>", "<C-W>j")
 keymap.set({ "x", "o" }, "iu", "<cmd>call text_obj#URL()<cr>", { desc = "URL text object" })
 
 -- Text objects for entire buffer
-keymap.set({ "x", "o" }, "iB", "<cmd>call text_obj#Buffer()<cr>", { desc = "buffer text object" })
+keymap.set({ "x", "o" }, "iB", ":<C-U>call text_obj#Buffer()<cr>", { desc = "buffer text object" })
 
 -- Do not move my cursor when joining lines.
 keymap.set("n", "J", function()
@@ -179,17 +192,17 @@ keymap.set("n", "J", function()
       delmarks z
     ]])
 end, {
-  desc = "join line",
+  desc = "join lines without moving cursor",
 })
 
 keymap.set("n", "gJ", function()
   -- we must use `normal!`, otherwise it will trigger recursive mapping
   vim.cmd([[
-      normal! zmgJ`z
+      normal! mzgJ`z
       delmarks z
     ]])
 end, {
-  desc = "join visual lines",
+  desc = "join lines without moving cursor",
 })
 
 -- Break inserted text into smaller undo units when we insert some punctuation chars.
@@ -201,20 +214,6 @@ end
 -- insert semicolon in the end
 keymap.set("i", "<A-;>", "<Esc>miA;<Esc>`ii")
 
--- Keep cursor position after yanking
-keymap.set("n", "y", "myy")
-
-api.nvim_create_autocmd("TextYankPost", {
-  pattern = "*",
-  group = api.nvim_create_augroup("restore_after_yank", { clear = true }),
-  callback = function()
-    vim.cmd([[
-      silent! normal! `y
-      silent! delmarks y
-    ]])
-  end,
-})
-
 -- Go to the beginning and end of current line in insert mode quickly
 keymap.set("i", "<C-A>", "<HOME>")
 keymap.set("i", "<C-E>", "<END>")
@@ -229,17 +228,24 @@ 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)
+      cnt = cnt + 1
+    end)
+  )
+end, { desc = "show cursor" })

lua/plugin_specs.lua

@@ -0,0 +1,588 @@
+local utils = require("utils")
+
+local plugin_dir = vim.fn.stdpath("data") .. "/lazy"
+local lazypath = plugin_dir .. "/lazy.nvim"
+
+if not vim.uv.fs_stat(lazypath) then
+  vim.fn.system {
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  }
+end
+vim.opt.rtp:prepend(lazypath)
+
+-- check if firenvim is active
+local firenvim_not_active = function()
+  return not vim.g.started_by_firenvim
+end
+
+local plugin_specs = {
+  -- auto-completion engine
+  {
+    "iguanacucumber/magazine.nvim",
+    name = "nvim-cmp",
+    -- event = 'InsertEnter',
+    event = "VeryLazy",
+    dependencies = {
+      "hrsh7th/cmp-nvim-lsp",
+      "onsails/lspkind-nvim",
+      "hrsh7th/cmp-path",
+      "hrsh7th/cmp-buffer",
+      "hrsh7th/cmp-omni",
+      "quangnguyen30192/cmp-nvim-ultisnips",
+    },
+    config = function()
+      require("config.nvim-cmp")
+    end,
+  },
+  {
+    "neovim/nvim-lspconfig",
+    event = { "BufRead", "BufNewFile" },
+    config = function()
+      require("config.lsp")
+    end,
+  },
+
+  {
+    "nvim-treesitter/nvim-treesitter",
+    enabled = function()
+      if vim.g.is_mac then
+        return true
+      end
+      return false
+    end,
+    event = "VeryLazy",
+    build = ":TSUpdate",
+    config = function()
+      require("config.treesitter")
+    end,
+  },
+
+  -- Python-related text object
+  { "jeetsukumaran/vim-pythonsense", ft = { "python" } },
+
+  { "machakann/vim-swap", event = "VeryLazy" },
+
+  -- IDE for Lisp
+  -- 'kovisoft/slimv'
+  {
+    "vlime/vlime",
+    enabled = function()
+      if utils.executable("sbcl") then
+        return true
+      end
+      return false
+    end,
+    config = function(plugin)
+      vim.opt.rtp:append(plugin.dir .. "/vim")
+    end,
+    ft = { "lisp" },
+  },
+
+  -- Super fast buffer jump
+  {
+    "smoka7/hop.nvim",
+    event = "VeryLazy",
+    config = function()
+      require("config.nvim_hop")
+    end,
+  },
+
+  -- Show match number and index for searching
+  {
+    "kevinhwang91/nvim-hlslens",
+    branch = "main",
+    keys = { "*", "#", "n", "N" },
+    config = function()
+      require("config.hlslens")
+    end,
+  },
+  {
+    "Yggdroot/LeaderF",
+    cmd = "Leaderf",
+    build = function()
+      local leaderf_path = plugin_dir .. "/LeaderF"
+      vim.opt.runtimepath:append(leaderf_path)
+      vim.cmd("runtime! plugin/leaderf.vim")
+
+      if not vim.g.is_win then
+        vim.cmd("LeaderfInstallCExtension")
+      end
+    end,
+  },
+  "nvim-lua/plenary.nvim",
+  {
+    "nvim-telescope/telescope.nvim",
+    cmd = "Telescope",
+    dependencies = {
+      "nvim-telescope/telescope-symbols.nvim",
+    },
+  },
+  {
+    "ibhagwan/fzf-lua",
+    -- optional for icon support
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    config = function()
+      -- calling `setup` is optional for customization
+      require("fzf-lua").setup {}
+    end,
+  },
+  {
+    "MeanderingProgrammer/markdown.nvim",
+    main = "render-markdown",
+    opts = {},
+    dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" },
+  },
+  -- A list of colorscheme plugin you may want to try. Find what suits you.
+  { "navarasu/onedark.nvim", lazy = true },
+  { "sainnhe/edge", lazy = true },
+  { "sainnhe/sonokai", lazy = true },
+  { "sainnhe/gruvbox-material", lazy = true },
+  { "sainnhe/everforest", lazy = true },
+  { "EdenEast/nightfox.nvim", lazy = true },
+  { "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 },
+  { "nvim-tree/nvim-web-devicons", event = "VeryLazy" },
+
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    cond = firenvim_not_active,
+    config = function()
+      require("config.lualine")
+    end,
+  },
+
+  {
+    "akinsho/bufferline.nvim",
+    event = { "BufEnter" },
+    cond = firenvim_not_active,
+    config = function()
+      require("config.bufferline")
+    end,
+  },
+
+  -- fancy start screen
+  {
+    "nvimdev/dashboard-nvim",
+    cond = firenvim_not_active,
+    config = function()
+      require("config.dashboard-nvim")
+    end,
+  },
+
+  {
+    "lukas-reineke/indent-blankline.nvim",
+    event = "VeryLazy",
+    main = "ibl",
+    config = function()
+      require("config.indent-blankline")
+    end,
+  },
+  {
+    "luukvbaal/statuscol.nvim",
+    opts = {},
+    config = function()
+      require("config.nvim-statuscol")
+    end,
+  },
+  {
+    "kevinhwang91/nvim-ufo",
+    dependencies = "kevinhwang91/promise-async",
+    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,
+    config = function()
+      require("config.nvim_ufo")
+    end,
+  },
+  -- Highlight URLs inside vim
+  { "itchyny/vim-highlighturl", event = "VeryLazy" },
+
+  -- notification plugin
+  {
+    "rcarriga/nvim-notify",
+    event = "VeryLazy",
+    config = function()
+      require("config.nvim-notify")
+    end,
+  },
+
+  -- 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,
+    enabled = function()
+      if vim.g.is_win or vim.g.is_mac then
+        return true
+      else
+        return false
+      end
+    end,
+    dependencies = { "nvim-lua/plenary.nvim" },
+    config = true, -- default settings
+    submodules = false, -- not needed, submodules are required only for tests
+  },
+
+  -- Only install these plugins if ctags are installed on the system
+  -- show file tags in vim window
+  {
+    "liuchengxu/vista.vim",
+    enabled = function()
+      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" },
+
+  -- Automatic insertion and deletion of a pair of characters
+  {
+    "windwp/nvim-autopairs",
+    event = "InsertEnter",
+    config = true,
+  },
+
+  -- Comment plugin
+  { "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",
+    config = function()
+      require("config.yanky")
+    end,
+    event = "VeryLazy",
+  },
+
+  -- Handy unix command inside Vim (Rename, Move etc.)
+  { "tpope/vim-eunuch", cmd = { "Rename", "Delete" } },
+
+  -- Repeat vim motions
+  { "tpope/vim-repeat", event = "VeryLazy" },
+
+  { "nvim-zh/better-escape.vim", event = { "InsertEnter" } },
+
+  {
+    "lyokha/vim-xkbswitch",
+    enabled = function()
+      if vim.g.is_mac and utils.executable("xkbswitch") then
+        return true
+      end
+      return false
+    end,
+    event = { "InsertEnter" },
+  },
+
+  {
+    "Neur1n/neuims",
+    enabled = function()
+      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",
+    event = "User InGitRepo",
+    config = function()
+      require("config.fugitive")
+    end,
+  },
+
+  -- Better git log display
+  { "rbong/vim-flog", cmd = { "Flog" } },
+  { "akinsho/git-conflict.nvim", version = "*", config = true },
+  {
+    "ruifm/gitlinker.nvim",
+    event = "User InGitRepo",
+    config = function()
+      require("config.git-linker")
+    end,
+  },
+
+  -- Show git change (change, delete, add) signs in vim sign column
+  {
+    "lewis6991/gitsigns.nvim",
+    config = function()
+      require("config.gitsigns")
+    end,
+  },
+
+  -- Better git commit experience
+  { "rhysd/committia.vim", lazy = true },
+
+  {
+    "sindrets/diffview.nvim",
+  },
+
+  {
+    "kevinhwang91/nvim-bqf",
+    ft = "qf",
+    config = function()
+      require("config.bqf")
+    end,
+  },
+
+  -- Another markdown plugin
+  { "preservim/vim-markdown", ft = { "markdown" } },
+
+  -- Faster footnote generation
+  { "vim-pandoc/vim-markdownfootnotes", ft = { "markdown" } },
+
+  -- Vim tabular plugin for manipulate tabular, required by markdown plugins
+  { "godlygeek/tabular", cmd = { "Tabularize" } },
+
+  -- Markdown previewing (only for Mac and Windows)
+  {
+    "iamcco/markdown-preview.nvim",
+    enabled = function()
+      if vim.g.is_win or vim.g.is_mac then
+        return true
+      end
+      return false
+    end,
+    build = "cd app && npm install",
+    ft = { "markdown" },
+  },
+
+  {
+    "rhysd/vim-grammarous",
+    enabled = function()
+      if vim.g.is_mac then
+        return true
+      end
+      return false
+    end,
+    ft = { "markdown" },
+  },
+
+  { "chrisbra/unicode.vim", event = "VeryLazy" },
+
+  -- Additional powerful text object for vim, this plugin should be studied
+  -- carefully to use its full power
+  { "wellle/targets.vim", event = "VeryLazy" },
+
+  -- Plugin to manipulate character pairs quickly
+  { "machakann/vim-sandwich", event = "VeryLazy" },
+
+  -- Add indent object for vim (useful for languages like Python)
+  { "michaeljsmith/vim-indent-object", event = "VeryLazy" },
+
+  -- Only use these plugin on Windows and Mac and when LaTeX is installed
+  {
+    "lervag/vimtex",
+    enabled = function()
+      if utils.executable("latex") then
+        return true
+      end
+      return false
+    end,
+    ft = { "tex" },
+  },
+
+  -- Since tmux is only available on Linux and Mac, we only enable these plugins
+  -- for Linux and Mac
+  -- .tmux.conf syntax highlighting and setting check
+  {
+    "tmux-plugins/vim-tmux",
+    enabled = function()
+      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" } },
+
+  -- Asynchronous command execution
+  { "skywind3000/asyncrun.vim", lazy = true, cmd = { "AsyncRun" } },
+  { "cespare/vim-toml", ft = { "toml" }, branch = "main" },
+
+  -- Edit text area in browser using nvim
+  {
+    "glacambre/firenvim",
+    enabled = function()
+      local result = vim.g.is_win or vim.g.is_mac
+      return result
+    end,
+    -- it seems that we can only call the firenvim function directly.
+    -- Using vim.fn or vim.cmd to call this function will fail.
+    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)
+    end,
+  },
+  -- Debugger plugin
+  {
+    "sakhnik/nvim-gdb",
+    enabled = function()
+      if vim.g.is_win or vim.g.is_linux then
+        return true
+      end
+      return false
+    end,
+    build = { "bash install.sh" },
+    lazy = true,
+  },
+
+  -- Session management plugin
+  { "tpope/vim-obsession", cmd = "Obsession" },
+
+  {
+    "ojroques/vim-oscyank",
+    enabled = function()
+      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",
+    event = "VeryLazy",
+    config = function()
+      require("config.which-key")
+    end,
+  },
+
+  -- show and trim trailing whitespaces
+  { "jdhao/whitespace.nvim", event = "VeryLazy" },
+
+  -- file explorer
+  {
+    "nvim-tree/nvim-tree.lua",
+    event = "VeryLazy",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    config = function()
+      require("config.nvim-tree")
+    end,
+  },
+
+  {
+    "j-hui/fidget.nvim",
+    event = "VeryLazy",
+    tag = "legacy",
+    config = function()
+      require("config.fidget-nvim")
+    end,
+  },
+  {
+    "folke/lazydev.nvim",
+    ft = "lua", -- only load on lua files
+    opts = {},
+  },
+  {
+    "CopilotC-Nvim/CopilotChat.nvim",
+    branch = "canary",
+    dependencies = {
+      { "zbirenbaum/copilot.lua" }, -- or github/copilot.vim
+      { "nvim-lua/plenary.nvim" }, -- for curl, log wrapper
+    },
+    opts = {
+      debug = true, -- Enable debugging
+      -- See Configuration section for rest
+    },
+    -- See Commands section for default commands if you want to lazy load on them
+  },
+  {
+    "zbirenbaum/copilot.lua",
+    cmd = "Copilot",
+    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,
+    event = "VeryLazy",
+  },
+}
+
+require("lazy").setup {
+  spec = plugin_specs,
+  ui = {
+    border = "rounded",
+    title = "Plugin Manager",
+    title_pos = "center",
+  },
+  rocks = {
+    enabled = false,
+  },
+}

lua/plugins.lua

@@ -1,399 +0,0 @@
-local api = vim.api
-local fn = vim.fn
-
-local utils = require("utils")
-
--- The root dir to install all plugins. Plugins are under opt/ or start/ sub-directory.
-vim.g.plugin_home = fn.stdpath("data") .. "/site/pack/packer"
-
---- Install packer if it has not been installed.
---- Return:
---- true: if this is a fresh install of packer
---- false: if packer has been installed
-local function packer_ensure_install()
-  -- Where to install packer.nvim -- the package manager (we make it opt)
-  local packer_dir = vim.g.plugin_home .. "/opt/packer.nvim"
-
-  if fn.glob(packer_dir) ~= "" then
-    return false
-  end
-
-  -- Auto-install packer in case it hasn't been installed.
-  vim.api.nvim_echo({ { "Installing packer.nvim", "Type" } }, true, {})
-
-  local packer_repo = "https://github.com/wbthomason/packer.nvim"
-  local install_cmd = string.format("!git clone --depth=1 %s %s", packer_repo, packer_dir)
-  vim.cmd(install_cmd)
-
-  return true
-end
-
-local fresh_install = packer_ensure_install()
-
--- Load packer.nvim
-vim.cmd("packadd packer.nvim")
-
-local packer = require("packer")
-local packer_util = require("packer.util")
-
--- check if firenvim is active
-local firenvim_not_active = function()
-  return not vim.g.started_by_firenvim
-end
-
-packer.startup {
-  function(use)
-    -- it is recommended to put impatient.nvim before any other plugins
-    use { "lewis6991/impatient.nvim", config = [[require('impatient')]] }
-
-    use { "wbthomason/packer.nvim", opt = true }
-
-    use { "onsails/lspkind-nvim", event = "VimEnter" }
-    -- auto-completion engine
-    use { "hrsh7th/nvim-cmp", after = "lspkind-nvim", config = [[require('config.nvim-cmp')]] }
-
-    -- nvim-cmp completion sources
-    use { "hrsh7th/cmp-nvim-lsp", after = "nvim-cmp" }
-    use { "hrsh7th/cmp-path", after = "nvim-cmp" }
-    use { "hrsh7th/cmp-buffer", after = "nvim-cmp" }
-    use { "hrsh7th/cmp-omni", after = "nvim-cmp" }
-    use { "quangnguyen30192/cmp-nvim-ultisnips", after = { "nvim-cmp", "ultisnips" } }
-    if vim.g.is_mac then
-      use { "hrsh7th/cmp-emoji", after = "nvim-cmp" }
-    end
-
-    -- nvim-lsp configuration (it relies on cmp-nvim-lsp, so it should be loaded after cmp-nvim-lsp).
-    use { "neovim/nvim-lspconfig", after = "cmp-nvim-lsp", config = [[require('config.lsp')]] }
-
-    if vim.g.is_mac then
-      use {
-        "nvim-treesitter/nvim-treesitter",
-        event = "BufEnter",
-        run = ":TSUpdate",
-        config = [[require('config.treesitter')]],
-      }
-    end
-
-    -- Python indent (follows the PEP8 style)
-    use { "Vimjas/vim-python-pep8-indent", ft = { "python" } }
-
-    -- Python-related text object
-    use { "jeetsukumaran/vim-pythonsense", ft = { "python" } }
-
-    use { "machakann/vim-swap", event = "VimEnter" }
-
-    -- IDE for Lisp
-    if utils.executable("sbcl") then
-      -- use 'kovisoft/slimv'
-      use { "vlime/vlime", rtp = "vim/", ft = { "lisp" } }
-    end
-
-    -- Super fast buffer jump
-    use {
-      "phaazon/hop.nvim",
-      event = "VimEnter",
-      config = function()
-        vim.defer_fn(function()
-          require("config.nvim_hop")
-        end, 2000)
-      end,
-    }
-
-    -- Show match number and index for searching
-    use {
-      "kevinhwang91/nvim-hlslens",
-      branch = "main",
-      keys = { { "n", "*" }, { "n", "#" }, { "n", "n" }, { "n", "N" } },
-      config = [[require('config.hlslens')]],
-    }
-
-    -- File search, tag search and more
-    if vim.g.is_win then
-      use { "Yggdroot/LeaderF", cmd = "Leaderf" }
-    else
-      use { "Yggdroot/LeaderF", cmd = "Leaderf", run = ":LeaderfInstallCExtension" }
-    end
-
-    use {
-      "nvim-telescope/telescope.nvim",
-      cmd = "Telescope",
-      requires = { { "nvim-lua/plenary.nvim" } },
-    }
-    -- search emoji and other symbols
-    use { "nvim-telescope/telescope-symbols.nvim", after = "telescope.nvim" }
-
-    -- A list of colorscheme plugin you may want to try. Find what suits you.
-    use { "navarasu/onedark.nvim", opt = true }
-    use { "sainnhe/edge", opt = true }
-    use { "sainnhe/sonokai", opt = true }
-    use { "sainnhe/gruvbox-material", opt = true }
-    use { "shaunsingh/nord.nvim", opt = true }
-    use { "sainnhe/everforest", opt = true }
-    use { "EdenEast/nightfox.nvim", opt = true }
-    use { "rebelot/kanagawa.nvim", opt = true }
-    use { "catppuccin/nvim", as = "catppuccin", opt = true }
-    use({ "rose-pine/neovim", as = 'rose-pine', opt = true })
-    use { "olimorris/onedarkpro.nvim", opt = true }
-    use { "tanvirtin/monokai.nvim", opt = true }
-    use { "marko-cerovac/material.nvim", opt = true }
-
-    use { "nvim-tree/nvim-web-devicons", event = "VimEnter" }
-
-    use {
-      "nvim-lualine/lualine.nvim",
-      event = "VimEnter",
-      cond = firenvim_not_active,
-      config = [[require('config.statusline')]],
-    }
-
-    use { "akinsho/bufferline.nvim", event = "VimEnter",
-      cond = firenvim_not_active,
-      config = [[require('config.bufferline')]] }
-
-    -- fancy start screen
-    use { "glepnir/dashboard-nvim", event = "VimEnter",
-      cond = firenvim_not_active,
-      config = [[require('config.dashboard-nvim')]]
-    }
-
-    use {
-      "lukas-reineke/indent-blankline.nvim",
-      event = "VimEnter",
-      config = [[require('config.indent-blankline')]],
-    }
-
-    -- Highlight URLs inside vim
-    use { "itchyny/vim-highlighturl", event = "VimEnter" }
-
-    -- notification plugin
-    use {
-      "rcarriga/nvim-notify",
-      event = "BufEnter",
-      config = function()
-        vim.defer_fn(function()
-          require("config.nvim-notify")
-        end, 2000)
-      end,
-    }
-
-    -- 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.
-    if vim.g.is_win or vim.g.is_mac then
-      -- open URL in browser
-      use { "tyru/open-browser.vim", event = "VimEnter" }
-    end
-
-    -- Only install these plugins if ctags are installed on the system
-    if utils.executable("ctags") then
-      -- show file tags in vim window
-      use { "liuchengxu/vista.vim", cmd = "Vista" }
-    end
-
-    -- Snippet engine and snippet template
-    use { "SirVer/ultisnips", event = "InsertEnter" }
-    use { "honza/vim-snippets", after = "ultisnips" }
-
-    -- Automatic insertion and deletion of a pair of characters
-    use { "Raimondi/delimitMate", event = "InsertEnter" }
-
-    -- Comment plugin
-    use { "tpope/vim-commentary", event = "VimEnter" }
-
-    -- Multiple cursor plugin like Sublime Text?
-    -- use 'mg979/vim-visual-multi'
-
-    -- Autosave files on certain events
-    use { "907th/vim-auto-save", event = "InsertEnter" }
-
-    -- Show undo history visually
-    use { "simnalamburt/vim-mundo", cmd = { "MundoToggle", "MundoShow" } }
-
-    -- better UI for some nvim actions
-    use {'stevearc/dressing.nvim'}
-
-    -- Manage your yank history
-    use({
-      "gbprod/yanky.nvim",
-      config = [[require('config.yanky')]]
-    })
-
-    -- Handy unix command inside Vim (Rename, Move etc.)
-    use { "tpope/vim-eunuch", cmd = { "Rename", "Delete" } }
-
-    -- Repeat vim motions
-    use { "tpope/vim-repeat", event = "VimEnter" }
-
-    use { "nvim-zh/better-escape.vim", event = { "InsertEnter" } }
-
-    if vim.g.is_mac then
-      use { "lyokha/vim-xkbswitch", event = { "InsertEnter" } }
-    elseif vim.g.is_win then
-      use { "Neur1n/neuims", event = { "InsertEnter" } }
-    end
-
-    -- Auto format tools
-    use { "sbdchd/neoformat", cmd = { "Neoformat" } }
-
-    -- Git command inside vim
-    use { "tpope/vim-fugitive", event = "User InGitRepo", config = [[require('config.fugitive')]] }
-
-    -- Better git log display
-    use { "rbong/vim-flog", requires = "tpope/vim-fugitive", cmd = { "Flog" } }
-
-    use { "christoomey/vim-conflicted", requires = "tpope/vim-fugitive", cmd = { "Conflicted" } }
-
-    use {
-      "ruifm/gitlinker.nvim",
-      requires = "nvim-lua/plenary.nvim",
-      event = "User InGitRepo",
-      config = [[require('config.git-linker')]],
-    }
-
-    -- Show git change (change, delete, add) signs in vim sign column
-    use { "lewis6991/gitsigns.nvim", config = [[require('config.gitsigns')]] }
-
-    -- Better git commit experience
-    use { "rhysd/committia.vim", opt = true, setup = [[vim.cmd('packadd committia.vim')]] }
-
-    use { "kevinhwang91/nvim-bqf", ft = "qf", config = [[require('config.bqf')]] }
-
-    -- Another markdown plugin
-    use { "preservim/vim-markdown", ft = { "markdown" } }
-
-    -- Faster footnote generation
-    use { "vim-pandoc/vim-markdownfootnotes", ft = { "markdown" } }
-
-    -- Vim tabular plugin for manipulate tabular, required by markdown plugins
-    use { "godlygeek/tabular", cmd = { "Tabularize" } }
-
-    -- Markdown previewing (only for Mac and Windows)
-    if vim.g.is_win or vim.g.is_mac then
-      use {
-        "iamcco/markdown-preview.nvim",
-        run = "cd app && npm install",
-        ft = { "markdown" },
-      }
-    end
-
-    use { "folke/zen-mode.nvim", cmd = "ZenMode", config = [[require('config.zen-mode')]] }
-
-    if vim.g.is_mac then
-      use { "rhysd/vim-grammarous", ft = { "markdown" } }
-    end
-
-    use { "chrisbra/unicode.vim", event = "VimEnter" }
-
-    -- Additional powerful text object for vim, this plugin should be studied
-    -- carefully to use its full power
-    use { "wellle/targets.vim", event = "VimEnter" }
-
-    -- Plugin to manipulate character pairs quickly
-    use { "machakann/vim-sandwich", event = "VimEnter" }
-
-    -- Add indent object for vim (useful for languages like Python)
-    use { "michaeljsmith/vim-indent-object", event = "VimEnter" }
-
-    -- Only use these plugin on Windows and Mac and when LaTeX is installed
-    if utils.executable("latex") then
-      use { "lervag/vimtex", ft = { "tex" } }
-    end
-
-    -- Since tmux is only available on Linux and Mac, we only enable these plugins
-    -- for Linux and Mac
-    if utils.executable("tmux") then
-      -- .tmux.conf syntax highlighting and setting check
-      use { "tmux-plugins/vim-tmux", ft = { "tmux" } }
-    end
-
-    -- Modern matchit implementation
-    use { "andymass/vim-matchup", event = "VimEnter" }
-
-    use { "tpope/vim-scriptease", cmd = { "Scriptnames", "Message", "Verbose" } }
-
-    -- Asynchronous command execution
-    use { "skywind3000/asyncrun.vim", opt = true, cmd = { "AsyncRun" } }
-
-    use { "cespare/vim-toml", ft = { "toml" }, branch = "main" }
-
-    -- Edit text area in browser using nvim
-    if vim.g.is_win or vim.g.is_mac then
-      use {
-        "glacambre/firenvim",
-        run = function()
-          fn["firenvim#install"](0)
-        end,
-        opt = true,
-        setup = [[vim.cmd('packadd firenvim')]],
-      }
-    end
-
-    -- Debugger plugin
-    if vim.g.is_win or vim.g.is_linux then
-      use { "sakhnik/nvim-gdb", run = { "bash install.sh" }, opt = true, setup = [[vim.cmd('packadd nvim-gdb')]] }
-    end
-
-    -- Session management plugin
-    use { "tpope/vim-obsession", cmd = "Obsession" }
-
-    if vim.g.is_linux then
-      use { "ojroques/vim-oscyank", cmd = { "OSCYank", "OSCYankReg" } }
-    end
-
-    -- The missing auto-completion for cmdline!
-    use { "gelguy/wilder.nvim", opt = true, setup = [[vim.cmd('packadd wilder.nvim')]] }
-
-    -- showing keybindings
-    use {
-      "folke/which-key.nvim",
-      event = "VimEnter",
-      config = function()
-        vim.defer_fn(function()
-          require("config.which-key")
-        end, 2000)
-      end,
-    }
-
-    -- show and trim trailing whitespaces
-    use { "jdhao/whitespace.nvim", event = "VimEnter" }
-
-    -- file explorer
-    use {
-      "nvim-tree/nvim-tree.lua",
-      requires = { "nvim-tree/nvim-web-devicons" },
-      config = [[require('config.nvim-tree')]],
-    }
-
-    use { "ii14/emmylua-nvim", ft = "lua" }
-
-    use { "j-hui/fidget.nvim", after = "nvim-lspconfig", config = [[require('config.fidget-nvim')]] }
-  end,
-  config = {
-    max_jobs = 16,
-    compile_path = packer_util.join_paths(fn.stdpath("data"), "site", "lua", "packer_compiled.lua"),
-  },
-}
-
--- For fresh install, we need to install plugins. Otherwise, we just need to require `packer_compiled.lua`.
-if fresh_install then
-  -- We run packer.sync() here, because only after packer.startup, can we know which plugins to install.
-  -- So plugin installation should be done after the startup process.
-  packer.sync()
-else
-  local status, _ = pcall(require, "packer_compiled")
-  if not status then
-    local msg = "File packer_compiled.lua not found: run PackerSync to fix!"
-    vim.notify(msg, vim.log.levels.ERROR, { title = "nvim-config" })
-  end
-end
-
--- Auto-generate packer_compiled.lua file
-api.nvim_create_autocmd({ "BufWritePost" }, {
-  pattern = "*/nvim/lua/plugins.lua",
-  group = api.nvim_create_augroup("packer_auto_compile", { clear = true }),
-  callback = function(ctx)
-    local cmd = "source " .. ctx.file
-    vim.cmd(cmd)
-    vim.cmd("PackerCompile")
-    vim.notify("PackerCompile done!", vim.log.levels.INFO, { title = "Nvim-config" })
-  end,
-})

lua/utils.lua

@@ -1,4 +1,5 @@
 local fn = vim.fn
+local version = vim.version
 
 local M = {}
 
@@ -11,9 +12,8 @@ function M.executable(name)
 end
 
 --- check whether a feature exists in Nvim
---- @feat: string
----   the feature name, like `nvim-0.7` or `unix`.
---- return: bool
+--- @param feat string the feature name, like `nvim-0.7` or `unix`.
+--- @return boolean
 M.has = function(feat)
   if fn.has(feat) == 1 then
     return true
@@ -33,8 +33,9 @@ end
 
 --- Generate random integers in the range [Low, High], inclusive,
 --- adapted from https://stackoverflow.com/a/12739441/6064933
---- @low: the lower value for this range
---- @high: the upper value for this range
+--- @param low integer the lower value for this range
+--- @param high integer the upper value for this range
+--- @return integer
 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,17 +44,39 @@ function M.rand_int(low, high)
 end
 
 --- Select a random element from a sequence/list.
---- @seq: the sequence to choose an element
+--- @param seq any[] the sequence to choose an element
 function M.rand_element(seq)
   local idx = M.rand_int(1, #seq)
 
   return seq[idx]
 end
 
-function M.add_pack(name)
-  local status, error = pcall(vim.cmd, "packadd " .. name)
+--- 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()
 
-  return status
+  if expect_ver == nil then
+    local msg = string.format("Unsupported version string: %s", expected_version)
+    vim.api.nvim_err_writeln(msg)
+    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_err_writeln(msg)
+  end
+
+  return true
 end
 
 return M

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

spell/en.utf-8.add

@@ -458,3 +458,15 @@ pyright
 stubgen
 pylance
 variadic
+Vimium
+Databricks
+Jira
+databricks
+FastAPI
+pylintrc
+PYTHONPATH
+Uvicorn
+qpdf
+Elasticsearch
+kibana
+submodule

viml_conf/options.vim

@@ -1,11 +1,14 @@
 scriptencoding utf-8
 
 " change fillchars for folding, vertical split, end of buffer, and message separator
-set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾
+set fillchars=fold:\ ,foldsep:\ ,foldopen:,foldclose:,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
@@ -71,7 +74,7 @@ set scrolloff=3
 " Use mouse to select and resize windows, etc.
 set mouse=nic  " Enable mouse in several mode
 set mousemodel=popup  " Set the behaviour of mouse
-set mousescroll=ver:1,hor:6
+set mousescroll=ver:1,hor:0
 
 " Disable showing current mode on command line since statusline plugins can show it.
 set noshowmode
@@ -118,7 +121,7 @@ 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=10  " pseudo transparency for completion menu
+set pumblend=5  " pseudo transparency for completion menu
 
 set winblend=0  " pseudo transparency for floating window
 

viml_conf/plugins.vim

@@ -1,16 +1,16 @@
 scriptencoding utf-8
 
 " Plugin specification and lua stuff
-lua require('plugins')
+lua require('plugin_specs')
 
 " Use short names for common plugin manager commands to simplify typing.
 " To use these shortcuts: first activate command line with `:`, then input the
 " short alias, e.g., `pi`, then press <space>, the alias will be expanded to
 " the full command automatically.
-call utils#Cabbrev('pi', 'PackerInstall')
-call utils#Cabbrev('pud', 'PackerUpdate')
-call utils#Cabbrev('pc', 'PackerClean')
-call utils#Cabbrev('ps', 'PackerSync')
+call utils#Cabbrev('pi', 'Lazy install')
+call utils#Cabbrev('pud', 'Lazy update')
+call utils#Cabbrev('pc', 'Lazy clean')
+call utils#Cabbrev('ps', 'Lazy sync')
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "                      configurations for vim script plugin                  "
@@ -42,7 +42,7 @@ let g:Lf_UseMemoryCache = 0
 
 " Ignore certain files and directories when searching files
 let g:Lf_WildIgnore = {
-  \ 'dir': ['.git', '__pycache__', '.DS_Store'],
+  \ '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',
@@ -58,16 +58,6 @@ 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
@@ -109,15 +99,19 @@ let g:Lf_PopupColorscheme = 'gruvbox_material'
 " items.
 let g:Lf_CommandMap = {'<C-J>': ['<C-N>'], '<C-K>': ['<C-P>']}
 
-""""""""""""""""""""""""""""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
+" do not preview results, it will add the file to buffer list
+let g:Lf_PreviewResult = {
+      \ 'File': 0,
+      \ 'Buffer': 0,
+      \ 'Mru': 0,
+      \ 'Tag': 0,
+      \ 'BufTag': 1,
+      \ 'Function': 1,
+      \ 'Line': 0,
+      \ 'Colorscheme': 0,
+      \ 'Rg': 0,
+      \ 'Gtags': 0
+      \}
 
 """"""""""""""""""""""""""" vista settings """"""""""""""""""""""""""""""""""
 let g:vista#renderer#icons = {
@@ -387,7 +381,7 @@ function! s:wilder_init() abort
           \ 'apply_incsearch_fix': 0,
           \ }))
   catch /^Vim\%((\a\+)\)\=:E117/
-    echohl Error |echomsg "Wilder.nvim missing: run :PackerSync to fix."|echohl None
+    echohl Error |echomsg "Wilder.nvim missing"| echohl None
   endtry
 endfunction