update which-key conf and some mappings

use plugin nvim-autopairs for autopair
delimitMate is not updated for a long time.
2025-06-08 14:14:33 +02:00 · 2024-07-25 04:00:17 +08:00 · 2024-07-14 05:17:49 +08:00 · 2024-06-26 03:33:24 +08:00 · 2024-06-26 03:25:01 +08:00 · 2024-05-20 22:09:07 +02:00
45 changed files with 1101 additions and 924 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2018-2022 jdhao
+Copyright (c) 2018-2023 jdhao

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -9,24 +9,27 @@
    <a>
      <img alt="Windows" src="https://img.shields.io/badge/Windows-%23.svg?style=flat-square&logo=windows&color=0078D6&logoColor=white" />
    </a>
-    <a href="https://github.com/jdhao/nvim-config/commits">
-      <img src="https://badgen.net/github/commits/jdhao/nvim-config" alt="Commit number" />
-    </a>
-    <a href="https://github.com/jdhao/nvim-config/network">
-      <img alt="Forks" src="https://badgen.net/github/forks/jdhao/nvim-config">
-    </a>
-    <a href="https://github.com/jdhao/nvim-config/stargazers">
-      <img alt="Stars" src="https://badgen.net/github/stars/jdhao/nvim-config">
-    </a>
    <a href="https://github.com/jdhao/nvim-config/releases/latest">
      <img alt="Latest release" src="https://img.shields.io/github/v/release/jdhao/nvim-config" />
    </a>
    <a href="https://github.com/neovim/neovim/releases/tag/stable">
-      <img src="https://img.shields.io/badge/Neovim-0.7.2-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
+      <img src="https://img.shields.io/badge/Neovim-0.9.5-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
    </a>
    <a href="https://github.com/jdhao/nvim-config/search?l=vim-script">
      <img src="https://img.shields.io/github/languages/top/jdhao/nvim-config" alt="Top languages"/>
    </a>
+    <a href="https://github.com/jdhao/nvim-config/graphs/commit-activity">
+      <img src="https://img.shields.io/github/commit-activity/m/jdhao/nvim-config?style=flat-square" />
+    </a>
+    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.9.5">
+      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.9.5?style=flat-square" />
+    </a>
+    <a href="https://github.com/jdhao/nvim-config/graphs/contributors">
+      <img src="https://img.shields.io/github/contributors/jdhao/nvim-config?style=flat-square" />
+    </a>
+    <a>
+      <img src="https://img.shields.io/github/repo-size/jdhao/nvim-config?style=flat-square" />
+    </a>
    <a href="https://github.com/jdhao/nvim-config/blob/master/LICENSE">
      <img src="https://img.shields.io/github/license/jdhao/nvim-config?style=flat-square&logo=GNU&label=License" alt="License"/>
    </a>
@@ -54,19 +57,19 @@ 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).
 + Beautiful statusline via [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim).
