bump neovim version to 0.9.5

Other version of nvim can still run this config, but should use with
care.

.stylua.toml

@@ -3,4 +3,4 @@ line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
 quote_style = "AutoPreferDouble"
-no_call_parentheses = true
+call_parentheses= "NoSingleTable"

LICENSE

@@ -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

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,11 +57,11 @@ 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/jdhao/better-escape.vim).
++ 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).
@@ -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).
@@ -74,11 +77,10 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + Asynchronous code execution via [asyncrun.vim](https://github.com/skywind3000/asyncrun.vim).
 + Code highlighting via [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter).
 + Code editing using true nvim inside browser via [firenvim](https://github.com/glacambre/firenvim).
-+ Color theme via [vim-gruvbox8](https://github.com/lifepillar/vim-gruvbox8) and other beautiful themes.
-+ Markdown writing and previewing via [vim-markdown](https://github.com/plasticboy/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>.
++ 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)
 + 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)
@@ -167,6 +169,8 @@ Some of the shortcuts I use frequently are listed here. In the following shortcu
 | `<leader>gc`      | Normal        | Linux/macOS/Win | Run git commit                                                           |
 | `<leader>gpl`     | Normal        | Linux/macOS/Win | Run git pull                                                             |
 | `<leader>gpu`     | Normal        | Linux/macOS/Win | Run git push                                                             |
+| `<leader>gl`      | Normal/Visual | Linux/macOS/Win | Get perm link for current/visually-select lines
+| `<leader>gb`      | Normal        | macOS           | Browse current git repo in browser
 | `<F9>`            | Normal        | Linux/macOS/Win | Compile&run current source file (for C++, LaTeX, Lua, Python)            |
 | `<F11>`           | Normal        | Linux/macOS/Win | Toggle spell checking                                                    |
 | `<F12>`           | Normal        | Linux/macOS/Win | Toggle paste mode                                                        |
@@ -212,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)

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

after/ftplugin/gitconfig.vim

@@ -0,0 +1 @@
+set commentstring=#\ %s

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

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()

after/ftplugin/lua.vim

@@ -2,9 +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 <buffer><silent> <F9> :luafile %<CR>
 
-nnoremap <silent> <F9> :luafile %<CR>
+" For delimitMate
+let b:delimitMate_matchpairs = "(:),[:],{:}"

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 = "(:),[:],{:}"

after/ftplugin/sql.vim

@@ -0,0 +1 @@
+set commentstring=--\ %s

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

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>

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

autoload/buf_utils.vim

@@ -15,7 +15,7 @@ function! buf_utils#GoToBuffer(count, direction) abort
     " we are essentially mixing Lua and vim script. We need to make sure that
     " args inside vim.notify() are valid vim values. The conversion from vim
     " value to lua value will be done by Nvim. See also https://github.com/neovim/neovim/pull/11338.
-    call v:lua.vim.notify('Invalid bufnr: ' . a:count, 'error', {'title': 'nvim-config'})
+    call v:lua.vim.notify('Invalid bufnr: ' . a:count, 4, {'title': 'nvim-config'})
     return
   endif
 

autoload/utils.vim

@@ -27,21 +27,6 @@ function! utils#HasColorscheme(name) abort
   return !empty(globpath(&runtimepath, l:pat))
 endfunction
 
-" Generate random integers in the range [Low, High] in pure vim script,
-" adapted from https://stackoverflow.com/a/12739441/6064933
-function! utils#RandInt(Low, High) abort
-  " Use lua to generate random int. It is faster. Ref: https://stackoverflow.com/a/20157671/6064933
-  call v:lua.math.randomseed(localtime())
-  return v:lua.math.random(a:Low, a:High)
-endfunction
-
-" Selection a random element from a sequence/list
-function! utils#RandElement(seq) abort
-  let l:idx = utils#RandInt(0, len(a:seq)-1)
-
-  return a:seq[l:idx]
-endfunction
-
 " Custom fold expr, adapted from https://vi.stackexchange.com/a/9094/15292
 function! utils#VimFolds(lnum) abort
   " get content of current line and the line below
@@ -143,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.
@@ -156,9 +152,7 @@ function! utils#Inside_git_repo() abort
   if match(res, 'true') == -1
     return v:false
   else
-    " Manually trigger a specical 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
@@ -198,14 +192,3 @@ function! utils#MultiEdit(patterns) abort
     endfor
   endfor
 endfunction
-
-function! utils#add_pack(name) abort
-  let l:status = v:true
-  try
-    execute printf("packadd! %s", a:name)
-  catch /^Vim\%((\a\+)\)\=:E919/
-    let l:status = v:false
-  endtry
-
-  return l:status
-endfunction

core/globals.vim

@@ -1,77 +0,0 @@
-"{ Global Variable
-"{{ Custom variables
-let g:is_win = (has('win32') || has('win64')) ? v:true : v:false
-let g:is_linux = (has('unix') && !has('macunix')) ? v:true : v:false
-let g:is_mac = has('macunix') ? v:true : v:false
-let g:logging_level = 'info'
-"}}
-
-"{{ Builtin variables
-" Disable perl provider
-let g:loaded_perl_provider = 0
-
-" Disable ruby provider
-let g:loaded_ruby_provider = 0
-
-" Disable node provider
-let g:loaded_node_provider = 0
-
-let g:did_install_default_menus = 1  " do not load menu
-
-" Path to Python 3 interpreter (must be an absolute path), make startup
-" faster. See https://neovim.io/doc/user/provider.html.
-if executable('python')
-   if g:is_win
-    let g:python3_host_prog=substitute(exepath('python'), '.exe$', '', 'g')
-  elseif g:is_linux || g:is_mac
-    let g:python3_host_prog=exepath('python')
-  endif
-else
-  echoerr 'Python 3 executable not found! You must install Python 3 and set its PATH correctly!'
-endif
-
-" Custom mapping <leader> (see `:h mapleader` for more info)
-let g:mapleader = ','
-
-" Enable highlighting for lua HERE doc inside vim script
-let g:vimsyn_embed = 'l'
-
-" Use English as main language
-if !g:is_mac
-  language en_US.utf-8
-endif
-
-" use filetype.lua instead of filetype.vim
-let g:do_filetype_lua = 1
-let g:did_load_filetypes = 0
-"}}
-
-"{{ Disable loading certain plugins
-" Whether to load netrw by default, see
-" https://github.com/bling/dotvim/issues/4
-let g:loaded_netrw       = 1
-let g:loaded_netrwPlugin = 1
-let g:netrw_liststyle = 3
-if g:is_win
-  let g:netrw_http_cmd = 'curl --ssl-no-revoke -Lo'
-endif
-
-" Do not load tohtml.vim
-let g:loaded_2html_plugin = 1
-
-" Do not load zipPlugin.vim, gzip.vim and tarPlugin.vim (all these plugins are
-" related to checking files inside compressed files)
-let g:loaded_zipPlugin = 1
-let loaded_gzip = 1
-let g:loaded_tarPlugin = 1
-
-let g:loaded_tutor_mode_plugin = 1  " do not load the tutor plugin
-
-" Do not use builtin matchit.vim and matchparen.vim since we use vim-matchup
-let g:loaded_matchit = 1
-let g:loaded_matchparen = 1
-"}}
-
-" Disable sql omni completion, it is broken.
-let g:loaded_sql_completion = 1
-"}

core/mappings.vim

@@ -1,195 +0,0 @@
-" Save key strokes (now we do not need to press shift to enter command mode).
-" Vim-sneak has also mapped `;`, so using the below mapping will break the map
-" used by vim-sneak
-nnoremap ; :
-xnoremap ; :
-
-" Quicker way to open command window
-nnoremap q; q:
-
-" Turn the word under cursor to upper case
-inoremap <c-u> <Esc>viwUea
-
-" Turn the current word into title case
-inoremap <c-t> <Esc>b~lea
-
-" Paste non-linewise text above or below current cursor,
-" see https://stackoverflow.com/a/1346777/6064933
-nnoremap <leader>p m`o<ESC>p``
-nnoremap <leader>P m`O<ESC>p``
-
-" Shortcut for faster save and quit
-nnoremap <silent> <leader>w :<C-U>update<CR>
-" Saves the file if modified and quit
-nnoremap <silent> <leader>q :<C-U>x<CR>
-" Quit all opened buffers
-nnoremap <silent> <leader>Q :<C-U>qa!<CR>
-
-" Navigation in the location and quickfix list
-nnoremap <silent> [l :<C-U>lprevious<CR>zv
-nnoremap <silent> ]l :<C-U>lnext<CR>zv
-nnoremap <silent> [L :<C-U>lfirst<CR>zv
-nnoremap <silent> ]L :<C-U>llast<CR>zv
-nnoremap <silent> [q :<C-U>cprevious<CR>zv
-nnoremap <silent> ]q :<C-U>cnext<CR>zv
-nnoremap <silent> [Q :<C-U>cfirst<CR>zv
-nnoremap <silent> ]Q :<C-U>clast<CR>zv
-
-" Close location list or quickfix list if they are present,
-" see https://superuser.com/q/355325/736190
-nnoremap<silent> \x :<C-U>windo lclose <bar> cclose<CR>
-
-" Close a buffer and switching to another buffer, do not close the
-" window, see https://stackoverflow.com/q/4465095/6064933
-nnoremap <silent> \d :<C-U>bprevious <bar> bdelete #<CR>
-
-" Insert a blank line below or above current line (do not move the cursor),
-" see https://stackoverflow.com/a/16136133/6064933
-nnoremap <expr> <Space>o printf('m`%so<ESC>``', v:count1)
-nnoremap <expr> <Space>O printf('m`%sO<ESC>``', v:count1)
-
-" Insert a space after current character
-nnoremap <Space><Space> a<Space><ESC>h
-
-" Move the cursor based on physical lines, not the actual lines.
-nnoremap <expr> j (v:count == 0 ? 'gj' : 'j')
-nnoremap <expr> k (v:count == 0 ? 'gk' : 'k')
-nnoremap ^ g^
-nnoremap 0 g0
-
-" Do not include white space characters when using $ in visual mode,
-" see https://vi.stackexchange.com/q/12607/15292
-xnoremap $ g_
-
-" Jump to matching pairs easily in normal mode
-nnoremap <Tab> %
-
-" Go to start or end of line easier
-nnoremap H ^
-xnoremap H ^
-nnoremap L g_
-xnoremap L g_
-
-" Continuous visual shifting (does not exit Visual mode), `gv` means
-" to reselect previous visual area, see https://superuser.com/q/310417/736190
-xnoremap < <gv
-xnoremap > >gv
-
-" When completion menu is shown, use <cr> to select an item and do not add an
-" annoying newline. Otherwise, <enter> is what it is. For more info , see
-" https://superuser.com/a/941082/736190 and
-" https://unix.stackexchange.com/q/162528/221410
-" inoremap <expr> <cr> ((pumvisible())?("\<C-Y>"):("\<cr>"))
-" Use <esc> to close auto-completion menu
-" inoremap <expr> <esc> ((pumvisible())?("\<C-e>"):("\<esc>"))
-
-" Tab-complete, see https://vi.stackexchange.com/q/19675/15292.
-inoremap <expr> <tab> pumvisible() ? "\<c-n>" : "\<tab>"
-inoremap <expr> <s-tab> pumvisible() ? "\<c-p>" : "\<s-tab>"
-
-" Edit and reload nvim config file quickly
-nnoremap <silent> <leader>ev :<C-U>tabnew $MYVIMRC <bar> tcd %:h<cr>
-nnoremap <silent> <leader>sv :<C-U>silent update $MYVIMRC <bar> source $MYVIMRC <bar>
-      \ call v:lua.vim.notify("Nvim config successfully reloaded!", 'info', {'title': 'nvim-config'})<cr>
-
-" Reselect the text that has just been pasted, see also https://stackoverflow.com/a/4317090/6064933.
-nnoremap <expr> <leader>v printf('`[%s`]', getregtype()[0])
-
-" Always use very magic mode for searching
-nnoremap / /\v
-
-" Search in selected region
-xnoremap / :<C-U>call feedkeys('/\%>'.(line("'<")-1).'l\%<'.(line("'>")+1)."l")<CR>
-
-" Change current working directory locally and print cwd after that,
-" see https://vim.fandom.com/wiki/Set_working_directory_to_the_current_file
-nnoremap <silent> <leader>cd :<C-U>lcd %:p:h<CR>:pwd<CR>
-
-" Use Esc to quit builtin terminal
-tnoremap <ESC>   <C-\><C-n>
-
-" Toggle spell checking (autosave does not play well with z=, so we disable it
-" when we are doing spell checking)
-nnoremap <silent> <F11> :<C-U>set spell!<cr>
-inoremap <silent> <F11> <C-O>:<C-U>set spell!<cr>
-
-" Change text without putting it into the vim register,
-" see https://stackoverflow.com/q/54255/6064933
-nnoremap c "_c
-nnoremap C "_C
-nnoremap cc "_cc
-xnoremap c "_c
-
-" Remove trailing whitespace characters
-nnoremap <silent> <leader><Space> :<C-U>StripTrailingWhitespace<CR>
-
-" check the syntax group of current cursor position
-nnoremap <silent> <leader>st :<C-U>call utils#SynGroup()<CR>
-
-" Clear highlighting
-if maparg('<C-L>', 'n') ==# ''
-  nnoremap <silent> <C-L> :<C-U>nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
-endif
-
-" Copy entire buffer.
-nnoremap <silent> <leader>y :<C-U>%y<CR>
-
-" Toggle cursor column
-nnoremap <silent> <leader>cl :<C-U>call utils#ToggleCursorCol()<CR>
-
-" Move current line up and down
-nnoremap <silent> <A-k> <Cmd>call utils#SwitchLine(line('.'), 'up')<CR>
-nnoremap <silent> <A-j> <Cmd>call utils#SwitchLine(line('.'), 'down')<CR>
-
-" Move current visual-line selection up and down
-xnoremap <silent> <A-k> :<C-U>call utils#MoveSelection('up')<CR>
-xnoremap <silent> <A-j> :<C-U>call utils#MoveSelection('down')<CR>
-
-" Replace visual selection with text in register, but not contaminate the
-" register, see also https://stackoverflow.com/q/10723700/6064933.
-xnoremap p "_c<ESC>p
-
-nnoremap <silent> gb :<C-U>call buf_utils#GoToBuffer(v:count, 'forward')<CR>
-nnoremap <silent> gB :<C-U>call buf_utils#GoToBuffer(v:count, 'backward')<CR>
-
-nnoremap <Left> <C-W>h
-nnoremap <Right> <C-W>l
-nnoremap <Up> <C-W>k
-nnoremap <Down> <C-W>j
-
-" Text objects for URL
-xnoremap <silent> iu :<C-U>call text_obj#URL()<CR>
-onoremap <silent> iu :<C-U>call text_obj#URL()<CR>
-
-" Text objects for entire buffer
-xnoremap <silent> iB :<C-U>call text_obj#Buffer()<CR>
-onoremap <silent> iB :<C-U>call text_obj#Buffer()<CR>
-
-" Do not move my cursor when joining lines.
-nnoremap J mzJ`z
-nnoremap gJ mzgJ`z
-
-" Break inserted text into smaller undo units.
-for ch in [',', '.', '!', '?', ';', ':']
-  execute printf('inoremap %s %s<C-g>u', ch, ch)
-endfor
-
-" insert semicolon in the end
-inoremap <A-;> <ESC>miA;<ESC>`ii
-
-" Keep cursor position after yanking
-nnoremap y myy
-xnoremap y myy
-
-augroup restore_after_yank
-  autocmd!
-  autocmd TextYankPost *  call s:restore_cursor()
-augroup END
-
-function! s:restore_cursor() abort
-  silent! normal `y
-  silent! delmarks y
-endfunction
-
-" for mappings defined in lua
-lua require('custom-map')

core/themes.vim

@@ -1,99 +0,0 @@
-let s:theme_setup_dict = {}
-
-function! s:theme_setup_dict.gruvbox8() dict abort
-  " Italic options should be put before colorscheme setting,
-  " see https://github.com/morhetz/gruvbox/wiki/Terminal-specific#1-italics-is-disabled
-  let g:gruvbox_italics=1
-  let g:gruvbox_italicize_strings=1
-  let g:gruvbox_filetype_hi_groups = 1
-  let g:gruvbox_plugin_hi_groups = 1
-  colorscheme gruvbox8_hard
-endfunction
-
-function! s:theme_setup_dict.onedark() dict abort
-  colorscheme onedark
-endfunction
-
-function! s:theme_setup_dict.edge() dict abort
-  let g:edge_enable_italic = 1
-  let g:edge_better_performance = 1
-  colorscheme edge
-endfunction
-
-function! s:theme_setup_dict.sonokai() dict abort
-  let g:sonokai_enable_italic = 1
-  let g:sonokai_better_performance = 1
-  colorscheme sonokai
-endfunction
-
-function! s:theme_setup_dict.gruvbox_material() dict abort
-  let g:gruvbox_material_enable_italic = 1
-  let g:gruvbox_material_better_performance = 1
-  colorscheme gruvbox-material
-endfunction
-
-function! s:theme_setup_dict.nord() dict abort
-  colorscheme nord
-endfunction
-
-function! s:theme_setup_dict.doom_one() dict abort
-  colorscheme doom-one
-endfunction
-
-function! s:theme_setup_dict.everforest() dict abort
-  let g:everforest_enable_italic = 1
-  let g:everforest_better_performance = 1
-  colorscheme everforest
-endfunction
-
-function! s:theme_setup_dict.nightfox() dict abort
-  colorscheme nordfox
-endfunction
-
-function! s:theme_setup_dict.kanagawa() dict abort
-  colorscheme kanagawa
-endfunction
-
-function! s:theme_setup_dict.catppuccin() dict abort
-  let g:catppuccin_flavour = "frappe" " latte, frappe, macchiato, mocha
-
-  lua require("catppuccin").setup()
-  colorscheme catppuccin
-endfunction
-
-" Theme to directory name mapping, because theme repo name is not necessarily
-" the same as the theme name itself.
-let s:theme2dir = {
-      \ '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'
-      \ }
-
-let s:theme = utils#RandElement(keys(s:theme2dir))
-let s:colorscheme_func = printf('s:theme_setup_dict.%s()', s:theme)
-
-if !has_key(s:theme_setup_dict, s:theme)
-  let s:msg = "Invalid colorscheme function: " . s:colorscheme_func
-  call v:lua.vim.notify(s:msg, 'error', {'title': 'nvim-config'})
-  finish
-endif
-
-let s:status = utils#add_pack(s:theme2dir[s:theme])
-if !s:status
-  echomsg printf("Theme %s not installed. Run PackerSync to install.", s:theme)
-  finish
-endif
-
-execute 'call ' . s:colorscheme_func
-if g:logging_level == 'debug'
-  let s:msg1 = "Colorscheme: " . s:theme
-  call v:lua.vim.notify(s:msg1, 'info', {'title': 'nvim-config'})
-endif

docs/README.md

@@ -31,7 +31,11 @@ should be set properly based on your environment.
 
 ## Automatic installation for Windows
 
-Run script [nvim_setup_windows.ps1](nvim_setup_windows.ps1) under PowerShell.
+Run the script [nvim_setup_windows.ps1](nvim_setup_windows.ps1) in PowerShell **with Administrator rights**:
+
+```
+.\docs\nvim_setup_windows.ps1
+```
 
 # Manual install
 
@@ -61,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.
@@ -107,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.
@@ -197,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`.
@@ -224,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.

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)"
@@ -76,12 +76,12 @@ if [[ "$SYSTEM_PYTHON" = true ]]; then
     # If we use system Python, we need to install these Python packages under
     # user HOME, since we do not have permissions to install them under system
     # directories.
-    for p in "${py_packages[@]}"; do
+    for p in "${PY_PACKAGES[@]}"; do
         pip install --user "$p"
     done
 else
     echo "Using custom Python to install $(PY_PACKAGES)"
-    for p in "${py_packages[@]}"; do
+    for p in "${PY_PACKAGES[@]}"; do
         "$CONDA_DIR/bin/pip" install "$p"
     done
 fi
@@ -112,6 +112,7 @@ if [[ -z "$(command -v node)" ]]; then
     fi
 else
     echo "Node.js is already installed. Skip installing it."
+    NODE_DIR="$(realpath $(dirname $(which node))/..)"
 fi
 
 # Install vim-language-server
@@ -123,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."
@@ -245,18 +246,13 @@ fi
 
 echo "Setting up config and installing plugins"
 if [[ -d "$NVIM_CONFIG_DIR" ]]; then
+    rm -rf "$NVIM_CONFIG_DIR.backup"
     mv "$NVIM_CONFIG_DIR" "$NVIM_CONFIG_DIR.backup"
 fi
 
 git clone --depth=1 https://github.com/jdhao/nvim-config.git "$NVIM_CONFIG_DIR"
 
-echo "Installing packer.nvim"
-if [[ ! -d ~/.local/share/nvim/site/pack/packer/opt/packer.nvim ]]; then
-    git clone --depth=1 https://github.com/wbthomason/packer.nvim \
-        ~/.local/share/nvim/site/pack/packer/opt/packer.nvim
-fi
-
 echo "Installing nvim plugins, please wait"
-"$NVIM_DIR/bin/nvim" -c "autocmd User PackerComplete quitall" -c "PackerSync"
+"$NVIM_DIR/bin/nvim" -c "autocmd User LazyInstall quitall"  -c "lua require('lazy').install()"
 
 echo "Finished installing Nvim and its dependencies!"

docs/nvim_setup_windows.ps1

@@ -1,6 +1,8 @@
-# Install scoop
+# Set policy to avoid errors
 Set-ExecutionPolicy RemoteSigned -scope CurrentUser
-iwr -useb get.scoop.sh | iex
+
+# Install scoop
+Invoke-WebRequest -UseBasicParsing get.scoop.sh | Invoke-Expression
 
 # Install node
 scoop install nodejs
@@ -18,14 +20,35 @@ npm install -g vim-language-server
 # Install bash-language-server
 npm install -g bash-language-server
 
-# Install miniconda3
+# Install miniconda3 (for Python)
 scoop install miniconda3
 
 # Install pynvim
 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
+
+# Install 7zip
+scoop install 7zip
+
+# Install 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 $lua_ls_link -OutFile "$lua_ls_src_path"
+
+# Extract the zip file using 7zip, ref: https://stackoverflow.com/a/41933215/6064933
+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 + ";$lua_ls_dir\bin", "Machine")
 
 # Install neovim nightly
 scoop bucket add versions

ginit.vim

@@ -59,3 +59,16 @@ if exists('g:fvim_loaded')
 
   FVimUIPopupMenu v:false
 endif
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"                             config for neovide                             "
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if exists("g:neovide")
+  set guifont=Hack\ NF:h10
+  let g:neovide_transparency = 1.0
+  let g:neovide_cursor_animation_length = 0.1
+  let g:neovide_cursor_trail_size=0.3
+  let g:neovide_cursor_vfx_mode = ""
+  let g:neovide_cursor_vfx_particle_density=10.0
+  let g:neovide_cursor_vfx_opacity=150.0
+endif

init.lua

@@ -4,34 +4,45 @@
 -- 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 version = vim.version
 
 -- check if we have the latest stable version of nvim
-local expected_ver = "0.7.2"
+local expected_ver = "0.9.5"
+local ev = version.parse(expected_ver)
+local actual_ver = version()
 
-local utils = require "utils"
-local nvim_ver = utils.get_nvim_version()
-
-if nvim_ver ~= expected_ver then
-  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, nvim_ver)
-  vim.api.nvim_echo({ { msg, "ErrorMsg" } }, false, {})
-  return
+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("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 = {
-  "globals.vim",
-  "options.vim",
-  "autocommands.vim",
-  "mappings.vim",
-  "plugins.vim",
-  "themes.vim",
+  "globals.lua", -- some global settings
+  "options.vim", -- setting options in nvim
+  "autocommands.vim", -- various autocommands
+  "mappings.lua", -- all the user-defined mappings
+  "plugins.vim", -- all the plugins installed and their configurations
+  "colorschemes.lua", -- colorscheme settings
 }
 
+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)
+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

lazy-lock.json

@@ -0,0 +1,87 @@
+{
+  "LeaderF": { "branch": "master", "commit": "a77f45791edeaa82fa75c5959ca73a59d7549549" },
+  "asyncrun.vim": { "branch": "master", "commit": "61cc3081963a12048e00e89f8cedc8bd1cb83b8c" },
+  "better-escape.vim": { "branch": "master", "commit": "6b16a45a839727977277f6ab11bded63e9ed86bb" },
+  "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" },
+  "catppuccin": { "branch": "main", "commit": "fc537040147f0374a22b88142a20eb6781141f0b" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
+  "cmp-nvim-ultisnips": { "branch": "main", "commit": "24bca5c3e137b28cd87442d4fc51a2b312dd99cc" },
+  "cmp-omni": { "branch": "main", "commit": "4ef610bbd85a5ee4e97e09450c0daecbdc60de86" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "committia.vim": { "branch": "master", "commit": "0b4df1a7f48ffbc23b009bd14d58ee1be541917c" },
+  "dashboard-nvim": { "branch": "master", "commit": "8721edccead31c07c2cda0bc5ac75b0491b5adcd" },
+  "delimitMate": { "branch": "master", "commit": "537a1da0fa5eeb88640425c37e545af933c56e1b" },
+  "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" },
+  "edge": { "branch": "master", "commit": "a4fd4f458331d42677d992f428235c491b2016aa" },
+  "emmylua-nvim": { "branch": "master", "commit": "c8f3c20276041c2b847cf041bca5928671b2eaa0" },
+  "everforest": { "branch": "master", "commit": "83b666410d7ae0eccf96dbbe3b4b6ac5b8172d38" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" },
+  "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
+  "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" },
+  "gruvbox-material": { "branch": "master", "commit": "c75bf1e96fdc33b8b3b613e5172a0acdba198fca" },
+  "hop.nvim": { "branch": "master", "commit": "1cbaa79457e6b5e9b04e6d5d8d19bd6b65ffa2be" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "0fe34b4c1b926e106d105d3ae88ef6cbf6743572" },
+  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
+  "lazy.nvim": { "branch": "main", "commit": "33c447b96e1cb1a5a2be87982d5d32bb5054079d" },
+  "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
+  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
+  "material.nvim": { "branch": "main", "commit": "6989f7e0076f4fa4e01056bd62c785cf0fef4caf" },
+  "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
+  "neoformat": { "branch": "master", "commit": "aedb6f9d3f53d5da229095f7d761d749f8c5c7e0" },
+  "nightfox.nvim": { "branch": "main", "commit": "fe2fc7b93d66349eff2c5baa6cec922ee3958f56" },
+  "nord.nvim": { "branch": "master", "commit": "0a22a387c92bb3b46e3d245522712ae7497bec38" },
+  "nvim-bqf": { "branch": "main", "commit": "8784eebf34371049b641646d00232c2603215297" },
+  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
+  "nvim-hlslens": { "branch": "main", "commit": "f0281591a59e95400babf61a96e59ba20e5c9533" },
+  "nvim-lspconfig": { "branch": "master", "commit": "cab7233cd6a89ec952dfd40c4b74341b1165830e" },
+  "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
+  "nvim-tree.lua": { "branch": "master", "commit": "53b0bcaadaffb505acff230578b56a86ec1ab38a" },
+  "nvim-treesitter": { "branch": "master", "commit": "783e5fc3079680b307e8ac518935317907e71a59" },
+  "nvim-web-devicons": { "branch": "master", "commit": "a1e6268779411048a87f767a27380089362a0ce2" },
+  "onedark.nvim": { "branch": "master", "commit": "826fb77e9ca92d3c0f3d937328663d4a6dc7fee1" },
+  "onedarkpro.nvim": { "branch": "main", "commit": "7c02b4eeb310173ef6d741e60200d72b76923eae" },
+  "open-browser.vim": { "branch": "master", "commit": "7d4c1d8198e889d513a030b5a83faa07606bac27" },
+  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
+  "sonokai": { "branch": "master", "commit": "17308ee6d9c764bfc1e0fa97213e7a99701b4144" },
+  "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
+  "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
+  "telescope-symbols.nvim": { "branch": "master", "commit": "f2060117d965df4a626f068a4ebbd8ee051aa076" },
+  "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" },
+  "ultisnips": { "branch": "master", "commit": "f6d1501b630cb783b0af8507c5588328f826d40f" },
+  "unicode.vim": { "branch": "master", "commit": "bc20d0fb3331a7b41708388c56bb8221c2104da7" },
+  "vim-auto-save": { "branch": "master", "commit": "2e3e54ea4c0fc946c21b0a4ee4c1c295ba736ee8" },
+  "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
+  "vim-conflicted": { "branch": "master", "commit": "068c320796f807ac4961618e3e62316773803996" },
+  "vim-eunuch": { "branch": "master", "commit": "67f3dd32b4dcd1c427085f42ff5f29c7adc645c6" },
+  "vim-flog": { "branch": "master", "commit": "58c1d39ec42f92d23a1204b1869e5d1dece8b86c" },
+  "vim-fugitive": { "branch": "master", "commit": "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1" },
+  "vim-grammarous": { "branch": "master", "commit": "db46357465ce587d5325e816235b5e92415f8c05" },
+  "vim-highlighturl": { "branch": "master", "commit": "012fee983e03913db6ba6393307eac434999b896" },
+  "vim-indent-object": { "branch": "master", "commit": "5c5b24c959478929b54a9e831a8e2e651a465965" },
+  "vim-markdown": { "branch": "master", "commit": "4e9b4deda11d05a157ab34e97f76089669b5b7af" },
+  "vim-markdownfootnotes": { "branch": "master", "commit": "2b288149f48cfaf7465d25bb094ed62898f5e5b0" },
+  "vim-matchup": { "branch": "master", "commit": "6dbe108230c7dbbf00555b7d4d9f6a891837ef07" },
+  "vim-mundo": { "branch": "master", "commit": "b53d35fb5ca9923302b9ef29e618ab2db4cc675e" },
+  "vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" },
+  "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
+  "vim-pythonsense": { "branch": "master", "commit": "9200a57629c904ed2ab8c9b2e8c5649d311794ba" },
+  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
+  "vim-sandwich": { "branch": "master", "commit": "c5a2cc438ce6ea2005c556dc833732aa53cae21a" },
+  "vim-scriptease": { "branch": "master", "commit": "18511d389675d773994215ddb572ccdc2b72f52b" },
+  "vim-snippets": { "branch": "master", "commit": "ccc2fa1529d372f7ac16d5eb07a385a72b50e05d" },
+  "vim-swap": { "branch": "master", "commit": "9358bfdc5e377aa13e7c2c2dd8699ba32b0dcf83" },
+  "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
+  "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
+  "vim-xkbswitch": { "branch": "master", "commit": "42b55bfec8f6dbd715135ce582a6f769831face1" },
+  "vimtex": { "branch": "master", "commit": "cbb20643b7bfe721902dac5760bf0d4889fb5f7e" },
+  "vista.vim": { "branch": "master", "commit": "58dabc027909330970ac549e52bf799a723878c5" },
+  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
+  "whitespace.nvim": { "branch": "master", "commit": "f0fc9e9c4ce3f7d2166e9e5a069b64b9ca4a3f15" },
+  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" },
+  "yanky.nvim": { "branch": "main", "commit": "cc3fc03c780a14f189290edcf1c47dc1306626d4" },
+  "zen-mode.nvim": { "branch": "main", "commit": "cb73b8bd0ef9d765b942db09dc762c603a89ae44" }
+}

lua/colorschemes.lua

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

lua/config/bqf.lua

@@ -1,6 +1,6 @@
-require("bqf").setup({
+require("bqf").setup {
   auto_resize_height = false,
   preview = {
     auto_preview = false,
+  },
 }
-})

lua/config/bufferline.lua

@@ -1,12 +1,15 @@
-require("bufferline").setup({
+require("bufferline").setup {
   options = {
     numbers = "buffer_id",
     close_command = "bdelete! %d",
     right_mouse_command = nil,
     left_mouse_command = "buffer %d",
     middle_mouse_command = nil,
-    indicator_icon = "▎",
-    buffer_close_icon = "",
+    indicator = {
+      icon = "▎", -- this should be omitted if indicator style is not 'icon'
+      style = "icon",
+    },
+    buffer_close_icon = "",
     modified_icon = "●",
     close_icon = "",
     left_trunc_marker = "",
@@ -40,4 +43,4 @@ require("bufferline").setup({
     always_show_bufferline = true,
     sort_by = "id",
   },
-})
+}

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

lua/config/fidget-nvim.lua

@@ -1 +1 @@
-require"fidget".setup{}
+require("fidget").setup {}

lua/config/fugitive.lua

@@ -0,0 +1,11 @@
+local keymap = vim.keymap
+
+keymap.set("n", "<leader>gs", "<cmd>Git<cr>", { desc = "Git status" })
+keymap.set("n", "<leader>gw", "<cmd>Gwrite<cr>", { desc = "Git add" })
+keymap.set("n", "<leader>gc", "<cmd>Git commit<cr>", { desc = "Git commit" })
+keymap.set("n", "<leader>gd", "<cmd>Gdiffsplit<cr>", { desc = "Git diff" })
+keymap.set("n", "<leader>gpl", "<cmd>Git pull<cr>", { desc = "Git pull" })
+keymap.set("n", "<leader>gpu", "<cmd>15 split|term git push<cr>", { desc = "Git push" })
+
+-- convert git to Git in command line mode
+vim.fn['utils#Cabbrev']('git', 'Git')

lua/config/git-linker.lua

@@ -0,0 +1,37 @@
+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", function()
+  local mode = string.lower(vim.fn.mode())
+  gitlinker.get_buf_range_url(mode)
+end, {
+  silent = true,
+  desc = "get git permlink",
+})
+
+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",
+})

lua/config/gitsigns.lua

@@ -0,0 +1,57 @@
+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" },
+  },
+  word_diff = true,
+  on_attach = function(bufnr)
+    local function map(mode, l, r, opts)
+      opts = opts or {}
+      opts.buffer = bufnr
+      vim.keymap.set(mode, l, r, opts)
+    end
+
+    -- Navigation
+    map("n", "]c", function()
+      if vim.wo.diff then
+        return "]c"
+      end
+      vim.schedule(function()
+        gs.next_hunk()
+      end)
+      return "<Ignore>"
+    end, { expr = true, desc = "next hunk" })
+
+    map("n", "[c", function()
+      if vim.wo.diff then
+        return "[c"
+      end
+      vim.schedule(function()
+        gs.prev_hunk()
+      end)
+      return "<Ignore>"
+    end, { expr = true, desc = "previous hunk" })
+
+    -- Actions
+    map("n", "<leader>hp", gs.preview_hunk)
+    map("n", "<leader>hb", function()
+      gs.blame_line { full = true }
+    end)
+  end,
+}
+
+vim.api.nvim_create_autocmd('ColorScheme', {
+  pattern = "*",
+  callback = function()
+    vim.cmd [[
+      hi GitSignsChangeInline gui=reverse
+      hi GitSignsAddInline gui=reverse
+      hi GitSignsDeleteInline gui=reverse
+    ]]
+  end
+})

lua/config/hlslens.lua

@@ -1,34 +1,49 @@
-require('hlslens').setup({
+local api = vim.api
+local keymap = vim.keymap
+
+local hlslens = require("hlslens")
+
+hlslens.setup {
   calm_down = true,
   nearest_only = true,
-})
+}
 
 local activate_hlslens = function(direction)
   local cmd = string.format("normal! %s%szzzv", vim.v.count1, direction)
-  local status, msg = pcall(vim.fn.execute, cmd)
-  -- 13 is the index where real error message starts
-  msg = msg:sub(13)
+  local status, msg = pcall(vim.cmd, cmd)
 
+  -- Deal with the case that there is no such pattern in current buffer.
   if not status then
-    vim.api.nvim_echo({{msg, "ErrorMsg"}}, false, {})
+    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
-  require('hlslens').start()
+
+  hlslens.start()
 end
 
-vim.keymap.set('n', 'n', '',
-{
-  noremap = true,
-  silent = true,
-  callback = function() activate_hlslens('n') end
+keymap.set("n", "n", "", {
+  callback = function()
+    activate_hlslens("n")
+  end,
 })
 
-vim.keymap.set('n', 'N', '',
-{
-  noremap = true,
-  silent = true,
-  callback = function() activate_hlslens('N') end
+keymap.set("n", "N", "", {
+  callback = function()
+    activate_hlslens("N")
+  end,
 })
 
-vim.keymap.set('n', '*', "<Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>", { silent = true })
-vim.keymap.set('n', '#', "<Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>", { silent = true })
+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,
+})

lua/config/indent-blankline.lua

@@ -1,23 +1,36 @@
-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
+local api = vim.api
+
+local exclude_ft = { "help", "git", "markdown", "snippets", "text", "gitconfig", "alpha", "dashboard" }
+
+require("ibl").setup {
+  indent = {
+    -- -- U+2502 may also be a good choice, it will be on the middle of cursor.
+    -- -- U+250A is also a good choice
     char = "▏",
-  show_end_of_line = false,
-  disable_with_nolist = true,
-  buftype_exclude = { "terminal" },
-  filetype_exclude = { "help", "git", "markdown", "snippets", "text", "gitconfig", "alpha" },
+  },
+  scope = {
+    show_start = false,
+    show_end = false,
+  },
+  exclude = {
+    filetypes = exclude_ft,
+    buftypes = { "terminal" },
+  },
+}
+
+local gid = api.nvim_create_augroup("indent_blankline", { clear = true })
+api.nvim_create_autocmd("InsertEnter", {
+  pattern = "*",
+  group = gid,
+  command = "IBLDisable",
 })
 
-vim.cmd([[
-function! Should_activate_indentblankline() abort
-  if index(g:indent_blankline_filetype_exclude, &filetype) == -1
-    IndentBlanklineEnable
-  endif
-endfunction
-
-augroup indent_blankline
-  autocmd!
-  autocmd InsertEnter * IndentBlanklineDisable
-  autocmd InsertLeave * call Should_activate_indentblankline()
-augroup END
-]])
+api.nvim_create_autocmd("InsertLeave", {
+  pattern = "*",
+  group = gid,
+  callback = function()
+    if not vim.tbl_contains(exclude_ft, vim.bo.filetype) then
+      vim.cmd([[IBLEnable]])
+    end
+  end,
+})

lua/config/iron.lua

@@ -1,7 +1,7 @@
 local iron = require("iron")
-iron.core.set_config({
+iron.core.set_config {
   preferred = {
     python = "ipython",
   },
   repl_open_cmd = "vertical 120 split",
-})
+}

lua/config/lsp.lua

@@ -1,25 +1,55 @@
 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 opts = { silent = true, buffer = bufnr }
-  vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
-  vim.keymap.set("n", "<C-]>", vim.lsp.buf.definition, opts)
-  vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
-  vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, opts)
-  vim.keymap.set("n", "<space>wa", vim.lsp.buf.add_workspace_folder, opts)
-  vim.keymap.set("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, opts)
-  vim.keymap.set("n", "<space>wl", function() inspect(vim.lsp.buf.list_workspace_folders()) end, opts)
-  vim.keymap.set("n", "<space>rn", vim.lsp.buf.rename, opts)
-  vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
-  vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
-  vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
-  vim.keymap.set("n", "<space>q", function() vim.diagnostic.setqflist({open = true}) end, opts)
-  vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, opts)
+  local map = function(mode, l, r, opts)
+    opts = opts or {}
+    opts.silent = true
+    opts.buffer = bufnr
+    keymap.set(mode, l, r, opts)
+  end
+
+  map("n", "gd", vim.lsp.buf.definition, { desc = "go to definition" })
+  map("n", "<C-]>", vim.lsp.buf.definition)
+  map("n", "K", vim.lsp.buf.hover)
+  map("n", "<C-k>", vim.lsp.buf.signature_help)
+  map("n", "<space>rn", vim.lsp.buf.rename, { desc = "varialbe rename" })
+  map("n", "gr", vim.lsp.buf.references, { desc = "show references" })
+  map("n", "[d", diagnostic.goto_prev, { desc = "previous diagnostic" })
+  map("n", "]d", diagnostic.goto_next, { desc = "next diagnostic" })
+  -- this puts diagnostics from opened files to quickfix
+  map("n", "<space>qw", diagnostic.setqflist, { desc = "put window diagnostics to qf" })
+  -- this puts diagnostics from current buffer to quickfix
+  map("n", "<space>qb", function() set_qflist(bufnr) end, { desc = "put buffer diagnostics to qf" })
+  map("n", "<space>ca", vim.lsp.buf.code_action, { desc = "LSP code action" })
+  map("n", "<space>wa", vim.lsp.buf.add_workspace_folder, { desc = "add workspace folder" })
+  map("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, { desc = "remove workspace folder" })
+  map("n", "<space>wl", function()
+    inspect(vim.lsp.buf.list_workspace_folders())
+  end, { desc = "list workspace folder" })
+
+  -- Set some key bindings conditional on server capabilities
+  if client.server_capabilities.documentFormattingProvider then
+    map("n", "<space>f", vim.lsp.buf.format, { desc = "format code" })
+  end
 
   api.nvim_create_autocmd("CursorHold", {
     buffer = bufnr,
@@ -27,9 +57,9 @@ local custom_attach = function(client, bufnr)
       local float_opts = {
         focusable = false,
         close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
-        border = 'rounded',
-        source = 'always',  -- show source in diagnostic popup window
-        prefix = ' '
+        border = "rounded",
+        source = "always", -- show source in diagnostic popup window
+        prefix = " ",
       }
 
       if not vim.b.diagnostics_pos then
@@ -37,62 +67,87 @@ local custom_attach = function(client, bufnr)
       end
 
       local cursor_pos = api.nvim_win_get_cursor(0)
-      if (cursor_pos[1] ~= vim.b.diagnostics_pos[1] or cursor_pos[2] ~= vim.b.diagnostics_pos[2]) and
-        #vim.diagnostic.get() > 0
+      if (cursor_pos[1] ~= vim.b.diagnostics_pos[1] or cursor_pos[2] ~= vim.b.diagnostics_pos[2])
+          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
-    end
+    end,
   })
 
-  -- Set some key bindings conditional on server capabilities
-  if client.resolved_capabilities.document_formatting then
-    vim.keymap.set("n", "<space>f", vim.lsp.buf.formatting_sync, opts)
-  end
-  if client.resolved_capabilities.document_range_formatting then
-    vim.keymap.set("x", "<space>f", vim.lsp.buf.range_formatting, opts)
-  end
-
   -- The blow command will highlight the current variable and its usages in the buffer.
-  if client.resolved_capabilities.document_highlight then
+  if client.server_capabilities.documentHighlightProvider then
     vim.cmd([[
       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
+  if vim.g.logging_level == "debug" then
     local msg = string.format("Language server %s started!", client.name)
-    vim.notify(msg, 'info', {title = 'Nvim-config'})
+    vim.notify(msg, vim.log.levels.DEBUG, { title = "Nvim-config" })
   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
-  lspconfig.pylsp.setup({
+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 },
         },
       },
     },
@@ -100,9 +155,9 @@ if utils.executable('pylsp') then
       debounce_text_changes = 200,
     },
     capabilities = capabilities,
-  })
+  }
 else
-  vim.notify("pylsp not found!", 'warn', {title = 'Nvim-config'})
+  vim.notify("pylsp not found!", vim.log.levels.WARN, { title = "Nvim-config" })
 end
 
 -- if utils.executable('pyright') then
@@ -111,46 +166,58 @@ end
 --     capabilities = capabilities
 --   }
 -- else
---   vim.notify("pyright not found!", 'warn', {title = 'Nvim-config'})
+--   vim.notify("pyright not found!", vim.log.levels.WARN, {title = 'Nvim-config'})
 -- end
 
-if utils.executable('clangd') then
-  lspconfig.clangd.setup({
+if utils.executable("ltex-ls") then
+  lspconfig.ltex.setup {
+    on_attach = custom_attach,
+    cmd = { "ltex-ls" },
+    filetypes = { "text", "plaintex", "tex", "markdown" },
+    settings = {
+      ltex = {
+        language = "en"
+      },
+    },
+    flags = { debounce_text_changes = 300 },
+}
+end
+
+if utils.executable("clangd") then
+  lspconfig.clangd.setup {
     on_attach = custom_attach,
     capabilities = capabilities,
     filetypes = { "c", "cpp", "cc" },
     flags = {
       debounce_text_changes = 500,
     },
-  })
-else
-  vim.notify("clangd not found!", 'warn', {title = 'Nvim-config'})
+  }
 end
 
 -- set up vim-language-server
-if utils.executable('vim-language-server') then
-  lspconfig.vimls.setup({
+if utils.executable("vim-language-server") then
+  lspconfig.vimls.setup {
     on_attach = custom_attach,
     flags = {
       debounce_text_changes = 500,
     },
     capabilities = capabilities,
-  })
+  }
 else
-  vim.notify("vim-language-server not found!", 'warn', {title = 'Nvim-config'})
+  vim.notify("vim-language-server not found!", vim.log.levels.WARN, { title = "Nvim-config" })
 end
 
 -- set up bash-language-server
-if utils.executable('bash-language-server') then
-  lspconfig.bashls.setup({
+if utils.executable("bash-language-server") then
+  lspconfig.bashls.setup {
     on_attach = custom_attach,
     capabilities = capabilities,
-  })
+  }
 end
 
 if utils.executable("lua-language-server") then
-  -- settings for lua-language-server can be found on https://github.com/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 = {
@@ -164,11 +231,11 @@ 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'),
+            fn.stdpath("data") .. "/lazy/emmylua-nvim",
+            fn.stdpath("config"),
           },
           maxPreload = 2000,
           preloadFileSize = 50000,
@@ -176,22 +243,22 @@ if utils.executable("lua-language-server") then
       },
     },
     capabilities = capabilities,
-  })
+  }
 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,
   severity_sort = true,
-})
+}
 
 -- lsp.handlers["textDocument/publishDiagnostics"] = lsp.with(lsp.diagnostic.on_publish_diagnostics, {
 --   underline = false,

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)

lua/config/nvim-cmp.lua

@@ -1,54 +1,53 @@
 -- Setup nvim-cmp.
-local cmp = require'cmp'
-local lspkind = require'lspkind'
+local cmp = require("cmp")
+local lspkind = require("lspkind")
 
-cmp.setup({
+cmp.setup {
   snippet = {
     expand = function(args)
       -- For `ultisnips` user.
       vim.fn["UltiSnips#Anon"](args.body)
     end,
   },
-  mapping = cmp.mapping.preset.insert({
-          ['<Tab>'] = function(fallback)
+  mapping = cmp.mapping.preset.insert {
+    ["<Tab>"] = function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
       else
         fallback()
       end
     end,
-          ['<S-Tab>'] = function(fallback)
+    ["<S-Tab>"] = function(fallback)
       if cmp.visible() then
         cmp.select_prev_item()
       else
         fallback()
       end
     end,
-          ['<CR>'] = cmp.mapping.confirm({ select = true }),
-          ['<C-e>'] = cmp.mapping.abort(),
-          ['<Esc>'] = cmp.mapping.close(),
-          ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-          ['<C-f>'] = cmp.mapping.scroll_docs(4),
-        }),
+    ["<CR>"] = cmp.mapping.confirm { select = true },
+    ["<C-e>"] = cmp.mapping.abort(),
+    ["<Esc>"] = cmp.mapping.close(),
+    ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+    ["<C-f>"] = cmp.mapping.scroll_docs(4),
+  },
   sources = {
-    { name = 'nvim_lsp' }, -- For nvim-lsp
-    { name = 'ultisnips' }, -- For ultisnips user.
-    { name = 'path' }, -- for path completion
-    { name = 'buffer', keyword_length = 4 }, -- for buffer word completion
-    { name = 'omni' },
-    { name = 'emoji', insert = true, } -- emoji completion
+    { name = "nvim_lsp" }, -- For nvim-lsp
+    { name = "ultisnips" }, -- For ultisnips user.
+    { name = "path" }, -- for path completion
+    { name = "buffer", keyword_length = 2 }, -- for buffer word completion
+    { name = "emoji", insert = true }, -- emoji completion
   },
   completion = {
     keyword_length = 1,
-    completeopt = "menu,noselect"
+    completeopt = "menu,noselect",
   },
   view = {
-    entries = 'custom',
+    entries = "custom",
   },
   formatting = {
-    format = lspkind.cmp_format({
+    format = lspkind.cmp_format {
       mode = "symbol_text",
-      menu = ({
+      menu = {
         nvim_lsp = "[LSP]",
         ultisnips = "[US]",
         nvim_lua = "[Lua]",
@@ -56,13 +55,22 @@ cmp.setup({
         buffer = "[Buffer]",
         emoji = "[Emoji]",
         omni = "[Omni]",
-      }),
-    }),
+      },
+    },
+  },
+}
+
+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[[
+vim.cmd([[
   highlight! link CmpItemMenu Comment
   " gray
   highlight! CmpItemAbbrDeprecated guibg=NONE gui=strikethrough guifg=#808080
@@ -80,4 +88,4 @@ vim.cmd[[
   highlight! CmpItemKindKeyword guibg=NONE guifg=#D4D4D4
   highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4
   highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4
-]]
+]])

lua/config/nvim-notify.lua

@@ -1,10 +1,10 @@
 local nvim_notify = require("notify")
-nvim_notify.setup({
+nvim_notify.setup {
   -- Animation style
   stages = "fade_in_slide_out",
   -- Default timeout for notifications
   timeout = 1500,
   background_colour = "#2E3440",
-})
+}
 
 vim.notify = nvim_notify

lua/config/nvim-tree.lua

@@ -1,32 +1,22 @@
+local keymap = vim.keymap
 local nvim_tree = require("nvim-tree")
 
-nvim_tree.setup({
+nvim_tree.setup {
   auto_reload_on_write = true,
   disable_netrw = false,
   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,
   view = {
     width = 30,
-    height = 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" },
         },
       },
@@ -111,9 +100,9 @@ nvim_tree.setup({
       profile = false,
     },
   },
-})
+}
 
-vim.keymap.set('n', '<space>s', function()
-  return require('nvim-tree').toggle(false, true)
-end,
-{ noremap = true, silent = true, desc = "toggle nvim-tree"})
+keymap.set("n", "<space>s", require("nvim-tree.api").tree.toggle, {
+  silent = true,
+  desc = "toggle nvim-tree",
+})

lua/config/nvim_hop.lua

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

lua/config/statusline.lua

@@ -8,12 +8,18 @@ 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
-      return '[CN]'
+    local layout = fn.libcall(vim.g.XkbSwitchLib, "Xkb_Switch_getXkbLayout", "")
+
+    -- 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
 
@@ -27,7 +33,7 @@ local function trailing_space()
 
   local line_num = nil
 
-  for i=1, fn.line('$') do
+  for i = 1, fn.line("$") do
     local linetext = fn.getline(i)
     -- To prevent invalid escape error, we wrap the regex string with `[[]]`.
     local idx = fn.match(linetext, [[\v\s+$]])
@@ -53,28 +59,66 @@ local function mixed_indent()
 
   local space_pat = [[\v^ +]]
   local tab_pat = [[\v^\t+]]
-  local space_indent = fn.search(space_pat, 'nwc')
-  local tab_indent = fn.search(tab_pat, 'nwc')
+  local space_indent = fn.search(space_pat, "nwc")
+  local tab_indent = fn.search(tab_pat, "nwc")
   local mixed = (space_indent > 0 and tab_indent > 0)
   local mixed_same_line
   if not mixed then
-    mixed_same_line = fn.search([[\v^(\t+ | +\t)]], 'nwc')
+    mixed_same_line = fn.search([[\v^(\t+ | +\t)]], "nwc")
     mixed = mixed_same_line > 0
   end
-  if not mixed then return '' end
+  if not mixed then
+    return ""
+  end
   if mixed_same_line ~= nil and mixed_same_line > 0 then
-     return 'MI:'..mixed_same_line
+    return "MI:" .. mixed_same_line
   end
   local space_indent_cnt = fn.searchcount({ pattern = space_pat, max_count = 1e3 }).total
   local tab_indent_cnt = fn.searchcount({ pattern = tab_pat, max_count = 1e3 }).total
   if space_indent_cnt > tab_indent_cnt then
-    return 'MI:'..tab_indent
+    return "MI:" .. tab_indent
   else
-    return 'MI:'..space_indent
+    return "MI:" .. space_indent
   end
 end
 
-require("lualine").setup({
+local diff = function()
+  local git_status = vim.b.gitsigns_status_dict
+  if git_status == nil then
+    return
+  end
+
+  local modify_num = git_status.changed
+  local remove_num = git_status.removed
+  local add_num = git_status.added
+
+  local info = { added = add_num, modified = modify_num, removed = remove_num }
+  -- 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,
     theme = "auto",
@@ -87,16 +131,31 @@ require("lualine").setup({
   },
   sections = {
     lualine_a = { "mode" },
-    lualine_b = { "branch", "diff" },
+    lualine_b = {
+      "branch",
+      {
+        "diff",
+        source = diff,
+      },
+      {
+        virtual_env,
+        color = { fg = 'black', bg = "#F1CA81" }
+      }
+    },
     lualine_c = {
       "filename",
       {
         ime_state,
-        color = {fg = 'black', bg = '#f46868'}
+        color = { fg = "black", bg = "#f46868" },
       },
       {
         spell,
-        color = {fg = 'black', bg = '#a7c080'}
+        color = { fg = "black", bg = "#a7c080" },
+      },
+      {
+        "diagnostics",
+        sources = { "nvim_diagnostic" },
+        symbols = {error = '🆇 ', warn = '⚠️ ', info = 'ℹ️ ', hint = ' '},
       },
     },
     lualine_x = {
@@ -111,20 +170,18 @@ require("lualine").setup({
       },
       "filetype",
     },
-    lualine_y = { "progress" },
-    lualine_z = {
+    lualine_y = {
       "location",
-      {
-        "diagnostics",
-        sources = { "nvim_diagnostic" }
+      "progress",
     },
+    lualine_z = {
       {
         trailing_space,
-        color = "WarningMsg"
+        color = "WarningMsg",
       },
       {
         mixed_indent,
-        color = "WarningMsg"
+        color = "WarningMsg",
       },
     },
   },
@@ -137,6 +194,5 @@ require("lualine").setup({
     lualine_z = {},
   },
   tabline = {},
-  extensions = {'quickfix', 'fugitive', 'nvim-tree'},
-})
-
+  extensions = { "quickfix", "fugitive", "nvim-tree" },
+}

lua/config/treesitter.lua

@@ -1,8 +1,8 @@
-require("nvim-treesitter.configs").setup({
-  ensure_installed = {"python", "cpp", "lua", "vim"},
+require("nvim-treesitter.configs").setup {
+  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
-    disable = {}, -- list of language that will be disabled
+    disable = { 'help' }, -- list of language that will be disabled
   },
-})
+}

lua/config/which-key.lua

@@ -1,4 +1,4 @@
-require("which-key").setup({
+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
@@ -57,4 +57,4 @@ require("which-key").setup({
     -- most people should not need to change this
     n = { "o", "O" },
   },
-})
+}

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)")

lua/config/zen-mode.lua

@@ -1,4 +1,4 @@
-require("zen-mode").setup({
+require("zen-mode").setup {
   window = {
     backdrop = 0.8, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
     width = 120,
@@ -12,4 +12,4 @@ require("zen-mode").setup({
       list = false, -- disable whitespace characters
     },
   },
-})
+}

lua/custom-autocmd.lua

@@ -0,0 +1,85 @@
+local fn = vim.fn
+local api = vim.api
+
+local utils = require("utils")
+
+-- Display a message when the current file is not in utf-8 format.
+-- Note that we need to use `unsilent` command here because of this issue:
+-- https://github.com/vim/vim/issues/4379
+api.nvim_create_autocmd({ "BufRead" }, {
+  pattern = "*",
+  group = api.nvim_create_augroup("non_utf8_file", { clear = true }),
+  callback = function()
+    if vim.bo.fileencoding ~= "utf-8" then
+      vim.notify("File not in UTF-8 format!", vim.log.levels.WARN, { title = "nvim-config" })
+    end
+  end,
+})
+
+-- 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 = yank_group,
+  callback = function()
+    vim.highlight.on_yank { higroup = "YankColor", timeout = 300 }
+  end,
+})
+
+api.nvim_create_autocmd({ "CursorMoved" }, {
+  pattern = "*",
+  group = yank_group,
+  callback = function()
+    vim.g.current_cursor_pos = vim.fn.getcurpos()
+  end,
+})
+
+api.nvim_create_autocmd("TextYankPost", {
+  pattern = "*",
+  group = yank_group,
+  callback = function(ev)
+    if vim.v.event.operator == 'y' then
+      vim.fn.setpos('.', vim.g.current_cursor_pos)
+    end
+  end,
+})
+
+-- Auto-create dir when saving a file, in case some intermediate directory does not exist
+api.nvim_create_autocmd({ "BufWritePre" }, {
+  pattern = "*",
+  group = api.nvim_create_augroup("auto_create_dir", { clear = true }),
+  callback = function(ctx)
+    local dir = fn.fnamemodify(ctx.file, ":p:h")
+    utils.may_create_dir(dir)
+  end,
+})
+
+-- Automatically reload the file if it is changed outside of Nvim, see https://unix.stackexchange.com/a/383044/221410.
+-- It seems that `checktime` does not work in command line. We need to check if we are in command
+-- line before executing this command, see also https://vi.stackexchange.com/a/20397/15292 .
+api.nvim_create_augroup("auto_read", { clear = true })
+
+api.nvim_create_autocmd({ "FileChangedShellPost" }, {
+  pattern = "*",
+  group = "auto_read",
+  callback = function()
+    vim.notify("File changed on disk. Buffer reloaded!", vim.log.levels.WARN, { title = "nvim-config" })
+  end,
+})
+
+api.nvim_create_autocmd({ "FocusGained", "CursorHold" }, {
+  pattern = "*",
+  group = "auto_read",
+  callback = function()
+    if fn.getcmdwintype() == "" then
+      vim.cmd("checktime")
+    end
+  end,
+})
+
+-- Resize all windows when we resize the terminal
+api.nvim_create_autocmd("VimResized", {
+  group = api.nvim_create_augroup("win_autoresize", { clear = true }),
+  desc = "autoresize windows on resizing operation",
+  command = "wincmd =",
+})

lua/custom-map.lua

@@ -1,11 +0,0 @@
-local keymap = vim.keymap
-
--- 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>')
-
--- Go to beginning of command in command-line mode
-keymap.set('c', '<C-A>', '<HOME>')
-
--- Delete the character to the right of the cursor
-keymap.set('i', '<C-D>', '<DEL>')

lua/globals.lua

@@ -0,0 +1,75 @@
+local fn = vim.fn
+local api = vim.api
+
+local utils = require('utils')
+
+-- Inspect something
+function _G.inspect(item)
+  vim.print(item)
+end
+
+------------------------------------------------------------------------
+--                          custom variables                          --
+------------------------------------------------------------------------
+vim.g.is_win = (utils.has("win32") or utils.has("win64")) and true or false
+vim.g.is_linux = (utils.has("unix") and (not utils.has("macunix"))) and true or false
+vim.g.is_mac  = utils.has("macunix") and true or false
+
+vim.g.logging_level = "info"
+
+------------------------------------------------------------------------
+--                         builtin variables                          --
+------------------------------------------------------------------------
+vim.g.loaded_perl_provider = 0  -- Disable perl provider
+vim.g.loaded_ruby_provider = 0  -- Disable ruby provider
+vim.g.loaded_node_provider = 0  -- Disable node provider
+vim.g.did_install_default_menus = 1  -- do not load menu
+
+if utils.executable('python3') then
+  if vim.g.is_win then
+    vim.g.python3_host_prog = fn.substitute(fn.exepath("python3"), ".exe$", '', 'g')
+  else
+    vim.g.python3_host_prog = fn.exepath("python3")
+  end
+else
+  api.nvim_err_writeln("Python3 executable not found! You must install Python3 and set its PATH correctly!")
+  return
+end
+
+-- Custom mapping <leader> (see `:h mapleader` for more info)
+vim.g.mapleader = ','
+
+-- Enable highlighting for lua HERE doc inside vim script
+vim.g.vimsyn_embed = 'l'
+
+-- Use English as main language
+vim.cmd [[language en_US.UTF-8]]
+
+-- Disable loading certain plugins
+
+-- Whether to load netrw by default, see https://github.com/bling/dotvim/issues/4
+vim.g.loaded_netrw       = 1
+vim.g.loaded_netrwPlugin = 1
+vim.g.netrw_liststyle = 3
+if vim.g.is_win then
+  vim.g.netrw_http_cmd = "curl --ssl-no-revoke -Lo"
+end
+
+-- Do not load tohtml.vim
+vim.g.loaded_2html_plugin = 1
+
+-- Do not load zipPlugin.vim, gzip.vim and tarPlugin.vim (all these plugins are
+-- related to checking files inside compressed files)
+vim.g.loaded_zipPlugin = 1
+vim.g.loaded_gzip = 1
+vim.g.loaded_tarPlugin = 1
+
+-- Do not load the tutor plugin
+vim.g.loaded_tutor_mode_plugin = 1
+
+-- Do not use builtin matchit.vim and matchparen.vim since we use vim-matchup
+vim.g.loaded_matchit = 1
+vim.g.loaded_matchparen = 1
+
+-- Disable sql omni completion, it is broken.
+vim.g.loaded_sql_completion = 1

lua/lua-init.lua

@@ -1,5 +0,0 @@
--- Some utility stuff
-require 'utils'
-
--- plugin installation
-require 'plugins'

lua/mappings.lua

@@ -0,0 +1,231 @@
+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" }, ";", ":")
+
+-- Turn the word under cursor to upper case
+keymap.set("i", "<c-u>", "<Esc>viwUea")
+
+-- Turn the current word into title case
+keymap.set("i", "<c-t>", "<Esc>b~lea")
+
+-- Paste non-linewise text above or below current line, see https://stackoverflow.com/a/1346777/6064933
+keymap.set("n", "<leader>p", "m`o<ESC>p``", { desc = "paste below current line" })
+keymap.set("n", "<leader>P", "m`O<ESC>p``", { desc = "paste above current line" })
+
+-- Shortcut for faster save and quit
+keymap.set("n", "<leader>w", "<cmd>update<cr>", { silent = true, desc = "save buffer" })
+
+-- Saves the file if modified and quit
+keymap.set("n", "<leader>q", "<cmd>x<cr>", { silent = true, desc = "quit current window" })
+
+-- Quit all opened buffers
+keymap.set("n", "<leader>Q", "<cmd>qa!<cr>", { silent = true, desc = "quit nvim" })
+
+-- Navigation in the location and quickfix list
+keymap.set("n", "[l", "<cmd>lprevious<cr>zv", { silent = true, desc = "previous location item" })
+keymap.set("n", "]l", "<cmd>lnext<cr>zv", { silent = true, desc = "next location item" })
+
+keymap.set("n", "[L", "<cmd>lfirst<cr>zv", { silent = true, desc = "first location item" })
+keymap.set("n", "]L", "<cmd>llast<cr>zv", { silent = true, desc = "last location item" })
+
+keymap.set("n", "[q", "<cmd>cprevious<cr>zv", { silent = true, desc = "previous qf item" })
+keymap.set("n", "]q", "<cmd>cnext<cr>zv", { silent = true, desc = "next qf item" })
+
+keymap.set("n", "[Q", "<cmd>cfirst<cr>zv", { silent = true, desc = "first qf item" })
+keymap.set("n", "]Q", "<cmd>clast<cr>zv", { silent = true, desc = "last qf item" })
+
+-- Close location list or quickfix list if they are present, see https://superuser.com/q/355325/736190
+keymap.set("n", [[\x]], "<cmd>windo lclose <bar> cclose <cr>", {
+  silent = true,
+  desc = "close qf and location list",
+})
+
+-- Delete a buffer, without closing the window, see https://stackoverflow.com/q/4465095/6064933
+keymap.set("n", [[\d]], "<cmd>bprevious <bar> bdelete #<cr>", {
+  silent = true,
+  desc = "delete buffer",
+})
+
+-- Insert a blank line below or above current line (do not move the cursor),
+-- see https://stackoverflow.com/a/16136133/6064933
+keymap.set("n", "<space>o", "printf('m`%so<ESC>``', v:count1)", {
+  expr = true,
+  desc = "insert line below",
+})
+
+keymap.set("n", "<space>O", "printf('m`%sO<ESC>``', v:count1)", {
+  expr = true,
+  desc = "insert line above",
+})
+
+-- Move the cursor based on physical lines, not the actual lines.
+keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true })
+keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true })
+keymap.set("n", "^", "g^")
+keymap.set("n", "0", "g0")
+
+-- Do not include white space characters when using $ in visual mode,
+-- see https://vi.stackexchange.com/q/12607/15292
+keymap.set("x", "$", "g_")
+
+-- Go to start or end of line easier
+keymap.set({ "n", "x" }, "H", "^")
+keymap.set({ "n", "x" }, "L", "g_")
+
+-- Continuous visual shifting (does not exit Visual mode), `gv` means
+-- to reselect previous visual area, see https://superuser.com/q/310417/736190
+keymap.set("x", "<", "<gv")
+keymap.set("x", ">", ">gv")
+
+-- Edit and reload nvim config file quickly
+keymap.set("n", "<leader>ev", "<cmd>tabnew $MYVIMRC <bar> tcd %:h<cr>", {
+  silent = true,
+  desc = "open init.lua",
+})
+
+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, {
+  silent = true,
+  desc = "reload init.lua",
+})
+
+-- Reselect the text that has just been pasted, see also https://stackoverflow.com/a/4317090/6064933.
+keymap.set("n", "<leader>v", "printf('`[%s`]', getregtype()[0])", {
+  expr = true,
+  desc = "reselect last pasted area",
+})
+
+-- Always use very magic mode for searching
+keymap.set("n", "/", [[/\v]])
+
+-- Search in selected region
+-- xnoremap / :<C-U>call feedkeys('/\%>'.(line("'<")-1).'l\%<'.(line("'>")+1)."l")<CR>
+
+-- Change current working directory locally and print cwd after that,
+-- see https://vim.fandom.com/wiki/Set_working_directory_to_the_current_file
+keymap.set("n", "<leader>cd", "<cmd>lcd %:p:h<cr><cmd>pwd<cr>", { desc = "change cwd" })
+
+-- Use Esc to quit builtin terminal
+keymap.set("t", "<Esc>", [[<c-\><c-n>]])
+
+-- Toggle spell checking
+keymap.set("n", "<F11>", "<cmd>set spell!<cr>", { desc = "toggle spell" })
+keymap.set("i", "<F11>", "<c-o><cmd>set spell!<cr>", { desc = "toggle spell" })
+
+-- Change text without putting it into the vim register,
+-- see https://stackoverflow.com/q/54255/6064933
+keymap.set("n", "c", '"_c')
+keymap.set("n", "C", '"_C')
+keymap.set("n", "cc", '"_cc')
+keymap.set("x", "c", '"_c')
+
+-- Remove trailing whitespace characters
+keymap.set("n", "<leader><space>", "<cmd>StripTrailingWhitespace<cr>", { desc = "remove trailing space" })
+
+-- check the syntax group of current cursor position
+keymap.set("n", "<leader>st", "<cmd>call utils#SynGroup()<cr>", { desc = "check syntax group" })
+
+-- Copy entire buffer.
+keymap.set("n", "<leader>y", "<cmd>%yank<cr>", { desc = "yank entire buffer" })
+
+-- Toggle cursor column
+keymap.set("n", "<leader>cl", "<cmd>call utils#ToggleCursorCol()<cr>", { desc = "toggle cursor column" })
+
+-- Move current line up and down
+keymap.set("n", "<A-k>", '<cmd>call utils#SwitchLine(line("."), "up")<cr>', { desc = "move line up" })
+keymap.set("n", "<A-j>", '<cmd>call utils#SwitchLine(line("."), "down")<cr>', { desc = "move line down" })
+
+-- Move current visual-line selection up and down
+keymap.set("x", "<A-k>", '<cmd>call utils#MoveSelection("up")<cr>', { desc = "move selection up" })
+
+keymap.set("x", "<A-j>", '<cmd>call utils#MoveSelection("down")<cr>', { desc = "move selection down" })
+
+-- Replace visual selection with text in register, but not contaminate the register,
+-- see also https://stackoverflow.com/q/10723700/6064933.
+keymap.set("x", "p", '"_c<Esc>p')
+
+-- Go to a certain buffer
+keymap.set("n", "gb", '<cmd>call buf_utils#GoToBuffer(v:count, "forward")<cr>', {
+  desc = "go to buffer (forward)",
+})
+keymap.set("n", "gB", '<cmd>call buf_utils#GoToBuffer(v:count, "backward")<cr>', {
+  desc = "go to buffer (backward)",
+})
+
+-- Switch windows
+keymap.set("n", "<left>", "<c-w>h")
+keymap.set("n", "<Right>", "<C-W>l")
+keymap.set("n", "<Up>", "<C-W>k")
+keymap.set("n", "<Down>", "<C-W>j")
+
+-- Text objects for URL
+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" })
+
+-- Do not move my cursor when joining lines.
+keymap.set("n", "J", function()
+  vim.cmd([[
+      normal! mzJ`z
+      delmarks z
+    ]])
+end, {
+  desc = "join line",
+})
+
+keymap.set("n", "gJ", function()
+  -- we must use `normal!`, otherwise it will trigger recursive mapping
+  vim.cmd([[
+      normal! zmgJ`z
+      delmarks z
+    ]])
+end, {
+  desc = "join visual lines",
+})
+
+-- Break inserted text into smaller undo units when we insert some punctuation chars.
+local undo_ch = { ",", ".", "!", "?", ";", ":" }
+for _, ch in ipairs(undo_ch) do
+  keymap.set("i", ch, ch .. "<c-g>u")
+end
+
+-- insert semicolon in the end
+keymap.set("i", "<A-;>", "<Esc>miA;<Esc>`ii")
+
+-- 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>")
+
+-- Go to beginning of command in command-line mode
+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)

