update git-linker conf

1. Add configuration for azure devops 2. change the mappings slightly
fix: user lua conf reloading fails
2025-06-08 14:14:33 +02:00 · 2023-08-09 19:52:58 +02:00 · 2023-07-29 14:34:42 +02:00 · 2023-07-29 13:09:37 +02:00 · 2023-07-28 22:28:36 +02:00 · 2023-07-29 04:09:50 +08:00
38 changed files with 436 additions and 301 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.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
    </a>
    <a href="https://github.com/jdhao/nvim-config/search?l=vim-script">
      <img src="https://img.shields.io/github/languages/top/jdhao/nvim-config" alt="Top languages"/>
    </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.1">
+      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.9.1?style=flat-square" />
+    </a>
+    <a href="https://github.com/jdhao/nvim-config/graphs/contributors">
+      <img src="https://img.shields.io/github/contributors/jdhao/nvim-config?style=flat-square" />
+    </a>
+    <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>
@@ -66,7 +69,7 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + 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
--- 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,7 @@
 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 <silent> <F9> :luafile %<CR>
+nnoremap <buffer><silent> <F9> :luafile %<CR>

 " For delimitMate
 let b:delimitMate_matchpairs = "(:),[:],{:}"
--- a/after/ftplugin/python.vim
+++ b/after/ftplugin/python.vim
@@ -8,5 +8,10 @@ set sidescroll=5
 set sidescrolloff=2
 set colorcolumn=100

+set tabstop=4       " number of visual spaces per TAB
+set softtabstop=4   " number of spaces in tab when editing
+set shiftwidth=4    " number of spaces to use for autoindent
+set expandtab       " expand tab to spaces so that tabs are spaces
+
 " For delimitMate
 let b:delimitMate_matchpairs = "(:),[:],{:}"
--- 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/core/options.vim
+++ b/core/options.vim
@@ -3,10 +3,6 @@ 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>
-
 " 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:6

 " 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/core/plugins.vim
+++ b/core/plugins.vim
@@ -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
--- 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.
--- 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."
--- 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,19 +4,24 @@
 -- 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.9.1"
+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)
+if version.cmp(ev, actual_ver) ~= 0 then
+  local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
+  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, _ver)
  api.nvim_err_writeln(msg)
  return
 end
@@ -31,8 +36,14 @@ local core_conf_files = {
 }

 -- 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/core/%s", vim.fn.stdpath("config"), 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/core/colorschemes.lua
+++ b/core/colorschemes.lua
@@ -7,17 +7,19 @@ 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",
+  rose_pine = "rose-pine",
+  onedarkpro = "onedarkpro.nvim",
+  monokai = "monokai.nvim",
+  material = "material.nvim",
 }

 M.gruvbox8 = function()
@@ -50,6 +52,10 @@ M.sonokai = function()
 end

 M.gruvbox_material = function()
+  -- foreground option can be material, mix, or original
+  vim.g.gruvbox_material_foreground = "material"
+  --background option can be hard, medium, soft
+  vim.g.gruvbox_material_background = "soft"
  vim.g.gruvbox_material_enable_italic = 1
  vim.g.gruvbox_material_better_performance = 1

@@ -88,6 +94,30 @@ M.catppuccin = function()
  vim.cmd([[colorscheme catppuccin]])
 end

+M.rose_pine = function()
+  require('rose-pine').setup({
+    --- @usage 'main' | 'moon'
+    dark_variant = 'moon',
+  })
+
+  -- set colorscheme after options
+  vim.cmd('colorscheme rose-pine')
+end
+
+M.onedarkpro = function()
+  -- set colorscheme after options
+  vim.cmd('colorscheme onedark_vivid')
+end
+
+M.monokai = function()
+  vim.cmd('colorscheme monokai_pro')
+end
+
+M.material = function ()
+  vim.g.material_style = "oceanic"
+  vim.cmd('colorscheme material')
+end
+
 --- Use a random colorscheme from the pre-defined list of colorschemes.
 M.rand_colorscheme = function()
  local colorscheme = utils.rand_element(vim.tbl_keys(M.colorscheme2dir))
--- 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
@@ -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
@@ -34,5 +34,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/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,8 +231,8 @@ 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",
            fn.stdpath("config"),