-+ File tree explorer via [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua).
+ File tree explorer via [nvim-tree.lua](https://github.com/nvim-tree/nvim-tree.lua).
 + Better quickfix list with [nvim-bqf](https://github.com/kevinhwang91/nvim-bqf).
 + Show search index and count with [nvim-hlslens](https://github.com/kevinhwang91/nvim-hlslens).
 + Command line auto-completion via [wilder.nvim](https://github.com/gelguy/wilder.nvim).
@@ -76,9 +79,8 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + Code editing using true nvim inside browser via [firenvim](https://github.com/glacambre/firenvim).
 + Beautiful colorscheme via [sainnhe/gruvbox-material](https://github.com/sainnhe/gruvbox-material) and other colorschemes.
 + Markdown writing and previewing via [vim-markdown](https://github.com/preservim/vim-markdown) and [markdown-preview.nvim](https://github.com/iamcco/markdown-preview.nvim).
-+ LaTeX editing and previewing via [vimtex](https://github.com/lervag/vimtex) <sup id="a1">[1](#f1)</sup>.
+ LaTeX editing and previewing via [vimtex](https://github.com/lervag/vimtex)
 + Animated GUI style notification via [nvim-notify](https://github.com/rcarriga/nvim-notify).
-+ Smooth scroll experience via [neoscroll](https://github.com/karb94/neoscroll.nvim).
 + 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)
@@ -214,5 +216,3 @@ You may also be interested in my posts on configuring Nvim:
 + [Config nvim on Linux for Python development](https://jdhao.github.io/2018/12/24/centos_nvim_install_use_guide_en/)
 + [Nvim config on Windows 10](https://jdhao.github.io/2018/11/15/neovim_configuration_windows/)
 + [Nvim-qt config on Windows 10](https://jdhao.github.io/2019/01/17/nvim_qt_settings_on_windows/)
-
-<b id="f1">1:</b> Not enabled for Linux, you need to tweak [`lua/plugins.lua`](lua/plugins.lua) and change the condition for installing vimtex.[↩](#a1)
--- a/after/ftplugin/cpp.vim
+++ b/after/ftplugin/cpp.vim
@@ -1,10 +1,5 @@
 set commentstring=//\ %s

-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
-
 " Disable inserting comment leader after hitting o or O or <Enter>
 set formatoptions-=o
 set formatoptions-=r
@@ -39,6 +34,3 @@ function s:create_term_buf(_type, size) abort
  endif
  execute 'resize ' . a:size
 endfunction
-
-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"
--- a/after/ftplugin/gitconfig.vim
+++ b/after/ftplugin/gitconfig.vim
@@ -0,0 +1 @@
+set commentstring=#\ %s
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -1,8 +1,3 @@
 " Disable inserting comment leader after hitting o or O or <Enter>
 set formatoptions-=o
 set formatoptions-=r
-
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
--- a/after/ftplugin/json.vim
+++ b/after/ftplugin/json.vim
@@ -0,0 +1,6 @@
+" let the initial folding state be that all folds are closed.
+set foldlevel=0
+
+" Use nvim-treesitter for folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
--- a/after/ftplugin/lua.vim
+++ b/after/ftplugin/lua.vim
@@ -2,12 +2,8 @@
 set formatoptions-=o
 set formatoptions-=r

-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
+nnoremap <buffer><silent> <F9> :luafile %<CR>

-nnoremap <silent> <F9> :luafile %<CR>
-
-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"
+" Use nvim-treesitter for folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
--- a/after/ftplugin/python.vim
+++ b/after/ftplugin/python.vim
@@ -8,5 +8,11 @@ set sidescroll=5
 set sidescrolloff=2
 set colorcolumn=100

-" For delimitMate
-let b:delimitMate_matchpairs = "(:),[:],{:}"
+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
+
+" Use nvim-treesitter for folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
--- a/after/ftplugin/toml.vim
+++ b/after/ftplugin/toml.vim
@@ -1,4 +0,0 @@
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
--- a/after/ftplugin/vim.vim
+++ b/after/ftplugin/vim.vim
@@ -12,9 +12,4 @@ set foldmethod=expr foldexpr=utils#VimFolds(v:lnum) foldtext=utils#MyFoldText()
 " see `:h K` and https://stackoverflow.com/q/15867323/6064933
 set keywordprg=:help

-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
-
-nnoremap <silent> <F9> :source %<CR>
+nnoremap <buffer><silent> <F9> :source %<CR>
--- a/after/ftplugin/yaml.vim
+++ b/after/ftplugin/yaml.vim
@@ -1,8 +1,3 @@
-set tabstop=2       " number of visual spaces per TAB
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
-
 " Turn off syntax highlighting for large YAML files.
 if line('$') > 500
  setlocal syntax=OFF
--- a/autoload/utils.vim
+++ b/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
--- a/core/colorschemes.lua
+++ b/core/colorschemes.lua
@@ -1,123 +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 = {
-  gruvbox8 = "vim-gruvbox8",
-  onedark = "onedark.nvim",
-  edge = "edge",
-  sonokai = "sonokai",
-  gruvbox_material = "gruvbox-material",
-  nord = "nord.nvim",
-  doom_one = "doom-one.nvim",
-  everforest = "everforest",
-  nightfox = "nightfox.nvim",
-  kanagawa = "kanagawa.nvim",
-  catppuccin = "catppuccin",
-}
-
-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()
-  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
-
--- 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()
--- a/docs/README.md
+++ b/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,7 +111,7 @@ 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.
@@ -201,22 +201,6 @@ After installing Nvim, we need to set the path to nvim correctly.

 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 +212,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.
--- a/docs/nvim_setup_linux.sh
+++ b/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)"
@@ -124,27 +124,27 @@ fi
 #######################################################################
 #                         lua-language-server                         #
 #######################################################################
-SUMNEKO_LUA_DIR=$HOME/tools/lua-language-server
-SUMNEKO_LUA_SRC_NAME=$HOME/packages/lua-language-server.tar.gz
-SUMNEKO_LUA_LINK="https://github.com/sumneko/lua-language-server/releases/download/3.5.3/lua-language-server-3.5.3-linux-x64.tar.gz"
+LUA_LS_DIR=$HOME/tools/lua-language-server
+LUA_LS_SRC=$HOME/packages/lua-language-server.tar.gz
+LUA_LS_LINK="https://github.com/LuaLS/lua-language-server/releases/download/3.6.11/lua-language-server-3.6.11-linux-x64.tar.gz"

-if [[ -z "$(command -v lua-language-server)" ]] && [[ ! -f "$SUMNEKO_LUA_DIR/bin/lua-language-server" ]]; then
+if [[ -z "$(command -v lua-language-server)" ]] && [[ ! -f "$LUA_LS_DIR/bin/lua-language-server" ]]; then
    echo 'Install lua-language-server'
-    if [[ ! -f $SUMNEKO_LUA_SRC_NAME ]]; then
+    if [[ ! -f $LUA_LS_SRC ]]; then
        echo "Downloading lua-language-server and renaming"
-        wget $SUMNEKO_LUA_LINK -O "$SUMNEKO_LUA_SRC_NAME"
+        wget $LUA_LS_LINK -O "$LUA_LS_SRC"
    fi

-    if [[ ! -d "$SUMNEKO_LUA_DIR" ]]; then
+    if [[ ! -d "$LUA_LS_DIR" ]]; then
        echo "Creating lua-language-server directory under tools directory"
-        mkdir -p "$SUMNEKO_LUA_DIR"
-        echo "Extracting to directory $SUMNEKO_LUA_DIR"
+        mkdir -p "$LUA_LS_DIR"
+        echo "Extracting to directory $LUA_LS_DIR"

-        tar zxvf "$SUMNEKO_LUA_SRC_NAME" -C "$SUMNEKO_LUA_DIR"
+        tar zxvf "$LUA_LS_SRC" -C "$LUA_LS_DIR"
    fi

    if [[ "$ADD_TO_SYSTEM_PATH" = true ]] && [[ "$USE_BASH_SHELL" = true ]]; then
-        echo "export PATH=\"$SUMNEKO_LUA_DIR/bin:\$PATH\"" >> "$HOME/.bash_profile"
+        echo "export PATH=\"$LUA_LS_DIR/bin:\$PATH\"" >> "$HOME/.bash_profile"
    fi
 else
    echo "lua-language-server is already installed. Skip installing it."
@@ -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!"
--- a/docs/nvim_setup_windows.ps1
+++ b/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
@@ -36,19 +36,19 @@ scoop install vcredist2022
 scoop install 7zip

 # Install lua-language-server
-$sumneko_lua_link = "https://github.com/sumneko/lua-language-server/releases/download/3.5.3/lua-language-server-3.5.3-win32-x64.zip"
-$sumneko_lua_install_dir = "D:\portable_tools"
-$sumneko_lua_src_dir = "$sumneko_lua_install_dir\lua-language-server.zip"
-$sumneko_lua_dir = "$sumneko_lua_install_dir\lua-language-server"
+$lua_ls_link = "https://github.com/LuaLS/lua-language-server/releases/download/3.6.11/lua-language-server-3.6.11-win32-x64.zip"
+$lua_ls_install_dir = "D:\portable_tools"
+$lua_ls_src_path = "$lua_ls_install_dir\lua-language-server.zip"
+$lua_ls_dir = "$lua_ls_install_dir\lua-language-server"

 # Download file, ref: https://stackoverflow.com/a/51225744/6064933
-Invoke-WebRequest $sumneko_lua_link -OutFile "$sumneko_lua_src_dir"
+Invoke-WebRequest $lua_ls_link -OutFile "$lua_ls_src_path"

 # Extract the zip file using 7zip, ref: https://stackoverflow.com/a/41933215/6064933
-7z x "$sumneko_lua_src_dir" -o"$sumneko_lua_dir"
+7z x "$lua_ls_src_path" -o"$lua_ls_dir"

 # Setup PATH env variable, ref: https://stackoverflow.com/q/714877/6064933
-[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$sumneko_lua_dir\bin", "Machine")
+[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$lua_ls_dir\bin", "Machine")

 # Install neovim nightly
 scoop bucket add versions
--- a/init.lua
+++ b/init.lua
@@ -4,21 +4,26 @@
 -- I would not recommend cloning this repo and replace your own config. Good configurations are personal,
 -- built over time with a lot of polish.
 --
-- Author: Jie-dong Hao
+-- Author: Jiedong Hao
 -- Email: jdhao@hotmail.com
 -- 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 utils = require("utils")
+local version = vim.version

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

-if nvim_ver ~= expected_ver then
-  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, nvim_ver)
-  api.nvim_err_writeln(msg)
-  return
+local result = version.cmp(ev, {actual_ver.major, actual_ver.minor, actual_ver.patch})
+
+if  result ~= 0 then
+  local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
+  local msg = string.format("Expect nvim %s, but got %s instead. Use at your own risk!", expected_ver, _ver)
+  vim.api.nvim_err_writeln(msg)
 end

 local core_conf_files = {
@@ -30,9 +35,16 @@ local core_conf_files = {
  "colorschemes.lua", -- colorscheme settings
 }

+local viml_conf_dir = vim.fn.stdpath("config") .. "/viml_conf"
 -- 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)
+for _, file_name in ipairs(core_conf_files) do
+  if vim.endswith(file_name, 'vim') then
+    local path = string.format("%s/%s", viml_conf_dir, file_name)
+    local source_cmd = "source " .. path
+    vim.cmd(source_cmd)
+  else
+    local module_name, _ = string.gsub(file_name, "%.lua", "")
+    package.loaded[module_name] = nil
+    require(module_name)
+  end
 end
--- a/lua/colorschemes.lua
+++ b/lua/colorschemes.lua
@@ -0,0 +1,83 @@
+--- 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 = "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,
+  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,
+}
+
+--- 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()
--- a/lua/config/bufferline.lua
+++ b/lua/config/bufferline.lua
@@ -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 = "",
--- a/lua/config/dashboard-nvim.lua
+++ b/lua/config/dashboard-nvim.lua
@@ -1,6 +1,9 @@
+local api = vim.api
+local keymap = vim.keymap
 local dashboard = require("dashboard")

-dashboard.custom_header = {
+local conf = {}
+conf.header = {
  "                                                       ",
  "                                                       ",
  "                                                       ",
@@ -16,50 +19,57 @@ 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",
  },
 }

-vim.cmd([[
-  augroup dashboard_enter
-    au!
-    autocmd FileType dashboard nnoremap <buffer> q :qa<CR>
-    autocmd FileType dashboard nnoremap <buffer> e :enew<CR>
-  augroup END
-]])
+dashboard.setup({
+  theme = 'doom',
+  shortcut_type = 'number',
+  config = conf
+})
+
+api.nvim_create_autocmd("FileType", {
+  pattern = "dashboard",
+  group = api.nvim_create_augroup("dashboard_enter", { clear = true }),
+  callback = function ()
+    keymap.set("n", "q", ":qa<CR>", { buffer = true, silent = true })
+    keymap.set("n", "e", ":enew<CR>", { buffer = true, silent = true })
+  end
+})
--- a/lua/config/git-linker.lua
+++ b/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,
 })

-keymap.set("n", "<leader>gb", "", {
+keymap.set("n", "<leader>gb", 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
 })
--- a/lua/config/gitsigns.lua
+++ b/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)
@@ -49,9 +49,9 @@ vim.api.nvim_create_autocmd('ColorScheme', {
  pattern = "*",
  callback = function()
    vim.cmd [[
-      hi GitSignsChangeInline guibg=fg guifg=bg
-      hi GitSignsAddInline guibg=fg guifg=bg
-      hi GitSignsDeleteInline guibg=fg guifg=bg
+      hi GitSignsChangeInline gui=reverse
+      hi GitSignsAddInline gui=reverse
+      hi GitSignsDeleteInline gui=reverse
    ]]
  end
 })
--- a/lua/config/hlslens.lua
+++ b/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,5 +35,15 @@ keymap.set("n", "N", "", {
  end,
 })

-keymap.set("n", "*", "<Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>")
-keymap.set("n", "#", "<Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>")
+keymap.set("n", "*", "", {
+  callback = function()
+    vim.fn.execute("normal! *N")
+    hlslens.start()
+  end,
+})
+keymap.set("n", "#", "", {
+  callback = function()
+    vim.fn.execute("normal! #N")
+    hlslens.start()
+  end,
+})
--- a/lua/config/indent-blankline.lua
+++ b/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,
 })
--- a/lua/config/lsp.lua
+++ b/lua/config/lsp.lua
@@ -2,9 +2,22 @@ local fn = vim.fn
 local api = vim.api
 local keymap = vim.keymap
 local lsp = vim.lsp
+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)
@@ -20,11 +33,12 @@ local custom_attach = function(client, bufnr)
  map("n", "<C-k>", vim.lsp.buf.signature_help)
  map("n", "<space>rn", vim.lsp.buf.rename, { desc = "varialbe rename" })
  map("n", "gr", vim.lsp.buf.references, { desc = "show references" })
-  map("n", "[d", vim.diagnostic.goto_prev, { desc = "previous diagnostic" })
-  map("n", "]d", vim.diagnostic.goto_next, { desc = "next diagnostic" })
-  map("n", "<space>q", function()
-    vim.diagnostic.setqflist { open = true }
-  end, { desc = "put diagnostic to qf" })
+  map("n", "[d", diagnostic.goto_prev, { desc = "previous diagnostic" })
+  map("n", "]d", diagnostic.goto_next, { desc = "next diagnostic" })
+  -- this puts diagnostics from opened files to quickfix
+  map("n", "<space>qw", diagnostic.setqflist, { desc = "put window diagnostics to qf" })
+  -- this puts diagnostics from current buffer to quickfix
+  map("n", "<space>qb", function() set_qflist(bufnr) end, { desc = "put buffer diagnostics to qf" })
  map("n", "<space>ca", vim.lsp.buf.code_action, { desc = "LSP code action" })
  map("n", "<space>wa", vim.lsp.buf.add_workspace_folder, { desc = "add workspace folder" })
  map("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, { desc = "remove workspace folder" })
@@ -54,9 +68,9 @@ local custom_attach = function(client, bufnr)

      local cursor_pos = api.nvim_win_get_cursor(0)
      if (cursor_pos[1] ~= vim.b.diagnostics_pos[1] or cursor_pos[2] ~= vim.b.diagnostics_pos[2])
-          and #vim.diagnostic.get() > 0
+          and #diagnostic.get() > 0
      then
-        vim.diagnostic.open_float(nil, float_opts)
+        diagnostic.open_float(nil, float_opts)
      end

      vim.b.diagnostics_pos = cursor_pos
@@ -69,12 +83,24 @@ local custom_attach = function(client, bufnr)
      hi! link LspReferenceRead Visual
      hi! link LspReferenceText Visual
      hi! link LspReferenceWrite Visual
-      augroup lsp_document_highlight
-        autocmd! * <buffer>
-        autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
-        autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
-      augroup END
    ]])
+
+    local gid = api.nvim_create_augroup("lsp_document_highlight", { clear = true })
+    api.nvim_create_autocmd("CursorHold" , {
+      group = gid,
+      buffer = bufnr,
+      callback = function ()
+        lsp.buf.document_highlight()
+      end
+    })
+
+    api.nvim_create_autocmd("CursorMoved" , {
+      group = gid,
+      buffer = bufnr,
+      callback = function ()
+        lsp.buf.clear_references()
+      end
+    })
  end

  if vim.g.logging_level == "debug" then
@@ -83,24 +109,45 @@ local custom_attach = function(client, bufnr)
  end
 end

-local capabilities = lsp.protocol.make_client_capabilities()
-capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
-capabilities.textDocument.completion.completionItem.snippetSupport = true
+local capabilities = require('cmp_nvim_lsp').default_capabilities()

 local lspconfig = require("lspconfig")

 if utils.executable("pylsp") then
+  local venv_path = os.getenv('VIRTUAL_ENV')
+  local py_path = nil
+  -- decide which python executable to use for mypy
+  if venv_path ~= nil then
+    py_path = venv_path .. "/bin/python3"
+  else
+    py_path = vim.g.python3_host_prog
+  end
+
  lspconfig.pylsp.setup {
    on_attach = custom_attach,
    settings = {
      pylsp = {
        plugins = {
+          -- formatter options
+          black = { enabled = true },
+          autopep8 = { enabled = false },
+          yapf = { enabled = false },
+          -- linter options
          pylint = { enabled = true, executable = "pylint" },
+          ruff = { enabled = false },
          pyflakes = { enabled = false },
          pycodestyle = { enabled = false },
+          -- type checker
+          pylsp_mypy = {
+            enabled = true,
+            overrides = { "--python-executable", py_path, true },
+            report_progress = true,
+            live_mode = false
+          },
+          -- auto-completion options
          jedi_completion = { fuzzy = true },
-          pyls_isort = { enabled = true },
-          pylsp_mypy = { enabled = true },
+          -- import sorting
+          isort = { enabled = true },
        },
      },
    },
@@ -122,6 +169,20 @@ end
 --   vim.notify("pyright not found!", vim.log.levels.WARN, {title = 'Nvim-config'})
 -- end

+if utils.executable("ltex-ls") then
+  lspconfig.ltex.setup {
+    on_attach = custom_attach,
+    cmd = { "ltex-ls" },
+    filetypes = { "text", "plaintex", "tex", "markdown" },
+    settings = {
+      ltex = {
+        language = "en"
+      },
+    },
+    flags = { debounce_text_changes = 300 },
+}
+end
+
 if utils.executable("clangd") then
  lspconfig.clangd.setup {
    on_attach = custom_attach,
@@ -131,8 +192,6 @@ if utils.executable("clangd") then
      debounce_text_changes = 500,
    },
  }
-else
-  vim.notify("clangd not found!", vim.log.levels.WARN, { title = "Nvim-config" })
 end

 -- set up vim-language-server
@@ -157,8 +216,8 @@ if utils.executable("bash-language-server") then
 end

 if utils.executable("lua-language-server") then
-  -- settings for lua-language-server can be found on https://github.com/sumneko/lua-language-server/wiki/Settings .
-  lspconfig.sumneko_lua.setup {
+  -- settings for lua-language-server can be found on https://github.com/LuaLS/lua-language-server/wiki/Settings .
+  lspconfig.lua_ls.setup {
    on_attach = custom_attach,
    settings = {
      Lua = {
@@ -172,10 +231,10 @@ if utils.executable("lua-language-server") then
        },
        workspace = {
          -- Make the server aware of Neovim runtime files,
-          -- see also https://github.com/sumneko/lua-language-server/wiki/Libraries#link-to-workspace .
-          -- Lua-dev.nvim also has similar settings for sumneko lua, https://github.com/folke/lua-dev.nvim/blob/main/lua/lua-dev/sumneko.lua .
+          -- 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",
+            vim.env.VIMRUNTIME,
            fn.stdpath("config"),
          },
          maxPreload = 2000,
@@ -188,13 +247,13 @@ 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
-vim.diagnostic.config {
+diagnostic.config {
  underline = false,
  virtual_text = false,
  signs = true,
--- a/lua/config/neoscroll.lua
+++ b/lua/config/neoscroll.lua
@@ -1,21 +0,0 @@
-require("neoscroll").setup {
-  easing_function = "quadratic",
-}
-
-local t = {}
-- Syntax: t[keys] = {function, {function arguments}}
-- Use the "sine" easing function
-t["<C-u>"] = { "scroll", { "-vim.wo.scroll", "true", "20", [['cubic']] } }
-t["<C-d>"] = { "scroll", { "vim.wo.scroll", "true", "20", [['cubic']] } }
-- Use the "circular" easing function
-t["<C-b>"] = { "scroll", { "-vim.api.nvim_win_get_height(0)", "true", "50", [['cubic']] } }
-t["<C-f>"] = { "scroll", { "vim.api.nvim_win_get_height(0)", "true", "50", [['cubic']] } }
-- Pass "nil" to disable the easing animation (constant scrolling speed)
-t["<C-y>"] = { "scroll", { "-0.10", "false", "100", nil } }
-t["<C-e>"] = { "scroll", { "0.10", "false", "100", nil } }
-- When no easing function is provided the default easing function (in this case "quadratic") will be used
-t["zt"] = { "zt", { "10" } }
-t["zz"] = { "zz", { "10" } }
-t["zb"] = { "zb", { "10" } }
-
-require("neoscroll.config").set_mappings(t)
--- a/lua/config/nvim-cmp.lua
+++ b/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 = "omni" },
    { name = "emoji", insert = true }, -- emoji completion
  },
  completion = {
@@ -61,6 +60,15 @@ cmp.setup {
  },
 }

+cmp.setup.filetype("tex", {
+  sources = {
+    { name = "omni" },
+    { name = "ultisnips" }, -- For ultisnips user.
+    { name = "buffer", keyword_length = 2 }, -- for buffer word completion
+    { name = "path" }, -- for path completion
+  },
+})
+
 --  see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu
 vim.cmd([[
  highlight! link CmpItemMenu Comment
--- a/lua/config/nvim-tree.lua
+++ b/lua/config/nvim-tree.lua
@@ -4,29 +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,
-  ignore_buffer_on_setup = false,
-  open_on_setup = false,
-  open_on_setup_file = 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 = {
@@ -50,7 +40,6 @@ nvim_tree.setup {
    update_cwd = false,
    ignore_list = {},
  },
-  ignore_ft_on_setup = {},
  system_open = {
    cmd = "",
    args = {},
@@ -89,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" },
        },
      },
@@ -113,6 +102,7 @@ nvim_tree.setup {
  },
 }

-keymap.set("n", "<space>s", function()
-  return require("nvim-tree").toggle(false, true)
-end, { silent = true, desc = "toggle nvim-tree" })
+keymap.set("n", "<space>s", require("nvim-tree.api").tree.toggle, {
+  silent = true,
+  desc = "toggle nvim-tree",
+})
--- a/lua/config/nvim_hop.lua
+++ b/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
+})
--- a/lua/config/statusline.lua
+++ b/lua/config/statusline.lua
@@ -8,11 +8,17 @@ local function spell()
  return ""
 end

+--- show indicator for Chinese IME
 local function ime_state()
  if vim.g.is_mac then
    -- ref: https://github.com/vim-airline/vim-airline/blob/master/autoload/airline/extensions/xkblayout.vim#L11
    local layout = fn.libcall(vim.g.XkbSwitchLib, "Xkb_Switch_getXkbLayout", "")
-    if layout == "0" then
+
+    -- We can use `xkbswitch -g` on the command line to get current mode.
+    -- mode for macOS builtin pinyin IME: com.apple.inputmethod.SCIM.ITABC
+    -- mode for Rime: im.rime.inputmethod.Squirrel.Rime
+    local res = fn.match(layout, [[\v(Squirrel\.Rime|SCIM.ITABC)]])
+    if res ~= -1 then
      return "[CN]"
    end
  end
@@ -87,10 +93,31 @@ local diff = function()
  local add_num = git_status.added

  local info = { added = add_num, modified = modify_num, removed = remove_num }
-  -- vim.pretty_print(info)
+  -- vim.print(info)
  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
+
 require("lualine").setup {
  options = {
    icons_enabled = true,
@@ -110,6 +137,10 @@ require("lualine").setup {
        "diff",
        source = diff,
      },
+      {
+        virtual_env,
+        color = { fg = 'black', bg = "#F1CA81" }
+      }
    },
    lualine_c = {
      "filename",
@@ -121,6 +152,11 @@ require("lualine").setup {
        spell,
        color = { fg = "black", bg = "#a7c080" },
      },
+      {
+        "diagnostics",
+        sources = { "nvim_diagnostic" },
+        symbols = {error = '🆇 ', warn = '⚠️ ', info = 'ℹ️ ', hint = ' '},
+      },
    },
    lualine_x = {
      "encoding",
@@ -134,13 +170,10 @@ require("lualine").setup {
      },
      "filetype",
    },
-    lualine_y = { "progress" },
-    lualine_z = {
+    lualine_y = {
      "location",
-      {
-        "diagnostics",
-        sources = { "nvim_diagnostic" },
-      },
+    },
+    lualine_z = {
      {
        trailing_space,
        color = "WarningMsg",
--- a/lua/config/treesitter.lua
+++ b/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
--- a/lua/config/which-key.lua
+++ b/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
+  }
 }
--- a/lua/config/yanky.lua
+++ b/lua/config/yanky.lua
@@ -0,0 +1,13 @@
+require("yanky").setup({
+  ring = {
+    history_length = 50,
+    storage = "memory",
+  },
+  preserve_cursor_position = {
+    enabled = false,
+  },
+})
+
+-- cycle through the yank history, only work after paste
+vim.keymap.set("n", "[y", "<Plug>(YankyCycleForward)")
+vim.keymap.set("n", "]y", "<Plug>(YankyCycleBackward)")
--- a/lua/custom-autocmd.lua
+++ b/lua/custom-autocmd.lua
@@ -17,22 +17,30 @@ 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,
 })

-- 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")
+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,
 })

@@ -75,3 +83,23 @@ 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
+
+vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
--- a/core/globals.lua
+++ b/core/globals.lua
@@ -5,7 +5,7 @@ local utils = require('utils')

 -- Inspect something
 function _G.inspect(item)
-  vim.pretty_print(item)
+  vim.print(item)
 end

 ------------------------------------------------------------------------
@@ -43,9 +43,7 @@ vim.g.mapleader = ','
 vim.g.vimsyn_embed = 'l'

 -- Use English as main language
-if not vim.g.is_mac then
-  vim.cmd [[language en_US.utf-8]]
-end
+vim.cmd [[language en_US.UTF-8]]

 -- Disable loading certain plugins

--- a/core/mappings.lua
+++ b/core/mappings.lua
@@ -1,5 +1,6 @@
 local keymap = vim.keymap
 local api = vim.api
+local uv = vim.uv

 -- Save key strokes (now we do not need to press shift to enter command mode).
 keymap.set({ "n", "x" }, ";", ":")
@@ -85,16 +86,15 @@ keymap.set("n", "<leader>ev", "<cmd>tabnew $MYVIMRC <bar> tcd %:h<cr>", {
  desc = "open init.lua",
 })

-keymap.set("n", "<leader>sv", "", {
-  silent = true,
-  desc = "reload init.lua",
-  callback = function()
-    vim.cmd([[
+keymap.set("n", "<leader>sv", function()
+  vim.cmd([[
      update $MYVIMRC
      source $MYVIMRC
    ]])
-    vim.notify("Nvim config successfully reloaded!", vim.log.levels.INFO, { title = "nvim-config" })
-  end,
+  vim.notify("Nvim config successfully reloaded!", vim.log.levels.INFO, { title = "nvim-config" })
+end, {
+  silent = true,
+  desc = "reload init.lua",
 })

 -- Reselect the text that has just been pasted, see also https://stackoverflow.com/a/4317090/6064933.
@@ -170,28 +170,26 @@ 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", "", {
-  desc = "join line",
-  callback = function()
-    vim.cmd([[
+keymap.set("n", "J", function()
+  vim.cmd([[
      normal! mzJ`z
      delmarks z
    ]])
-  end,
+end, {
+  desc = "join lines without moving cursor",
 })

-keymap.set("n", "gJ", "mzgJ`z", {
-  desc = "join visual lines",
-  callback = function()
-    -- we must use `normal!`, otherwise it will trigger recursive mapping
-    vim.cmd([[
-      normal! zmgJ`z
+keymap.set("n", "gJ", function()
+  -- we must use `normal!`, otherwise it will trigger recursive mapping
+  vim.cmd([[
+      normal! mzgJ`z
      delmarks z
    ]])
-  end,
+end, {
+  desc = "join lines without moving cursor",
 })

 -- Break inserted text into smaller undo units when we insert some punctuation chars.
@@ -203,20 +201,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>")
@@ -226,3 +210,24 @@ keymap.set("c", "<C-A>", "<HOME>")

 -- Delete the character to the right of the cursor
 keymap.set("i", "<C-D>", "<DEL>")
+
+keymap.set("n", "<leader>cb", function()
+  local cnt = 0
+  local blink_times = 7
+  local timer = uv.new_timer()
+
+  timer:start(0, 100, vim.schedule_wrap(function()
+    vim.cmd [[
+      set cursorcolumn!
+      set cursorline!
+    ]]
+
+    if cnt == blink_times then
+      timer:close()
+    end
+
+    cnt = cnt + 1
+  end)
+  )
+end,
+  { desc = "show cursor" })
--- a/lua/plugin_specs.lua
+++ b/lua/plugin_specs.lua
@@ -0,0 +1,506 @@
+local utils = require("utils")
+
+local lazypath = vim.fn.stdpath("data") .. "/lazy/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
+  {
+    "hrsh7th/nvim-cmp",
+    -- event = 'InsertEnter',
+    event = "VeryLazy",
+    dependencies = {
+      "hrsh7th/cmp-nvim-lsp",
+      "onsails/lspkind-nvim",
+      "hrsh7th/cmp-path",
+      "hrsh7th/cmp-buffer",
+      "hrsh7th/cmp-omni",
+      "hrsh7th/cmp-emoji",
+      "quangnguyen30192/cmp-nvim-ultisnips",
+    },
+    config = function()
+      require("config.nvim-cmp")
+    end,
+  },
+
+  {
+    "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 indent (follows the PEP8 style)
+  { "Vimjas/vim-python-pep8-indent", ft = { "python" } },
+
+  -- Python-related text object
+  { "jeetsukumaran/vim-pythonsense", ft = { "python" } },
+
+  { "machakann/vim-swap", event = "VeryLazy" },
+
+  -- IDE for Lisp
+  -- '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()
+      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",
+    },
+  },
+  {
+    "lukas-reineke/headlines.nvim",
+    dependencies = "nvim-treesitter/nvim-treesitter",
+    config = true, -- or `opts = {}`
+  },
+  -- A list of colorscheme plugin you may want to try. Find what suits you.
+  { "navarasu/onedark.nvim", lazy = true },
+  { "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 },
+
+  { "nvim-tree/nvim-web-devicons", event = "VeryLazy" },
+
+  {
+    "nvim-lualine/lualine.nvim",
+    event = "VeryLazy",
+    cond = firenvim_not_active,
+    config = function()
+      require("config.statusline")
+    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,
+  },
+
+  -- 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.
+  {
+    "tyru/open-browser.vim",
+    enabled = function()
+      if vim.g.is_win or vim.g.is_mac then
+        return true
+      else
+        return false
+      end
+    end,
+    event = "VeryLazy",
+  },
+
+  -- 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",
+    cmd = { "YankyRingHistory" },
+    config = function()
+      require("config.yanky")
+    end,
+  },
+
+  -- 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" },
+  },
+
+  {
+    "folke/zen-mode.nvim",
+    cmd = "ZenMode",
+    config = function()
+      require("config.zen-mode")
+    end,
+  },
+
+  {
+    "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", "Message", "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()
+      if vim.g.is_win or vim.g.is_mac then
+        return true
+      end
+      return false
+    end,
+    build = function()
+      vim.fn["firenvim#install"](0)
+    end,
+    lazy = true,
+  },
+
+  -- 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",
+    keys = { "<space>s" },
+    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,
+  },
+}
+
+-- configuration for lazy itself.
+local lazy_opts = {
+  ui = {
+    border = "rounded",
+    title = "Plugin Manager",
+    title_pos = "center",
+  },
+}
+
+require("lazy").setup(plugin_specs, lazy_opts)
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1,390 +0,0 @@
-local utils = require("utils")
-local fn = vim.fn
-
-- 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"
-
-- Where to install packer.nvim -- the package manager (we make it opt)
-local packer_dir = vim.g.plugin_home .. "/opt/packer.nvim"
-
-- Whether this is a fresh install, i.e., packer itself and plugins have not been installed.
-local fresh_install = false
-
-- Auto-install packer in case it hasn't been installed.
-if fn.glob(packer_dir) == "" then
-  fresh_install = true
-
-  -- Now we need to install packer.nvim first.
-  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.api.nvim_echo({ { "Installing packer.nvim", "Type" } }, true, {})
-  vim.cmd(install_cmd)
-end
-
-- 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')]],
-    }
-
-    -- Stay after pressing * and search selected text
-    use { "haya14busa/vim-asterisk", event = "VimEnter" }
-
-    -- 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 { "lifepillar/vim-gruvbox8", opt = true }
-    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 { "NTBBloodbath/doom-one.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 { "kyazdani42/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" } }
-
-    -- Manage your yank history
-    if vim.g.is_win or vim.g.is_mac then
-      use { "svermeulen/vim-yoink", event = "VimEnter" }
-    end
-
-    -- 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 JSON header highlight plugin
-    use { "elzr/vim-json", ft = { "json", "markdown" } }
-
-    -- 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 vim.g.is_win or vim.g.is_mac and 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" }
-
-    -- Smoothie motions
-    use {
-      "karb94/neoscroll.nvim",
-      event = "VimEnter",
-      config = function()
-        vim.defer_fn(function()
-          require("config.neoscroll")
-        end, 2000)
-      end,
-    }
-
-    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 {
-      "kyazdani42/nvim-tree.lua",
-      requires = { "kyazdani42/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
--- a/lua/utils.lua
+++ b/lua/utils.lua
@@ -31,13 +31,6 @@ function M.may_create_dir(dir)
  end
 end

-function M.get_nvim_version()
-  local actual_ver = vim.version()
-
-  local nvim_ver_str = string.format("%d.%d.%d", actual_ver.major, actual_ver.minor, actual_ver.patch)
-  return nvim_ver_str
-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
--- a/plugin/abbrev.vim
+++ b/plugin/abbrev.vim
@@ -0,0 +1,3 @@
+" some abbreviations
+iabbrev reqire require
+iabbrev serveral several
--- a/plugin/command.vim
+++ b/plugin/command.vim
@@ -45,3 +45,6 @@ function! s:md_to_pdf() abort
    echoerr "Error running command"
  endif
 endfunction
+
+" json format
+command! -range JSONFormat <line1>,<line2>!python -m json.tool
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -194,7 +194,6 @@ wiki
 backticks
 Reddit
 LeaderF
-gruvbox8
 tabpage
 ccls
 cmake
@@ -203,6 +202,8 @@ llvm
 subsampling
 refactor
 colorschemes
+gruvbox8
+gruvbox
 Gruvbox
 monokai
 NeoSolarized
@@ -440,3 +441,29 @@ Postgres
 plpgsql
 postgres
 PySpark
+winbar
+cmdline
+shada
+async
+localhost
+JetBrains
+localhost
+MariaDB
+SQLite
+Pgadmin
+Datagrip
+mysql
+cwd
+pyright
+stubgen
+pylance
+variadic
+Vimium
+Databricks
+Jira
+databricks
+FastAPI
+pylintrc
+PYTHONPATH
+Uvicorn
+qpdf
--- a/viml_conf/autocommands.vim
+++ b/viml_conf/autocommands.vim
--- a/viml_conf/options.vim
+++ b/viml_conf/options.vim
@@ -1,11 +1,7 @@
 scriptencoding utf-8

 " change fillchars for folding, vertical split, end of buffer, and message separator
-set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾
-
-" Paste mode toggle, it seems that Nvim's bracketed paste mode
-" does not work very well for nvim-qt, so we use good-old paste mode
-set pastetoggle=<F12>
+set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾,diff:╱

 " Split window below/right when creating horizontal/vertical windows
 set splitbelow splitright
@@ -44,9 +40,9 @@ set backup  " create backup for files
 set backupcopy=yes  " copy the original file to backupdir and overwrite it

 " General tab settings
-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 tabstop=2       " number of visual spaces per TAB
+set softtabstop=2   " number of spaces in tab when editing
+set shiftwidth=2    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces

 " Set matching pairs of characters and highlight matching brackets
@@ -75,6 +71,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:0

 " Disable showing current mode on command line since statusline plugins can show it.
 set noshowmode
@@ -144,7 +141,7 @@ set formatoptions+=mM
 " Tilde (~) is an operator, thus must be followed by motions like `e` or `w`.
 set tildeop

-set synmaxcol=200  " Text after this column number is not highlighted
+set synmaxcol=250  " Text after this column number is not highlighted
 set nostartofline

 " External program to use for grep command
@@ -175,6 +172,7 @@ set diffopt+=filler  " show filler for deleted lines
 set diffopt+=closeoff  " turn off diff when one file window is closed
 set diffopt+=context:3  " context for diff
 set diffopt+=internal,indent-heuristic,algorithm:histogram
+set diffopt+=linematch:60

 set nowrap  " do no wrap
 set noruler
--- a/viml_conf/plugins.vim
+++ b/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',
@@ -109,6 +109,20 @@ let g:Lf_PopupColorscheme = 'gruvbox_material'
 " items.
 let g:Lf_CommandMap = {'<C-J>': ['<C-N>'], '<C-K>': ['<C-P>']}

+" do not preview results, it will add the file to buffer list
+let g:Lf_PreviewResult = {
+      \ 'File': 0,
+      \ 'Buffer': 0,
+      \ 'Mru': 0,
+      \ 'Tag': 0,
+      \ 'BufTag': 1,
+      \ 'Function': 1,
+      \ 'Line': 0,
+      \ 'Colorscheme': 0,
+      \ 'Rg': 0,
+      \ 'Gtags': 0
+      \}
+
 """"""""""""""""""""""""""""open-browser.vim settings"""""""""""""""""""
 if g:is_win || g:is_mac
  " Disable netrw's gx mapping.
@@ -137,31 +151,6 @@ let g:mundo_width = 80

 nnoremap <silent> <Space>u :MundoToggle<CR>

-""""""""""""""""""""""""""""vim-yoink settings"""""""""""""""""""""""""
-if g:is_win || g:is_mac
-  " ctrl-n and ctrl-p will not work if you add the TextChanged event to vim-auto-save events.
-  " nmap <c-n> <plug>(YoinkPostPasteSwapBack)
-  " nmap <c-p> <plug>(YoinkPostPasteSwapForward)
-
-  " The following p/P mappings are also needed for ctrl-n and ctrl-p to work
-  " nmap p <plug>(YoinkPaste_p)
-  " nmap P <plug>(YoinkPaste_P)
-
-  " Cycle the yank stack with the following mappings
-  nmap [y <plug>(YoinkRotateBack)
-  nmap ]y <plug>(YoinkRotateForward)
-
-  " Do not change the cursor position
-  nmap y <plug>(YoinkYankPreserveCursorPosition)
-  xmap y <plug>(YoinkYankPreserveCursorPosition)
-
-  " Move cursor to end of paste after multiline paste
-  let g:yoinkMoveCursorToEndOfPaste = 0
-
-  " Record yanks in system clipboard
-  let g:yoinkSyncSystemClipboardOnFocus = 1
-endif
-
 """"""""""""""""""""""""""""better-escape.vim settings"""""""""""""""""""""""""
 let g:better_escape_interval = 200

@@ -243,7 +232,7 @@ nmap s <Nop>
 omap s <Nop>

 """"""""""""""""""""""""""""vimtex settings"""""""""""""""""""""""""""""
-if ( g:is_win || g:is_mac ) && executable('latex')
+if executable('latex')
  " Hacks for inverse search to work semi-automatically,
  " see https://jdhao.github.io/2021/02/20/inverse_search_setup_neovim_vimtex/.
  function! s:write_server_name() abort
@@ -412,7 +401,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
Author	SHA1	Message	Date
jdhao	cb8c9208e1	update which-key conf and some mappings	2024-07-25 04:00:17 +08:00
jdhao	ce1e13e2c9	use plugin nvim-autopairs for autopair delimitMate is not updated for a long time.	2024-07-14 05:17:49 +08:00
jdhao	2af616bb0d	Update hop.nvim conf to support Chinese	2024-06-26 03:33:24 +08:00
jdhao	3694d3c237	Update config for GitSigns	2024-06-26 03:25:01 +08:00
jdhao	69d8543495	remove emmylua since neovim has builtin annotation Seee also this https://github.com/neovim/neovim/pull/24493	2024-05-20 22:09:07 +02:00
jdhao	be3d134c37	use vim.uv instead of vim.loop	2024-05-20 21:52:52 +02:00
jdhao	601396f700	upgrade neovim to latest stable The way to compare versions are changed due to a bug in comparing versions in the neovim core: https://github.com/neovim/neovim/issues/28782	2024-05-20 21:33:38 +02:00
jdhao	e462ebcbcc	Enable treesitter folding for Python and Lua	2024-05-08 03:46:45 +08:00
jdhao	2f8482639d	update some mappings 1. fix a typo in gJ mapping when setting the mark, the correct syntax is `mz` (set mark `z`), not `zm` 2. fix bug with `iB` text object: previously `viB` does not work as expected, because it does not select the entire buffer as expected. After much investigation, I found it is because the `<cmd>` mapping argument. If we use `<cmd>` argument for mapping, the mode does not change. So if we use `viB`, inititally we are still in visual mode. Later in the implementation, when we use `` normal! `<V`> `` to select the entire buffer, it interferes with original visual mode. As a result, the entire buffer is not selected. In the text obj implementation, we can use `exe "normal! \<Esc>"` to clear the visual mode and make `viB`, but this is not ideal. I think it is eaiser to just not use the `<cmd>` argument and use `:<C-U>` instead.	2024-02-28 06:36:05 +08:00
jdhao	050eacaee2	Stop showing percent location The percent location is useless and just noise.	2024-02-23 06:11:21 +08:00
jdhao	01bc4b40d3	update used plugins	2024-02-02 03:52:26 +08:00
jdhao	c06d46e84d	remove lazylock I don't use this feature at all.	2024-02-02 03:43:55 +08:00
jdhao	7cf70f31af	Update colorscheme conf 1. remove some colorscheme that doesn't work well with Markdown 2. change how the colorscheme conf is organized.	2024-02-02 03:40:11 +08:00
jdhao	8416508686	Enable nvim-tree to open dir during startup Now when you open a directory when starting nvim, nvim-tree will be opened to handle the directory correctly, see also issue #257.	2024-01-07 15:24:47 +01:00
jdhao	df9491b05b	bump neovim version to 0.9.5	2024-01-07 14:45:29 +01:00
jdhao	17d2e3ab3e	Deal with other variant of unix timestamp	2023-10-21 00:53:15 +02:00
jdhao	2c9948300d	Add diffview.nvim for viewing diffs	2023-10-18 22:10:11 +02:00
jdhao	dfaa3d97a5	update plugin spec	2023-10-12 23:26:43 +02:00
jdhao	8d74fcb75c	Remove obsolete options for nvim-tree	2023-10-11 20:43:24 +02:00
jdhao	b1f0ef63ef	Rename vimscript conf directory	2023-10-11 20:41:25 +02:00
jdhao	54ca6d4191	update to nvim 0.9.4	2023-10-11 20:35:50 +02:00
jdhao	97af59e670	remove obsolete option for indent-blankline	2023-10-03 15:14:34 +02:00
jdhao	4d8ef868ad	upgrade indent-blankline to v3	2023-09-28 23:41:42 +02:00
jdhao	3137850db6	Show Py virtual env on statusline	2023-09-28 09:42:27 +02:00
jdhao	eccdc62f38	remove colorschemes rose-pine	2023-09-22 19:38:28 +02:00
jdhao	ad483a7dc0	Use the matained fork of hop.nvim	2023-09-16 14:47:43 +02:00
jdhao	6df27d1c22	upgrade to neovim 0.9.2	2023-09-16 14:26:38 +02:00
jdhao	7f6627cfa1	update plugin conf for Lazy.nvim	2023-09-10 22:16:16 +02:00
jdhao	7ff11a9760	update plugin lazy loading events	2023-09-05 00:22:02 +02:00
jdhao	cc4688d089	Loosen the version check condition Other version of nvim can still run this config, but should use with care.	2023-09-01 21:39:08 +02:00
jdhao	8a1b3193a4	fix bufferline loading issue	2023-09-01 21:27:13 +02:00
jdhao	e92362041c	fix hlslens issue when no pattern is found The captured error message is not correct before.	2023-09-01 21:22:22 +02:00
jdhao	63ff776758	fix loading order of nvim-cmp and nvim-lsp	2023-09-01 20:52:46 +02:00
jdhao	41c8c81f21	update spell	2023-09-01 01:08:41 +02:00
jdhao	997c6286df	Optimize plugin loading speed	2023-09-01 01:07:16 +02:00
jdhao	359621b126	fix multi visual line delete issue For TextYankPost event, it includes both yank and delete, we should only restore cursor position for yank, not for delete. Otherwise, it messes up with text deletion when you visually select multiple lines and delete them. See also issue reported here: https://github.com/jdhao/nvim-config/pull/222#issuecomment-1698634645	2023-09-01 00:26:08 +02:00
jdhao	4dc2d9575b	disable horizontal scroll by mouse	2023-08-29 23:44:07 +02:00
jdhao	fc1c447319	fix multi-line yank issue, close #220 The previous way of keep the cursor while yanking is not perfect. It will break multi-line yank (`{count}yy`).	2023-08-28 21:11:32 +02:00
jdhao	1391ca7ff1	feat: switch from packer.nvim to lazy.nvim	2023-08-27 23:14:31 +02:00
jdhao	6a6f8ff597	Update condition for installing vim-xkbswitch	2023-08-23 00:48:21 +02:00
jdhao	946e65662b	fix nvimtree conf, close #215	2023-08-14 23:55:17 +02:00
jdhao	4a6379ca5d	update git-linker conf 1. Add configuration for azure devops 2. change the mappings slightly	2023-08-09 19:52:58 +02:00
jdhao	855a88b532	fix: user lua conf reloading fails The cache should be invalidated. This fix does not work 100%, because, e.g., there are other configs hiding deeper under lua/config/ directory. A restart is the best way to reload the config.	2023-07-29 14:34:42 +02:00
jdhao	892cd49f06	doc: update doc and install guide for pylsp	2023-07-29 13:09:37 +02:00
jdhao	e53ee104ec	feat: move lua conf under lua directory	2023-07-28 22:28:36 +02:00
jdhao	671c78df9b	feat: more ignore files for LeaderF (#209 )	2023-07-29 04:09:50 +08:00
jdhao	1608a36dd3	fix: conf is not local	2023-07-25 23:00:25 +02:00
jdhao	450f058da5	feat: support venv in Mypy Specify the correct python executable path for mypy to work well.	2023-07-25 22:59:06 +02:00
jdhao	e2f348cb37	fix: missing nerdfonts Since wezterm upgrade its support for Nerd Fonts 3.0, we should update the codepoints used for some of the Unicode Icons. Their code points are changed due to breaking changes in Nerd Fonts.	2023-07-25 22:53:20 +02:00
jdhao	fc8175d32d	feat: update diagnostic mappings Use separate key mappings to show diagnostics for the current buffer and all opened files.	2023-07-22 15:01:41 +02:00
jdhao	4034b6b673	feat: update pylsp conf 1. support using black as formatter 2. replace obsolete pyls-isort with maintained ones	2023-07-22 14:51:27 +02:00
jdhao	67a4b6e6d0	feat: add treesitter toml	2023-07-22 14:46:10 +02:00
jdhao	bb27d93433	fix: move location indication to the right of statusline	2023-07-20 23:00:06 +02:00
jdhao	9d9c3ef32f	feat: update diagnostic position in statusline Do not show it in far right, move it to the left side for easier visibility.	2023-07-20 22:52:55 +02:00
jdhao	00e8c77b23	Fix LeaderF bug It will add files to buffer list even if we have not confirmed the selection. This behavior is really annoying. See also `27bd938a42`.	2023-06-27 20:39:26 +02:00
jdhao	7bb3ccc275	use legacy version of fidget for now	2023-06-17 00:08:02 +02:00
jdhao	ee38046ebc	Add folding support for JSON files	2023-06-13 22:25:25 +02:00
jdhao	6c873a32da	update to nvim 0.9.1	2023-06-03 21:37:14 +02:00
jdhao	9ca65fd942	update conf for nvim-dashboard	2023-05-22 20:50:15 +02:00
jdhao	cc3a7d6ebd	remove impatient.nvim It is not needed since nvim 0.9.0	2023-05-07 20:10:52 +02:00
jdhao	f3a359a2fa	conf for nvim 0.9.0	2023-04-20 22:36:48 +02:00
jdhao	9a4d71db88	update nvim-tree conf	2023-04-17 22:05:36 +02:00
jdhao	dc597004df	Merge pull request #187 from mr-cal/nvim-tree-update nvim-tree: fix shortcut and repo	2023-04-17 21:59:43 +02:00
jdhao	644993a89e	bump to nvim version 0.9.0 (#188 )	2023-04-08 04:42:24 +08:00
Callahan Kovacs	164d6129f8	nvim-tree: update other references Signed-off-by: Callahan Kovacs <callahankovacs@gmail.com>	2023-04-05 08:37:16 -05:00
Callahan Kovacs	cde21f6f67	nvim-tree: use api and new repository url Signed-off-by: Callahan Kovacs <callahankovacs@gmail.com>	2023-03-30 08:41:15 -05:00
jdhao	8746c7eb11	fix: omit the clangd missing message, close #180 (#186 ) It is not necessary to install clangd if the user does not use neovim with CPP/C.	2023-03-13 19:55:00 +08:00
jdhao	7c44997289	refactor: lua language server rename (#185 ) The lua language server from sumneko had changed its repo and created a new organizational repo. See also https://github.com/neovim/nvim-lspconfig/pull/2439.	2023-02-16 17:39:23 +08:00
jdhao	bfdb3f5a26	bump supported nvim version (#184 )	2023-02-11 11:42:57 +08:00
jdhao	76ced0e265	update contact info	2023-01-18 13:27:55 +08:00
jdhao	e84d18a204	update license year (#175 )	2023-01-04 01:01:59 +08:00
jdhao	6429e8364c	update nvim to version 0.8.2 (#173 )	2022-12-31 10:13:39 +08:00
jdhao	f2c6900a8d	update setting for onedarkpro (#172 )	2022-12-28 22:29:49 +08:00
jdhao	116aaa0675	update spell	2022-12-14 12:55:41 +08:00
jdhao	12f3ca9d1f	more abbr (#169 )	2022-12-14 12:54:54 +08:00
jdhao	7e7944a30c	use yanky.nvim to replace vim-yoink (#168 )	2022-12-14 12:52:40 +08:00
bldur	53c17aea96	Add ltex-ls support to lsp. (#166 ) * Add ltex-ls support to lsp. Co-authored-by: bldur (https://github.com/bldur)	2022-11-28 17:35:43 +08:00
jdhao	43c1615822	fix: cmp-omni messes with the lsp completion If we use cmp-omni and lsp together, it seems that it will mess the autocompletion. So we only use it with tex file, where lsp in not used.	2022-11-22 21:19:53 +08:00
jdhao	509a8bce8c	upgrade to latest stable 0.8.1	2022-11-22 21:16:17 +08:00
jdhao	8b10be60d4	update colorscheme list - remove other gruvbox variant - remove doom-one casue it has bugs - add more colorschemes	2022-11-16 02:26:28 +08:00
jdhao	074d2bbdfd	make filetype mapping local Otherwise, the mapping will be global and leak to unrelated to files.	2022-11-15 01:10:26 +08:00
jdhao	7f9af87185	Merge branch 'master' of https://github.com/jdhao/nvim-config	2022-11-15 01:07:29 +08:00
jdhao	bb0b0c5e25	chore: relax vimtex install condition	2022-11-15 01:06:59 +08:00
jdhao	7bb12e4b70	chore: relax vimtex install condition	2022-11-15 01:04:31 +08:00
jdhao	41da56b823	Add my own abbreivations for some spell mistakes	2022-11-13 19:53:14 +08:00
jdhao	82f2332281	chore: update gitsigns highlight	2022-11-10 00:43:15 +08:00
jdhao	075326ee2e	fix: make xkbswitch work on mac M1 CPU For the details, see https://jdhao.github.io/2021/02/25/nvim_ime_mode_auto_switch/.	2022-11-07 00:47:04 +08:00
jdhao	baa8f26bc2	update spell	2022-11-01 22:27:35 +08:00
jdhao	e9760ae9b8	remove smooth scroll I do not really need it.	2022-11-01 22:19:03 +08:00
jdhao	0d50eb723f	chore: add notification for packer compile Also move the autocmd location.	2022-11-01 22:02:45 +08:00
jdhao	b893bdc099	fix incorrect comment string for gitconf	2022-10-27 21:59:05 +08:00
jdhao	2073f72e67	refactor: use local diagnostic module	2022-10-23 15:18:03 +08:00
jdhao	364be4b5dc	fix links	2022-10-20 13:23:38 +08:00
jdhao	d30d402128	update option	2022-10-19 20:52:51 +08:00
jdhao	fc144e0895	update badge	2022-10-19 12:13:13 +08:00
jdhao	18abfa7754	feat: add a mapping to blink cursor	2022-10-17 00:07:34 +08:00
jdhao	6c1dbdf8fc	update spell	2022-10-16 10:26:41 +08:00
jdhao	202a9a088d	remove vim-json rarely used and it changes the conceal settings	2022-10-16 10:24:53 +08:00
jdhao	d939cc75c6	refactor: make packer installation a function	2022-10-16 10:23:40 +08:00
jdhao	26921309ec	replace more viml with native lua code	2022-10-15 19:00:34 +08:00
jdhao	a6f716558b	update nvim-cmp lsp conf	2022-10-15 18:30:14 +08:00
jdhao	3539207913	use 2 spaces for tabs by default This removes a lot of code duplication. If we want to use 4 spaces, we can set it separately in their ftplugin settings.	2022-10-15 11:28:15 +08:00
jdhao	d8b92965e8	change tab size for sql	2022-10-11 00:51:00 +08:00
jdhao	ebf7170916	use UTF-8 instead of utf-8, closes #134	2022-10-09 13:23:01 +08:00
jdhao	696466469b	update spell	2022-10-05 23:01:23 +08:00
jdhao	7a5be43600	use lua func in rhs instead of callback	2022-10-05 22:42:02 +08:00
jdhao	3b39067097	update mousescroll	2022-10-05 22:39:13 +08:00
jdhao	e6b3be0777	remove language workaround for macOS The issue has been fixed in https://github.com/neovim/neovim/pull/19139.	2022-10-05 22:33:13 +08:00
jdhao	acb423984a	remove vim-asterisk The * can now search selected text by default. The cursor stay feature can also be simulated.	2022-10-05 12:42:45 +08:00