lua/plugin_specs.lua

@@ -0,0 +1,502 @@
+local utils = require("utils")
+
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+
+if not vim.loop.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",
+    },
+  },
+
+  -- 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 },
+  { "shaunsingh/nord.nvim", lazy = true },
+  { "sainnhe/everforest", lazy = true },
+  { "EdenEast/nightfox.nvim", lazy = true },
+  { "rebelot/kanagawa.nvim", lazy = true },
+  { "catppuccin/nvim", name = "catppuccin", lazy = true },
+  { "olimorris/onedarkpro.nvim", lazy = true },
+  { "tanvirtin/monokai.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
+  { "Raimondi/delimitMate", event = "InsertEnter" },
+
+  -- 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" } },
+  { "christoomey/vim-conflicted", cmd = { "Conflicted" } },
+  {
+    "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,
+  },
+
+  { "ii14/emmylua-nvim", ft = "lua" },
+  {
+    "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)

lua/plugins.lua

@@ -1,370 +0,0 @@
-local utils = require("utils")
-local fn = vim.fn
-
-vim.g.package_home = fn.stdpath("data") .. "/site/pack/packer/"
-local packer_install_dir = vim.g.package_home .. "/opt/packer.nvim"
-
-local packer_repo = "https://github.com/wbthomason/packer.nvim"
-local install_cmd = string.format("10split |term git clone --depth=1 %s %s", packer_repo, packer_install_dir)
-
--- Auto-install packer in case it hasn't been installed.
-if fn.glob(packer_install_dir) == "" then
-  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')
-
-packer.startup({
-  function(use)
-    -- it is recommened 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-nvim-lua", 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 {"hrsh7th/cmp-cmdline", 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
-    }
-
-    -- Clear highlight search automatically for you
-    -- use({"romainl/vim-cool", event = "VimEnter"})
-
-    -- 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'}
-
-    -- Another similar plugin is command-t
-    -- use 'wincent/command-t'
-
-    -- Another grep tool (similar to Sublime Text Ctrl+Shift+F)
-    -- use 'dyng/ctrlsf.vim'
-
-    -- A grepping tool
-    -- use {'mhinz/vim-grepper', cmd = {'Grepper', '<plug>(GrepperOperator)'}}
-
-    -- 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})
-
-    -- Show git change (change, delete, add) signs in vim sign column
-    use({"mhinz/vim-signify", event = 'BufEnter'})
-    -- Another similar plugin
-    -- use 'airblade/vim-gitgutter'
-
-    use {'kyazdani42/nvim-web-devicons', event = 'VimEnter'}
-
-    use {
-      'nvim-lualine/lualine.nvim',
-      event = 'VimEnter',
-      config = [[require('config.statusline')]]
-    }
-
-    use({ "akinsho/bufferline.nvim", event = "VimEnter", config = [[require('config.bufferline')]] })
-
-    -- fancy start screen
-    use { 'glepnir/dashboard-nvim', event = "VimEnter", 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"})
-
-    -- Show the content of register in preview window
-    -- Plug 'junegunn/vim-peekaboo'
-    use({ "jdhao/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
-
-    -- Syntax check and make
-    -- use 'neomake/neomake'
-
-    -- Auto format tools
-    use({ "sbdchd/neoformat", cmd = { "Neoformat" } })
-    -- use 'Chiel92/vim-autoformat'
-
-    -- Git command inside vim
-    use({ "tpope/vim-fugitive", event = "User InGitRepo" })
-
-    -- 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({ "kevinhwang91/nvim-bqf", ft = "qf", config = [[require('config.bqf')]] })
-
-    -- Better git commit experience
-    use({"rhysd/committia.vim", opt = true, setup = [[vim.cmd('packadd committia.vim')]]})
-
-    -- Another markdown plugin
-    use({ "plasticboy/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 = function()
-          fn["mkdp#util#install"]()
-        end,
-        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 'tpope/vim-surround'
-    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" } })
-
-      -- use {'matze/vim-tex-fold', ft = {'tex', }}
-      -- use 'Konfekt/FastFold'
-    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 'psliwka/vim-smoothie'
-    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" } })
-    -- Another asynchronous plugin
-    -- Plug 'tpope/vim-dispatch'
-
-    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'),
-  },
-})
-
-local status, _ = pcall(require, 'packer_compiled')
-if not status then
-  vim.notify("Error requiring packer_compiled.lua: run PackerSync to fix!")
-end

lua/utils.lua

@@ -1,10 +1,5 @@
 local fn = vim.fn
 
--- inspect something
-function _G.inspect(item)
-  vim.pretty_print(item)
-end
-
 local M = {}
 
 function M.executable(name)
@@ -15,21 +10,50 @@ function M.executable(name)
   return false
 end
 
-function M.may_create_dir()
-  local fpath = fn.expand('<afile>')
-  local parent_dir = fn.fnamemodify(fpath, ":p:h")
-  local res = fn.isdirectory(parent_dir)
+--- check whether a feature exists in Nvim
+--- @feat: string
+---   the feature name, like `nvim-0.7` or `unix`.
+--- return: bool
+M.has = function(feat)
+  if fn.has(feat) == 1 then
+    return true
+  end
+
+  return false
+end
+
+--- Create a dir if it does not exist
+function M.may_create_dir(dir)
+  local res = fn.isdirectory(dir)
 
   if res == 0 then
-    fn.mkdir(parent_dir, 'p')
+    fn.mkdir(dir, "p")
   end
 end
 
-function M.get_nvim_version()
-  local actual_ver = vim.version()
+--- Generate random integers in the range [Low, High], inclusive,
+--- adapted from https://stackoverflow.com/a/12739441/6064933
+--- @low: the lower value for this range
+--- @high: the upper value for this range
+function M.rand_int(low, high)
+  -- Use lua to generate random int, see also: https://stackoverflow.com/a/20157671/6064933
+  math.randomseed(os.time())
 
-  local nvim_ver_str = string.format("%d.%d.%d", actual_ver.major, actual_ver.minor, actual_ver.patch)
-  return nvim_ver_str
+  return math.random(low, high)
+end
+
+--- Select a random element from a sequence/list.
+--- @seq: the sequence to choose an element
+function M.rand_element(seq)
+  local idx = M.rand_int(1, #seq)
+
+  return seq[idx]
+end
+
+function M.add_pack(name)
+  local status, error = pcall(vim.cmd, "packadd " .. name)
+
+  return status
 end
 
 return M

my_snippets/markdown.snippets

@@ -47,7 +47,7 @@ $0
 endsnippet
 
 snippet font "HTML font tag"
-<font color="${1:red}">${2:TEXT}</font>
+<font color="${1:blue}">${2:TEXT}</font>
 endsnippet
 
 snippet link "Markdown links"

my_snippets/tex.snippets

@@ -2,7 +2,7 @@ snippet use "usepackage" b
 \usepackage{${1:package}}
 endsnippet
 
-snippet eqa "equation enviroment" b
+snippet eqa "equation environment" b
 \begin{equation}\label{$1}
 	$2
 \end{equation}

plugin/abbrev.vim

@@ -0,0 +1,3 @@
+" some abbreviations
+iabbrev reqire require
+iabbrev serveral several

plugin/command.vim

@@ -45,3 +45,6 @@ function! s:md_to_pdf() abort
     echoerr "Error running command"
   endif
 endfunction
+
+" json format
+command! -range JSONFormat <line1>,<line2>!python -m json.tool

spell/en.utf-8.add

@@ -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
@@ -430,3 +431,39 @@ metatable
 open3d
 pyntcloud
 param
+reddit
+viml
+PostgreSQL
+CNY
+wechat
+ziroom
+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

viml_conf/autocommands.vim

@@ -41,26 +41,6 @@ function s:resume_cursor_position() abort
   endif
 endfunction
 
-" Display a message when the current file is not in utf-8 format.
-" Note that we need to use `unsilent` command here because of this issue:
-" https://github.com/vim/vim/issues/4379
-augroup non_utf8_file_warn
-  autocmd!
-  " we can not use `lua vim.notify()`: it will error out E5107 parsing lua.
-  autocmd BufRead * if &fileencoding != 'utf-8' | call v:lua.vim.notify('File not in UTF-8 format!', 'warn', {'title': 'nvim-config'}) | endif
-augroup END
-
-" Automatically reload the file if it is changed outside of Nvim, see
-" https://unix.stackexchange.com/a/383044/221410. It seems that `checktime`
-" command does not work in command line. We need to check if we are in command
-" line before executing this command. See also
-" https://vi.stackexchange.com/a/20397/15292.
-augroup auto_read
-  autocmd!
-  autocmd FileChangedShellPost * call v:lua.vim.notify("File changed on disk. Buffer reloaded!", 'warn', {'title': 'nvim-config'})
-  autocmd FocusGained,CursorHold * if getcmdwintype() == '' | checktime | endif
-augroup END
-
 augroup numbertoggle
   autocmd!
   autocmd BufEnter,FocusGained,InsertLeave,WinEnter * if &nu | set rnu   | endif
@@ -88,12 +68,6 @@ function! s:custom_highlight() abort
   highlight MatchParen cterm=bold,underline gui=bold,underline
 endfunction
 
-" highlight yanked region, see `:h lua-highlight`
-augroup highlight_yank
-  autocmd!
-  au TextYankPost * silent! lua vim.highlight.on_yank{higroup="YankColor", timeout=300, on_visual=false}
-augroup END
-
 augroup auto_close_win
   autocmd!
   autocmd BufEnter * call s:quit_current_win()
@@ -125,17 +99,6 @@ augroup git_repo_check
   autocmd VimEnter,DirChanged * call utils#Inside_git_repo()
 augroup END
 
-" Auto-generate packer_compiled.lua file
-augroup packer_auto_compile
-  autocmd!
-  autocmd BufWritePost */nvim/lua/plugins.lua source <afile> | PackerCompile
-augroup END
-
-augroup auto_create_dir
-  autocmd!
-  autocmd BufWritePre * lua require('utils').may_create_dir()
-augroup END
-
 " ref: https://vi.stackexchange.com/a/169/15292
 function! s:handle_large_file() abort
   let g:large_file = 10485760 " 10MB
@@ -155,3 +118,6 @@ augroup LargeFile
   autocmd!
   autocmd BufReadPre * call s:handle_large_file()
 augroup END
+
+" Load auto-command defined in Lua
+lua require("custom-autocmd")

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
@@ -162,7 +159,7 @@ set termguicolors
 " https://github.com/neovim/neovim/wiki/FAQ#how-to-change-cursor-color-in-the-terminal
 set guicursor=n-v-c:block-Cursor/lCursor,i-ci-ve:ver25-Cursor2/lCursor2,r-cr:hor20,o:hor20
 
-set signcolumn=auto:2
+set signcolumn=yes:1
 
 " Remove certain character from file name pattern matching
 set isfname-==
@@ -175,5 +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

viml_conf/plugins.vim

@@ -1,16 +1,16 @@
 scriptencoding utf-8
 
 " Plugin specification and lua stuff
-lua require('lua-init')
+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
 
@@ -182,23 +171,7 @@ let g:neoformat_c_clangformat = {
 let g:neoformat_enabled_cpp = ['clangformat']
 let g:neoformat_enabled_c = ['clangformat']
 
-"""""""""""""""""""""""""vim-signify settings""""""""""""""""""""""""""""""
-" The VCS to use
-let g:signify_vcs_list = [ 'git' ]
-
-" Change the sign for certain operations
-let g:signify_sign_change = '~'
-
-"""""""""""""""""""""""""vim-fugitive settings""""""""""""""""""""""""""""""
-nnoremap <silent> <leader>gs :Git<CR>
-nnoremap <silent> <leader>gw :Gwrite<CR>
-nnoremap <silent> <leader>gc :Git commit<CR>
-nnoremap <silent> <leader>gd :Gdiffsplit<CR>
-nnoremap <silent> <leader>gpl :Git pull<CR>
-" Note that to use bar literally, we need backslash it, see also `:h :bar`.
-nnoremap <silent> <leader>gpu :15split \| term git push<CR>
-
-"""""""""""""""""""""""""plasticboy/vim-markdown settings"""""""""""""""""""
+"""""""""""""""""""""""""vim-markdown settings"""""""""""""""""""
 " Disable header folding
 let g:vim_markdown_folding_disabled = 1
 
@@ -259,8 +232,8 @@ nmap s <Nop>
 omap s <Nop>
 
 """"""""""""""""""""""""""""vimtex settings"""""""""""""""""""""""""""""
-if ( g:is_win || g:is_mac ) && executable('latex')
-  " Hacks for inverse serach to work semi-automatically,
+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
     let nvim_server_file = (has('win32') ? $TEMP : '/tmp') . '/vimtexserver.txt'
@@ -320,11 +293,6 @@ if ( g:is_win || g:is_mac ) && executable('latex')
   endif
 endif
 
-""""""""""""""""""""""""""""vim-startify settings""""""""""""""""""""""""""""
-" Do not change working directory when opening files.
-let g:startify_change_to_dir = 0
-let g:startify_fortune_use_unicode = 1
-
 """"""""""""""""""""""""""""vim-matchup settings"""""""""""""""""""""""""""""
 " Improve performance
 let g:matchup_matchparen_deferred = 1
@@ -371,16 +339,20 @@ if exists('g:started_by_firenvim') && g:started_by_firenvim
       \ }
   \ }
 
-  function! s:setup_firenvim() abort
-    set noruler noshowcmd
-    set laststatus=0 showtabline=0
+  function s:setup_firenvim() abort
+    set signcolumn=no
+    set noruler
+    set noshowcmd
+    set laststatus=0
+    set showtabline=0
   endfunction
 
   augroup firenvim
     autocmd!
-    autocmd FileType text call s:setup_firenvim()
-    autocmd BufNewFile github.com_*.txt set filetype=markdown
-    autocmd BufNewFile stackoverflow.com_*.txt set filetype=markdown
+    autocmd BufEnter * call s:setup_firenvim()
+    autocmd BufEnter sqlzoo*.txt set filetype=sql
+    autocmd BufEnter github.com_*.txt set filetype=markdown
+    autocmd BufEnter stackoverflow.com_*.txt set filetype=markdown
   augroup END
 endif
 
@@ -429,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