@@ -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
@@ -7,9 +7,6 @@ nvim_tree.setup {
  hijack_cursor = false,
  hijack_netrw = true,
  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,
@@ -50,7 +47,6 @@ nvim_tree.setup {
    update_cwd = false,
    ignore_list = {},
  },
-  ignore_ft_on_setup = {},
  system_open = {
    cmd = "",
    args = {},
@@ -113,6 +109,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/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,7 +93,7 @@ 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

@@ -121,6 +127,11 @@ require("lualine").setup {
        spell,
        color = { fg = "black", bg = "#a7c080" },
      },
+      {
+        "diagnostics",
+        sources = { "nvim_diagnostic" },
+        symbols = {error = '🆇 ', warn = '⚠️ ', info = 'ℹ️ ', hint = ' '},
+      },
    },
    lualine_x = {
      "encoding",
@@ -134,13 +145,11 @@ require("lualine").setup {
      },
      "filetype",
    },
-    lualine_y = { "progress" },
-    lualine_z = {
+    lualine_y = {
      "location",
-      {
-        "diagnostics",
-        sources = { "nvim_diagnostic" },
-      },
+      "progress",
+    },
+    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/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
@@ -25,17 +25,6 @@ api.nvim_create_autocmd({ "TextYankPost" }, {
  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")
-  end,
-})
-
 -- Auto-create dir when saving a file, in case some intermediate directory does not exist
 api.nvim_create_autocmd({ "BufWritePre" }, {
  pattern = "*",
--- 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.loop

 -- 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.
@@ -173,25 +173,23 @@ keymap.set({ "x", "o" }, "iu", "<cmd>call text_obj#URL()<cr>", { desc = "URL tex
 keymap.set({ "x", "o" }, "iB", "<cmd>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 line",
 })

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

 -- Break inserted text into smaller undo units when we insert some punctuation chars.
@@ -226,3 +224,22 @@ 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)
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1,27 +1,35 @@
-local utils = require("utils")
+local api = vim.api
 local fn = vim.fn

+local utils = require("utils")
+
 -- The root dir to install all plugins. Plugins are under opt/ or start/ sub-directory.
 vim.g.plugin_home = fn.stdpath("data") .. "/site/pack/packer"

-- Where to install packer.nvim -- the package manager (we make it opt)
-local packer_dir = vim.g.plugin_home .. "/opt/packer.nvim"
+--- Install packer if it has not been installed.
+--- Return:
+--- true: if this is a fresh install of packer
+--- false: if packer has been installed
+local function packer_ensure_install()
+  -- Where to install packer.nvim -- the package manager (we make it opt)
+  local packer_dir = vim.g.plugin_home .. "/opt/packer.nvim"

-- Whether this is a fresh install, i.e., packer itself and plugins have not been installed.
-local fresh_install = false
+  if fn.glob(packer_dir) ~= "" then
+    return false
+  end

-- Auto-install packer in case it hasn't been installed.
-if fn.glob(packer_dir) == "" then
-  fresh_install = true
+  -- Auto-install packer in case it hasn't been installed.
+  vim.api.nvim_echo({ { "Installing packer.nvim", "Type" } }, 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)
+
+  return true
 end

+local fresh_install = packer_ensure_install()
+
 -- Load packer.nvim
 vim.cmd("packadd packer.nvim")

@@ -35,9 +43,6 @@ 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" }
@@ -99,9 +104,6 @@ packer.startup {
      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" }
@@ -118,19 +120,21 @@ packer.startup {
    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({ "rose-pine/neovim", as = 'rose-pine', opt = true })
+    use { "olimorris/onedarkpro.nvim", opt = true }
+    use { "tanvirtin/monokai.nvim", opt = true }
+    use { "marko-cerovac/material.nvim", opt = true }

-    use { "kyazdani42/nvim-web-devicons", event = "VimEnter" }
+    use { "nvim-tree/nvim-web-devicons", event = "VimEnter" }

    use {
      "nvim-lualine/lualine.nvim",
@@ -144,7 +148,7 @@ packer.startup {
      config = [[require('config.bufferline')]] }

    -- fancy start screen
-    use { "glepnir/dashboard-nvim", event = "VimEnter",
+    use { "nvimdev/dashboard-nvim", event = "VimEnter",
      cond = firenvim_not_active,
      config = [[require('config.dashboard-nvim')]]
    }
@@ -201,10 +205,14 @@ packer.startup {
    -- Show undo history visually
    use { "simnalamburt/vim-mundo", cmd = { "MundoToggle", "MundoShow" } }

+    -- better UI for some nvim actions
+    use {'stevearc/dressing.nvim'}
+
    -- Manage your yank history
-    if vim.g.is_win or vim.g.is_mac then
-      use { "svermeulen/vim-yoink", event = "VimEnter" }
-    end
+    use({
+      "gbprod/yanky.nvim",
+      config = [[require('config.yanky')]]
+    })

    -- Handy unix command inside Vim (Rename, Move etc.)
    use { "tpope/vim-eunuch", cmd = { "Rename", "Delete" } }
@@ -255,9 +263,6 @@ packer.startup {
    -- 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 {
@@ -286,7 +291,7 @@ packer.startup {
    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
+    if utils.executable("latex") then
      use { "lervag/vimtex", ft = { "tex" } }
    end

@@ -300,17 +305,6 @@ packer.startup {
    -- 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
@@ -361,14 +355,14 @@ packer.startup {

    -- file explorer
    use {
-      "kyazdani42/nvim-tree.lua",
-      requires = { "kyazdani42/nvim-web-devicons" },
+      "nvim-tree/nvim-tree.lua",
+      requires = { "nvim-tree/nvim-web-devicons" },
      config = [[require('config.nvim-tree')]],
    }

    use { "ii14/emmylua-nvim", ft = "lua" }

-    use { "j-hui/fidget.nvim", after = "nvim-lspconfig", config = [[require('config.fidget-nvim')]] }
+    use { "j-hui/fidget.nvim", after = "nvim-lspconfig", tag = "legacy", config = [[require('config.fidget-nvim')]] }
  end,
  config = {
    max_jobs = 16,
@@ -388,3 +382,15 @@ else
    vim.notify(msg, vim.log.levels.ERROR, { title = "nvim-config" })
  end
 end
+
+-- Auto-generate packer_compiled.lua file
+api.nvim_create_autocmd({ "BufWritePost" }, {
+  pattern = "*/nvim/lua/plugins.lua",
+  group = api.nvim_create_augroup("packer_auto_compile", { clear = true }),
+  callback = function(ctx)
+    local cmd = "source " .. ctx.file
+    vim.cmd(cmd)
+    vim.cmd("PackerCompile")
+    vim.notify("PackerCompile done!", vim.log.levels.INFO, { title = "Nvim-config" })
+  end,
+})
--- 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,20 @@ Postgres
 plpgsql
 postgres
 PySpark
+winbar
+cmdline
+shada
+async
+localhost
+JetBrains
+localhost
+MariaDB
+SQLite
+Pgadmin
+Datagrip
+mysql
+cwd
+pyright
+stubgen
+pylance
+variadic
Author	SHA1	Message	Date
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