bump minimum supported nvim version to 0.6.1

Newline is converted to NUL character, which is nasty, see also https://vi.stackexchange.com/q/6697/15292.

README.md

@@ -6,6 +6,26 @@
 ██   ████   ████   ██ ██      ██      ██████  ██████  ██   ████ ██      ██  ██████
 ```
 
+<div align="center"><p>
+    <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/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">
+    <img src="https://img.shields.io/github/repo-size/jdhao/nvim-config?style=flat-square&label=Repo" alt="Repo size">
+    </a>
+    <a href="https://github.com/neovim/neovim/releases/tag/v0.6.1">
+     <img src="https://img.shields.io/badge/Neovim-0.6.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
+    </a>
+    <img src="https://img.shields.io/github/languages/top/jdhao/nvim-config" />
+    <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>
+</p>
+</div>
+
 # Introduction
 
 This repo hosts my Nvim configuration for all the platforms I am using (Linux,
@@ -22,8 +42,8 @@ add it to your own Nvim config.
 See [doc here](docs/README.md) on how to install Nvim's dependencies, Nvim
 itself, and how to set up on different platforms (Linux, macOS and Windows).
 
-**This config is tested against Nvim 0.5.1 release. No backward compatibility
-is guaranteed.**
+**This config is tested against [Nvim v0.6.1 release](https://github.com/neovim/neovim/releases/tag/v0.6.0).
+No backward compatibility is guaranteed.**
 
 # Features #
 
@@ -37,7 +57,7 @@ is guaranteed.**
 + Smarter and faster matching pair management (add, replace or delete) via [vim-sandwich](https://github.com/machakann/vim-sandwich).
 + Fast buffer jump via [hop.nvim](https://github.com/phaazon/hop.nvim).
 + Ultra fast snippet insertion via [Ultisnips](https://github.com/SirVer/ultisnips).
-+ Beautiful status line via [vim-airline](https://github.com/vim-airline/vim-airline).
++ Beautiful status line via [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim).
 + 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).
@@ -71,7 +91,7 @@ For more UI demos, see [here](https://github.com/jdhao/nvim-config/issues/15).
 <img src="https://user-images.githubusercontent.com/16662357/139462025-7bce98c5-d2d5-413f-9659-20545865cdca.gif" width="800">
 </p>
 
-## Autocompletion
+## Code autocompletion with nvim-cmp
 
 <p align="center">
 <img src="https://user-images.githubusercontent.com/16662357/128590006-0fc1451f-fac1-49b2-bb95-8aba21bfa44e.gif" width="800">
@@ -83,6 +103,12 @@ For more UI demos, see [here](https://github.com/jdhao/nvim-config/issues/15).
 <img src="https://user-images.githubusercontent.com/16662357/128590833-aaa05d53-19ef-441d-a5a9-ba1bbd3936c1.gif" width="800">
 </p>
 
+## Command-line autocompletion with wilder.nvim
+
+<p align="center">
+<img src="https://user-images.githubusercontent.com/16662357/147677787-8e5d229a-a16a-420e-98f5-88f2a1be84a2.gif" width="800">
+</p>
+
 ## Tags
 
 <p align="center">
@@ -97,7 +123,7 @@ Go to a string starting with `se`
 <img src="https://user-images.githubusercontent.com/16662357/139459219-8a7e6ac4-1d24-4008-a370-b56773d7cb85.gif" width="800">
 </p>
 
-## GUI-style notification
+## GUI-style notification with nvim-notify
 
 <p align="center">
 <img src="https://user-images.githubusercontent.com/16662357/128589873-aadb8264-1098-4834-9876-fa66a309be05.gif" width="800">
@@ -130,6 +156,8 @@ represents ASCII character `,`.
 | `<leader>cd`      | Normal        | Linux/macOS/Win | Change current working directory to to the dir of current buffer |
 | `<space>t`        | Normal        | Linux/macOS/Win | Toggle tag window (show project tags in the right window)        |
 | `<leader>gs`      | Normal        | Linux/macOS/Win | Show Git status result                                           |
+| `<leader>gw`      | Normal        | Linux/macOS/Win | Run Git add for current file                                     |
+| `<leader>gd`      | Normal        | Linux/macOS/Win | Run git diff for current file                                    |
 | `<leader>gc`      | Normal        | Linux/macOS/Win | Run git commit                                                   |
 | `<F9>`            | Normal        | Linux/macOS/Win | Run current source file (for Python, C++)                        |
 | `<F11>`           | Normal        | Linux/macOS/Win | Toggle spell checking                                            |
@@ -144,6 +172,17 @@ represents ASCII character `,`.
 | `ctrl-t`          | Insert        | Linux/macOS/Win | Turn word under cursor to title case                             |
 | `jk`              | Insert        | Linux/macOS/Win | Return to Normal mode without lagging                            |
 
+# Custom commands
+
+In addition to commands provided by various plugins, I have also created
+several custom commands for personal use.
+
+| command    | description                                                             | example                        |
+|------------|-------------------------------------------------------------------------|--------------------------------|
+| `Redir`    | capture command output to a tabpage for easier inspection.              | `Redir hi`                     |
+| `Edit`     | edit multiple files at the same time, supports globing                  | `Edit *.vim`                   |
+| `Datetime` | print current date and time or convert Unix time stamp to date and time | `Datetime 12345` or `Datetime` |
+
 # Trouble shooting
 
 If you come across an issue, you can first use `:checkhealth` command provided
@@ -154,7 +193,7 @@ If you still have an issue, [open a new issue](https://github.com/jdhao/nvim-con
 
 # Further readings
 
-Some of the resources that I find helpful in mastering Vim is documented [here](docs/vim_resources.md).
+Some of the resources that I find helpful in mastering Vim is documented [here](docs/nvim_resources.md).
 You may also be interested in my post in configuring Vim on different platforms:
 
 + [Config nvim on Linux for Python development](https://jdhao.github.io/2018/12/24/centos_nvim_install_use_guide_en/)

after/ftplugin/markdown.vim

@@ -1,6 +1,8 @@
 set concealcursor=c
 set synmaxcol=3000  " For long Chinese paragraphs
 
+set wrap
+
 " Fix minor issue with footnote, see https://github.com/vim-pandoc/vim-markdownfootnotes/issues/22
 if exists(':FootnoteNumber')
   nnoremap <buffer><silent> ^^ :<C-U>call markdownfootnotes#VimFootnotes('i')<CR>

after/ftplugin/tex.vim

@@ -1 +1,3 @@
 set textwidth=79
+
+set wrap

after/ftplugin/vim.vim

@@ -6,8 +6,7 @@ set formatoptions-=r
 " modeline is annoying in that the modeline get executed each time the window
 " focus is lost (see
 " https://github.com/tmux-plugins/vim-tmux-focus-events/issues/14)
-set foldmethod=expr foldlevel=0 foldlevelstart=-1
-      \ foldexpr=utils#VimFolds(v:lnum) foldtext=utils#MyFoldText()
+set foldmethod=expr foldexpr=utils#VimFolds(v:lnum) foldtext=utils#MyFoldText()
 
 " Use :help command for keyword when pressing `K` in vim file,
 " see `:h K` and https://stackoverflow.com/q/15867323/6064933

autoload/utils.vim

@@ -27,12 +27,6 @@ function! utils#HasColorscheme(name) abort
   return !empty(globpath(&runtimepath, l:pat))
 endfunction
 
-" Check if an Airline theme exists in runtimepath.
-function! utils#HasAirlinetheme(name) abort
-  let l:pat = printf('autoload/airline/themes/%s.vim', a:name)
-  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
@@ -145,8 +139,12 @@ function! utils#Get_titlestr() abort
   return l:title_str
 endfunction
 
-" Output current time in ISO format.
-function! utils#iso_time() abort
+" 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)
+  endif
+
   return strftime('%Y-%m-%d %H:%M:%S%z')
 endfunction
 
@@ -176,13 +174,18 @@ endfunction
 " Redirect command output to a register for later processing.
 " Ref: https://stackoverflow.com/q/2573021/6064933 and https://unix.stackexchange.com/q/8101/221410 .
 function! utils#CaptureCommandOutput(command) abort
+  let l:tmp = @m
   redir @m
-  execute a:command
+  silent! execute a:command
   redir END
-  call v:lua.vim.notify("command output captured to register m", "info", {'title': 'nvim-config'})
+
   "create a scratch buffer for dumping the text, ref: https://vi.stackexchange.com/a/11311/15292.
   tabnew | setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile
-  call nvim_buf_set_lines(0, 0, 0, 0, [@m])
+
+  let l:lines = split(@m, '\n')
+  call nvim_buf_set_lines(0, 0, 0, 0, l:lines)
+
+  let @m = l:tmp
 endfunction
 
 " Edit all files matching the given patterns.
@@ -193,3 +196,14 @@ 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/autocommands.vim

@@ -19,13 +19,28 @@ augroup accurate_syn_highlight
   autocmd BufEnter * :syntax sync fromstart
 augroup END
 
-" Return to last edit position when opening a file
-augroup resume_edit_position
+" Return to last cursor position when opening a file
+augroup resume_cursor_position
   autocmd!
-  autocmd BufReadPost *
-        \ if line("'\"") > 1 && line("'\"") <= line("$") && &ft !~# 'commit' | execute "normal! g`\"zvzz" | endif
+  autocmd BufReadPost * call s:resume_cursor_position()
 augroup END
 
+" Only resume last cursor position when there is no go-to-line command (something like '+23').
+function s:resume_cursor_position() abort
+  if line("'\"") > 1 && line("'\"") <= line("$") && &ft !~# 'commit'
+    let l:args = v:argv  " command line arguments
+    for l:cur_arg in l:args
+      " Check if a go-to-line command is given.
+      let idx = match(l:cur_arg, '\v^\+(\d){1,}$')
+      if idx != -1
+        return
+      endif
+    endfor
+
+    execute "normal! g`\"zvzz"
+  endif
+endfunction
+
 " 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
@@ -103,9 +118,3 @@ augroup packer_auto_compile
   autocmd!
   autocmd BufWritePost */nvim/lua/plugins.lua source <afile> | PackerCompile
 augroup END
-
-" Remove trailing whitespaces
-augroup strip_trailing_space
-  autocmd!
-  autocmd BufWritePre,TextChanged * StripTrailingWhitespace
-augroup END

core/globals.vim

@@ -34,10 +34,13 @@ else
 endif
 
 " Custom mapping <leader> (see `:h mapleader` for more info)
-let mapleader = ','
+let g:mapleader = ','
 
 " Enable highlighting for lua HERE doc inside vim script
 let g:vimsyn_embed = 'l'
+
+" Use English as main language
+language en_US.utf-8
 "}}
 
 "{{ Disable loading certain plugins

core/mappings.vim

@@ -45,18 +45,12 @@ 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 oo :echo 'Please use <lt>space>o instead'<CR>
-nnoremap OO :echo 'Please use <lt>space>O instead'<CR>
 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
 
-" Yank from current cursor position to the end of the line (make it
-" consistent with the behavior of D, C)
-nnoremap Y y$
-
 " 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')

core/options.vim

@@ -35,10 +35,7 @@ set wildignore+=*.aux,*.bbl,*.blg,*.brf,*.fls,*.fdb_latexmk,*.synctex.gz,*.xdv
 set wildignorecase  " ignore file and dir name cases in cmd-completion
 
 " Set up backup directory
-let g:backupdir=expand(stdpath('data') . '/backup')
-if !isdirectory(g:backupdir)
-   call mkdir(g:backupdir, 'p')
-endif
+let g:backupdir=expand(stdpath('data') . '/backup//')
 let &backupdir=g:backupdir
 
 " Skip backup for patterns in option wildignore
@@ -79,13 +76,11 @@ set scrolloff=3
 set mouse=nic  " Enable mouse in several mode
 set mousemodel=popup  " Set the behaviour of mouse
 
-" Do not show mode on command line since vim-airline can show it
+" Disable showing current mode on command line since statusline plugins can show it.
 set noshowmode
 
 set fileformats=unix,dos  " Fileformats to use for new files
 
-set inccommand=nosplit  " Show the result of substitution in real time for preview
-
 " Ask for confirmation when handling unsaved or read-only files
 set confirm
 
@@ -146,10 +141,6 @@ set formatoptions+=mM
 " Tilde (~) is an operator, thus must be followed by motions like `e` or `w`.
 set tildeop
 
-" Do not add two spaces after a period when joining lines or formatting texts,
-" see https://stackoverflow.com/q/4760428/6064933
-set nojoinspaces
-
 set synmaxcol=200  " Text after this column number is not highlighted
 set nostartofline
 
@@ -181,3 +172,5 @@ 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 nowrap  " do no wrap

core/plugins.vim

@@ -37,15 +37,6 @@ let g:semshi#error_sign=v:false
 """""""""""""""""""""""""" vlime settings """"""""""""""""""""""""""""""""
 command! -nargs=0 StartVlime call jobstart(printf("sbcl --load %s/vlime/lisp/start-vlime.lisp", g:package_home))
 
-""""""""""""""""""""""""""""" settings for nvim-hlslens"""""""""""""""
-noremap <silent> n <Cmd>execute('normal! ' . v:count1 . 'nzzzv')<CR>
-            \<Cmd>lua require('hlslens').start()<CR>
-noremap <silent> N <Cmd>execute('normal! ' . v:count1 . 'Nzzzv')<CR>
-            \<Cmd>lua require('hlslens').start()<CR>
-
-map *  <Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>
-map #  <Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>
-
 """""""""""""""""""""""""""""LeaderF settings"""""""""""""""""""""
 " Do not use cache file
 let g:Lf_UseCache = 0
@@ -84,6 +75,12 @@ let g:Lf_PopupPosition = [0, float2nr((&columns - g:Lf_PopupWidth)/2)]
 " submodules are not searched by default.
 let g:Lf_UseVersionControlTool = 0
 
+" Use rg as the default search tool
+let g:Lf_DefaultExternalTool = "rg"
+
+" show dot files
+let g:Lf_ShowHidden = 1
+
 " Disable default mapping
 let g:Lf_ShortcutF = ''
 let g:Lf_ShortcutB = ''
@@ -95,7 +92,7 @@ let g:Lf_WorkingDirectoryMode = 'a'
 nnoremap <silent> <leader>ff :<C-U>Leaderf file --popup<CR>
 
 " Grep project files in popup window
-nnoremap <silent> <leader>fg :<C-U>Leaderf rg --popup<CR>
+nnoremap <silent> <leader>fg :<C-U>Leaderf rg --no-messages --popup<CR>
 
 " Search vim help files
 nnoremap <silent> <leader>fh :<C-U>Leaderf help --popup<CR>
@@ -127,14 +124,6 @@ if g:is_win || g:is_mac
   xmap ob <Plug>(openbrowser-smart-search)
 endif
 
-""""""""""""""""""""""""""" gutentags settings """"""""""""""""""""""""""""""
-" The path to store tags files, instead of in the project root.
-let g:gutentags_cache_dir = stdpath('cache') . '/ctags'
-let g:gutentags_ctags_extra_args = ['--fields=+niazS', '--extra=+q']
-let g:gutentags_ctags_extra_args += ['--c++-kinds=+px']
-let g:gutentags_ctags_extra_args += ['--c-kinds=+px']
-let g:gutentags_ctags_exclude = ['*.md', '*.html', '*.json', '*.toml', '*.css', '*.js',]
-
 """"""""""""""""""""""""""" vista settings """"""""""""""""""""""""""""""""""
 let g:vista#renderer#icons = {
       \ 'member': '',
@@ -209,9 +198,10 @@ let g:signify_sign_change = '~'
 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
+nnoremap <silent> <leader>gpu :15split \| term git push<CR>
 
 """""""""""""""""""""""""plasticboy/vim-markdown settings"""""""""""""""""""
 " Disable header folding
@@ -336,58 +326,6 @@ if ( g:is_win || g:is_mac ) && executable('latex')
   endif
 endif
 
-"""""""""""""""""""""""""""vim-airline setting""""""""""""""""""""""""""""""
-" Set airline theme to a random one if it exists
-let s:candidate_airlinetheme = ['ayu_mirage', 'lucius', 'ayu_dark', 'base16_bright',
-      \ 'base16_adwaita', 'raven', 'term', 'deus', 'onedark']
-let g:airline_theme = utils#RandElement(s:candidate_airlinetheme)
-
-" Whether to show function or other tags on status line
-let g:airline#extensions#vista#enabled = 0
-let g:airline#extensions#gutentags#enabled = 1
-
-" Do not show search index in statusline since it is shown on command line
-let g:airline#extensions#anzu#enabled = 0
-
-" Enable vim-airline extension for nvim-lsp
-let g:airline#extensions#nvimlsp#enabled = 1
-
-let g:airline#extensions#searchcount#enabled = 0
-
-" Skip empty sections if there are nothing to show,
-" extracted from https://vi.stackexchange.com/a/9637/15292
-let g:airline_skip_empty_sections = 1
-
-" Whether to use powerline symbols, see https://vi.stackexchange.com/q/3359/15292
-let g:airline_powerline_fonts = 0
-
-if !exists('g:airline_symbols')
-  let g:airline_symbols = {}
-endif
-let g:airline_symbols.paste = 'ρ'
-let g:airline_symbols.linenr = " L:"
-let g:airline_symbols.colnr = "  C:"
-
-if !g:is_linux
-  let g:airline_symbols.branch = ''
-  let g:airline_symbols.spell = 'Ꞩ'
-endif
-
-" Custom branch name
-let g:airline#extensions#branch#custom_head = 'utils#GetGitBranch'
-
-" Only show git hunks which are non-zero
-let g:airline#extensions#hunks#non_zero_only = 1
-
-" Speed up airline
-let g:airline_highlighting_cache = 1
-
-" The keys in the following shortcode are the layout when we use a specific
-" input method mode. On my macOS, 0 means that we are trying to input Chinese,
-" and 1 means we are using English mode.
-" See also https://github.com/vim-airline/vim-airline/blob/master/autoload/airline/extensions/xkblayout.vim#L11
-let g:airline#extensions#xkblayout#short_codes = {'0': 'CN', '1': 'US'}
-
 """"""""""""""""""""""""""""vim-startify settings""""""""""""""""""""""""""""
 " Do not change working directory when opening files.
 let g:startify_change_to_dir = 0
@@ -493,6 +431,6 @@ function! s:wilder_init() abort
           \ 'apply_incsearch_fix': 0,
           \ }))
   catch /^Vim\%((\a\+)\)\=:E117/
-    echohl Error |echomsg "Wilder.nvim missing. Run :PackerInstall to install all plugins."|echohl None
+    echohl Error |echomsg "Wilder.nvim missing: run :PackerSync to fix."|echohl None
   endtry
 endfunction

core/themes.vim

@@ -1,8 +1,6 @@
-let s:my_theme_dict = {}
-
-function! s:my_theme_dict.gruvbox8() dict abort
-  packadd! vim-gruvbox8
+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
@@ -12,83 +10,82 @@ function! s:my_theme_dict.gruvbox8() dict abort
   colorscheme gruvbox8_hard
 endfunction
 
-function! s:my_theme_dict.onedark() dict abort
-  packadd! onedark.nvim
-
+function! s:theme_setup_dict.onedark() dict abort
   colorscheme onedark
 endfunction
 
-function! s:my_theme_dict.edge() dict abort
-  packadd! edge
-
+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:my_theme_dict.sonokai() dict abort
-  packadd! sonokai
-
+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:my_theme_dict.gruvbox_material() dict abort
-  packadd! gruvbox-material
-
+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:my_theme_dict.nord() dict abort
-  packadd! nord.nvim
-
+function! s:theme_setup_dict.nord() dict abort
   colorscheme nord
 endfunction
 
-function! s:my_theme_dict.doom_one() dict abort
-  packadd! doom-one.nvim
+function! s:theme_setup_dict.doom_one() dict abort
   colorscheme doom-one
 endfunction
 
-function! s:my_theme_dict.everforest() dict abort
-  packadd! everforest
-
+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:my_theme_dict.nightfox() dict abort
-  packadd! nightfox.nvim
-
+function! s:theme_setup_dict.nightfox() dict abort
   colorscheme nordfox
 endfunction
 
-let s:candidate_theme = [
-      \ 'gruvbox8',
-      \ 'onedark',
-      \ 'edge',
-      \ 'sonokai',
-      \ 'gruvbox_material',
-      \ 'nord',
-      \ 'doom_one',
-      \ 'everforest',
-      \ 'nightfox'
-      \ ]
+function! s:theme_setup_dict.kanagawa() dict abort
+  colorscheme kanagawa
+endfunction
 
-let s:theme = utils#RandElement(s:candidate_theme)
-let s:colorscheme_func = printf('s:my_theme_dict.%s()', s:theme)
+" 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',
+      \ }
 
-if has_key(s:my_theme_dict, s:theme)
-  execute 'call ' . s:colorscheme_func
-  if g:logging_level == 'debug'
-    let s:msg1 = "Currently loaded theme: " . s:theme
-    call v:lua.vim.notify(s:msg1, 'info', {'title': 'nvim-config'})
-  endif
-else
+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 = "Currently loaded theme: " . s:theme
+  call v:lua.vim.notify(s:msg1, 'info', {'title': 'nvim-config'})
 endif

docs/README.md

@@ -78,7 +78,7 @@ and make sure you can call `git` from the command line.
 
 ## ctags
 
-In order to use tags related plugins such as [vista.vim](https://github.com/liuchengxu/vista.vim) and [gutentags](https://github.com/ludovicchabant/vim-gutentags), we need to
+In order to use tags related plugins such as [vista.vim](https://github.com/liuchengxu/vista.vim), we need to
 install a ctags distribution. Universal-ctags is preferred.
 
 To install ctags on macOS, use [Homebrew](https://github.com/universal-ctags/homebrew-universal-ctags):
@@ -136,19 +136,17 @@ Terminal](https://github.com/microsoft/terminal).
 
 ## Font
 
-Since [Vim-airline](https://github.com/vim-airline/vim-airline) uses several
-Unicode symbols not available in normal font, we need to install [fonts
-here](https://github.com/powerline/fonts) to make vim-airline look pretty. I am using [Hack](https://github.com/powerline/fonts/tree/master/Hack), and it looks
-great. Another great resource for programming font is the [nerd-font](https://github.com/ryanoasis/nerd-fonts) project.
+Since statusline or file explorer plugins often use Unicode symbols not
+available in normal font, we need to install a patched font from the [nerd-fonts](https://github.com/ryanoasis/nerd-fonts) project.
 
 # Install Nvim
 
 There are various ways to install Nvim depending on your system. Current
-configuration is tested against nvim 0.5.
+configuration is tested against nvim v0.6.0.
 
 ## Linux
 
-We can directly download the binary release from [here](https://github.com/neovim/neovim/releases/download/v0.5.1/nvim-linux64.tar.gz).
+We can directly download the binary release from [here](https://github.com/neovim/neovim/releases/download/v0.6.0/nvim-linux64.tar.gz).
 
 ## Windows
 
@@ -158,7 +156,7 @@ The easiest way to install Nvim on Windows is via chocolatey:
 choco install neovim
 ```
 
-You may download from [nvim release](https://github.com/neovim/neovim/releases/download/v0.5.1/nvim-win64.zip) from GitHub and manually extract it.
+You may download from [nvim release](https://github.com/neovim/neovim/releases/download/v0.6.0/nvim-win64.zip) from GitHub and manually extract it.
 
 ## macOS
 
@@ -205,9 +203,10 @@ directory, and run the following command to install this configuration:
 git clone --depth=1 https://github.com/jdhao/nvim-config.git .
 ```
 
-After that, when we first open nvim, run command `:PackerInstall` to install
-all the plugins. Since I use quite a lot of plugins (more than 60), it may take
-some time to install all of them, depending on your network condition.
+After that, when we first open nvim, run command `:PackerSync` to install all
+the plugins and generate `packer_compiled.lua`. Since I use quite a lot of
+plugins (more than 60), it may take some time to install all of them, depending
+on your network condition.
 
 # Automatic installation
 

docs/nvim_install_mac.sh

@@ -2,7 +2,7 @@
 #!/bin/bash
 set -eux
 
-wget https://hub.fastgit.org/neovim/neovim/releases/download/nightly/nvim-macos.tar.gz
+wget https://github.com/neovim/neovim/releases/download/v0.6.0/nvim-macos.tar.gz
 
 if [[ ! -d "$HOME/tools/"  ]]; then
     mkdir -p "$HOME/tools"

docs/nvim_setup_linux.sh

@@ -140,6 +140,17 @@ if [[ -z "$(command -v rg)" ]] && [[ ! -f "$RIPGREP_DIR/rg" ]]; then
     if [[ "$ADD_TO_SYSTEM_PATH" = true ]] && [[ "$USE_BASH_SHELL" = true ]]; then
         echo "export PATH=\"$RIPGREP_DIR:\$PATH\"" >> "$HOME/.bash_profile"
     fi
+
+    # set up manpath and zsh completion for ripgrep
+    mkdir -p $HOME/tools/ripgrep/doc/man/man1
+    mv $HOME/tools/ripgrep/doc/rg.1 $HOME/tools/ripgrep/doc/man/man1
+
+    if [[ "$USE_BASH_SHELL" = true ]]; then
+        echo 'export MANPATH=$HOME/tools/ripgrep/doc/man:$MANPATH' >> "$HOME/.bash_profile"
+    else
+        echo 'export MANPATH=$HOME/tools/ripgrep/doc/man:$MANPATH' >> "$HOME/.zshrc"
+        echo 'export FPATH=$HOME/tools/ripgrep/complete:$FPATH' >> "$HOME/.zshrc"
+    fi
 else
     echo "ripgrep is already installed. Skip installing it."
 fi
@@ -177,7 +188,7 @@ fi
 NVIM_DIR=$HOME/tools/nvim
 NVIM_SRC_NAME=$HOME/packages/nvim-linux64.tar.gz
 NVIM_CONFIG_DIR=$HOME/.config/nvim
-NVIM_LINK="https://hub.fastgit.org/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz"
+NVIM_LINK="https://github.com/neovim/neovim/releases/download/v0.6.0/nvim-linux64.tar.gz"
 if [[ ! -f "$NVIM_DIR/bin/nvim" ]]; then
     echo "Installing Nvim"
     echo "Creating nvim directory under tools directory"
@@ -209,9 +220,9 @@ git clone --depth=1 https://hub.fastgit.org/jdhao/nvim-config.git "$NVIM_CONFIG_
 
 echo "Installing packer.nvim"
 git clone --depth=1 https://hub.fastgit.org/wbthomason/packer.nvim \
-    ~/.local/share/nvim/site/pack/packer/start/packer.nvim
+    ~/.local/share/nvim/site/pack/packer/opt/packer.nvim
 
-echo "Installing plugins"
-"$NVIM_DIR/bin/nvim" +PackerInstall +qall
+echo "Installing nvim plugins, please wait"
+"$NVIM_DIR/bin/nvim" -c "autocmd User PackerComplete quitall" -c "PackerSync"
 
 echo "Finished installing Nvim and its dependencies!"

init.vim

@@ -1,4 +1,3 @@
-"{ Header info
 " Description: This is my personal Nvim configuration supporting Mac, Linux
 " and Windows, with various plugins configured. This configuration evolves as
 " I learn more about Nvim and becomes more proficient in using Nvim. Since it
@@ -8,9 +7,7 @@
 " built over time with a lot of polish.
 " Author: Jie-dong Hao
 " Email: jdhao@hotmail.com
-"}
 
-"{ Main configurations
 let g:config_files = [
       \ 'globals.vim',
       \ 'options.vim',
@@ -23,4 +20,3 @@ let g:config_files = [
 for s:fname in g:config_files
   execute printf('source %s/core/%s', stdpath('config'), s:fname)
 endfor
-"}

lua/config/hlslens.lua

@@ -0,0 +1,21 @@
+require('hlslens').setup({
+    calm_down = true,
+    nearest_only = true,
+})
+
+vim.api.nvim_set_keymap(
+  "n",
+  "n",
+  "<Cmd>execute('normal! ' . v:count1 . 'nzzzv')<CR><Cmd>lua require('hlslens').start()<CR>",
+  { noremap = true, silent = true }
+)
+
+vim.api.nvim_set_keymap(
+  "n",
+  "N",
+  "<Cmd>execute('normal! ' . v:count1 . 'Nzzzv')<CR><Cmd>lua require('hlslens').start()<CR>",
+  { noremap = true, silent = true }
+)
+
+vim.api.nvim_set_keymap("n", "*", "<Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>", { silent = true })
+vim.api.nvim_set_keymap("n", "#", "<Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>", { silent = true })

lua/config/indent-blankline.lua

@@ -1,16 +1,23 @@
-require("indent_blankline").setup {
+require("indent_blankline").setup({
   -- U+2502 may also be a good choice, it will be on the middle of cursor.
+  -- U+250A is also a good choice
   char = "▏",
   show_end_of_line = false,
   disable_with_nolist = true,
-  buftype_exclude = {"terminal"},
-  filetype_exclude = { "help", "git", "markdown", "snippets", "text" },
-}
+  buftype_exclude = { "terminal" },
+  filetype_exclude = { "help", "git", "markdown", "snippets", "text", "gitconfig", "alpha" },
+})
+
+vim.cmd([[
+function! Should_activate_indentblankline() abort
+  if index(g:indent_blankline_filetype_exclude, &filetype) == -1
+    IndentBlanklineEnable
+  endif
+endfunction
 
-vim.cmd[[
 augroup indent_blankline
   autocmd!
   autocmd InsertEnter * IndentBlanklineDisable
-  autocmd InsertLeave * IndentBlanklineEnable
+  autocmd InsertLeave * call Should_activate_indentblankline()
 augroup END
-]]
+]])

lua/config/lsp.lua

@@ -1,23 +1,23 @@
+local api = vim.api
+local lsp = vim.lsp
+
 local M = {}
 
 function M.show_line_diagnostics()
   local opts = {
     focusable = false,
     close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
-    border = 'single'
+    border = 'rounded',
+    source = 'always',  -- show source in diagnostic popup window
+    prefix = ' '
   }
-  vim.lsp.diagnostic.show_line_diagnostics(opts)
+  vim.diagnostic.open_float(nil, opts)
 end
 
 local custom_attach = function(client, bufnr)
   local function buf_set_keymap(...)
-    vim.api.nvim_buf_set_keymap(bufnr, ...)
+    api.nvim_buf_set_keymap(bufnr, ...)
   end
-  local function buf_set_option(...)
-    vim.api.nvim_buf_set_option(bufnr, ...)
-  end
-
-  buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
 
   -- Mappings.
   local opts = { noremap = true, silent = true }
@@ -30,9 +30,9 @@ local custom_attach = function(client, bufnr)
   buf_set_keymap("n", "<space>wl", "<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>", opts)
   buf_set_keymap("n", "<space>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
   buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
-  buf_set_keymap("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", opts)
-  buf_set_keymap("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", opts)
-  buf_set_keymap("n", "<space>q", "<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>", opts)
+  buf_set_keymap("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opts)
+  buf_set_keymap("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<CR>", opts)
+  buf_set_keymap("n", "<space>q", "<cmd>lua vim.diagnostic.setqflist({open = true})<CR>", opts)
   buf_set_keymap("n", "<space>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
 
   vim.cmd([[
@@ -41,7 +41,7 @@ local custom_attach = function(client, bufnr)
 
   -- Set some key bindings conditional on server capabilities
   if client.resolved_capabilities.document_formatting then
-    buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
+    buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting_sync()<CR>", opts)
   end
   if client.resolved_capabilities.document_range_formatting then
     buf_set_keymap("x", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR><ESC>", opts)
@@ -50,9 +50,9 @@ local custom_attach = function(client, bufnr)
   -- The blow command will highlight the current variable and its usages in the buffer.
   if client.resolved_capabilities.document_highlight then
     vim.cmd([[
-      hi link LspReferenceRead Visual
-      hi link LspReferenceText Visual
-      hi link LspReferenceWrite Visual
+      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()
@@ -67,7 +67,7 @@ local custom_attach = function(client, bufnr)
   end
 end
 
-local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+local capabilities = require('cmp_nvim_lsp').update_capabilities(lsp.protocol.make_client_capabilities())
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
 local lspconfig = require("lspconfig")
@@ -140,7 +140,7 @@ if vim.g.is_mac or vim.g.is_linux and sumneko_binary_path ~= "" then
         },
         workspace = {
           -- Make the server aware of Neovim runtime files
-          library = vim.api.nvim_get_runtime_file("", true),
+          library = api.nvim_get_runtime_file("", true),
         },
         -- Do not send telemetry data containing a randomized but unique identifier
         telemetry = {
@@ -153,53 +153,28 @@ if vim.g.is_mac or vim.g.is_linux and sumneko_binary_path ~= "" then
 end
 
 -- Change diagnostic signs.
-vim.fn.sign_define("LspDiagnosticsSignError", { text = "✗", texthl = "LspDiagnosticsDefaultError" })
-vim.fn.sign_define("LspDiagnosticsSignWarning", { text = "!", texthl = "LspDiagnosticsDefaultWarning" })
-vim.fn.sign_define("LspDiagnosticsSignInformation", { text = "", texthl = "LspDiagnosticsDefaultInformation" })
-vim.fn.sign_define("LspDiagnosticsSignHint", { text = "", texthl = "LspDiagnosticsDefaultHint" })
+vim.fn.sign_define("DiagnosticSignError", { text = "✗", texthl = "DiagnosticSignError" })
+vim.fn.sign_define("DiagnosticSignWarn", { text = "!", texthl = "DiagnosticSignWarn" })
+vim.fn.sign_define("DiagnosticSignInformation", { text = "", texthl = "DiagnosticSignInfo" })
+vim.fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
 
-vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
+-- global config for diagnostic
+vim.diagnostic.config({
   underline = false,
   virtual_text = false,
   signs = true,
-  update_in_insert = false,
+  severity_sort = true,
 })
 
--- Refs: https://github.com/neovim/nvim-lspconfig/wiki/UI-customization#show-source-in-diagnostics
-vim.lsp.handlers["textDocument/publishDiagnostics"] = function(_, result, context, _)
-  -- result contains diagnostics and uri
-  -- context contains client_id and method, but not always buf_nr
-  local client_id = context.client_id
-  local diagnostics = result.diagnostics
-  local uri = result.uri
+-- lsp.handlers["textDocument/publishDiagnostics"] = lsp.with(lsp.diagnostic.on_publish_diagnostics, {
+--   underline = false,
+--   virtual_text = false,
+--   signs = true,
+--   update_in_insert = false,
+-- })
 
-  local bufnr = vim.uri_to_bufnr(uri)
-  if not bufnr then
-    return
-  end
-
-  if not vim.api.nvim_buf_is_loaded(bufnr) then
-    return
-  end
-
-  -- change diagnostics format
-  for i, v in ipairs(diagnostics) do
-    diagnostics[i].message = string.format("%s: %s", v.source, v.message)
-  end
-  vim.lsp.diagnostic.save(diagnostics, bufnr, client_id)
-
-  local config = {
-    underline = false,
-    virtual_text = false,
-    signs = true,
-    update_in_insert = false,
-  }
-  vim.lsp.diagnostic.display(diagnostics, bufnr, client_id, config)
-end
-
--- The following settings works with the bleeding edge neovim.
--- See https://github.com/neovim/neovim/pull/13998.
-vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
+-- Change border of documentation hover window, See https://github.com/neovim/neovim/pull/13998.
+lsp.handlers["textDocument/hover"] = lsp.with(vim.lsp.handlers.hover, {
   border = "rounded",
 })
 

lua/config/nvim-notify.lua

@@ -4,6 +4,7 @@ nvim_notify.setup({
   stages = "fade_in_slide_out",
   -- Default timeout for notifications
   timeout = 1500,
+  background_colour = "#2E3440",
 })
 
 vim.notify = nvim_notify

lua/config/nvim_hop.lua

@@ -1,6 +1,10 @@
 vim.cmd[[ hi HopNextKey cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff ]]
+vim.cmd[[ hi HopNextKey1 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff ]]
+vim.cmd[[ hi HopNextKey2 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff ]]
+
 require('hop').setup({
   case_insensitive = true,
+  char2_fallback_key = '<CR>',
 })
 
 vim.api.nvim_set_keymap('n', 'f', "<cmd>lua require'hop'.hint_char2()<cr>", {noremap = true})

lua/config/statusline.lua

@@ -0,0 +1,124 @@
+local function spell()
+  if vim.o.spell then
+    return string.format("[SPELL]")
+  end
+
+  return ""
+end
+
+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 = vim.fn.libcall(vim.g.XkbSwitchLib, 'Xkb_Switch_getXkbLayout', '')
+    if layout == '0' then
+      return '[CN]'
+    end
+  end
+
+  return ""
+end
+
+local function trailing_space()
+  -- Get the positions of trailing whitespaces from plugin 'jdhao/whitespace.nvim'.
+  local trailing_space_pos = vim.b.trailing_whitespace_pos
+
+  local msg = ""
+  if #trailing_space_pos > 0 then
+    -- Note that lua index is 1-based, not zero based!!!
+    local line = trailing_space_pos[1][1]
+    msg = string.format("[%d]trailing", line)
+  end
+
+  return msg
+end
+
+local function mixed_indent()
+  local space_pat = [[\v^ +]]
+  local tab_pat = [[\v^\t+]]
+  local space_indent = vim.fn.search(space_pat, 'nwc')
+  local tab_indent = vim.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 = vim.fn.search([[\v^(\t+ | +\t)]], 'nwc')
+    mixed = mixed_same_line > 0
+  end
+  if not mixed then return '' end
+  if mixed_same_line ~= nil and mixed_same_line > 0 then
+     return 'MI:'..mixed_same_line
+  end
+  local space_indent_cnt = vim.fn.searchcount({pattern=space_pat, max_count=1e3}).total
+  local tab_indent_cnt =  vim.fn.searchcount({pattern=tab_pat, max_count=1e3}).total
+  if space_indent_cnt > tab_indent_cnt then
+    return 'MI:'..tab_indent
+  else
+    return 'MI:'..space_indent
+  end
+end
+
+require("lualine").setup({
+  options = {
+    icons_enabled = true,
+    theme = "auto",
+    -- component_separators = { left = "", right = "" },
+    -- section_separators = { left = "", right = "" },
+    section_separators = "",
+    component_separators = "",
+    disabled_filetypes = {},
+    always_divide_middle = true,
+  },
+  sections = {
+    lualine_a = { "mode" },
+    lualine_b = { "branch", "diff" },
+    lualine_c = {
+      "filename",
+      {
+        ime_state,
+        color = {fg = 'black', bg = '#f46868'}
+      },
+      {
+        spell,
+        color = {fg = 'black', bg = '#a7c080'}
+      },
+    },
+    lualine_x = {
+      "encoding",
+      {
+        "fileformat",
+        symbols = {
+          unix = "unix",
+          dos = "win",
+          mac = "mac",
+        },
+      },
+      "filetype",
+    },
+    lualine_y = { "progress" },
+    lualine_z = {
+      "location",
+      {
+        "diagnostics",
+        sources = { "nvim_diagnostic" }
+      },
+      {
+        trailing_space,
+        color = "WarningMsg"
+      },
+      {
+        mixed_indent,
+        color = "WarningMsg"
+      },
+    },
+  },
+  inactive_sections = {
+    lualine_a = {},
+    lualine_b = {},
+    lualine_c = { "filename" },
+    lualine_x = { "location" },
+    lualine_y = {},
+    lualine_z = {},
+  },
+  tabline = {},
+  extensions = {'quickfix', 'fugitive'},
+})
+

lua/plugins.lua

@@ -22,9 +22,13 @@ end
 
 -- Load packer.nvim
 vim.cmd("packadd packer.nvim")
+local util = require('packer.util')
 
 require("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 = "BufEnter"}
@@ -33,10 +37,6 @@ require("packer").startup({
 
     -- nvim-cmp completion sources
     use {"hrsh7th/cmp-nvim-lsp", after = "nvim-cmp"}
-
-    -- 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')]] })
-
     use {"hrsh7th/cmp-nvim-lua", after = "nvim-cmp"}
     use {"hrsh7th/cmp-path", after = "nvim-cmp"}
     use {"hrsh7th/cmp-buffer", after = "nvim-cmp"}
@@ -46,15 +46,13 @@ require("packer").startup({
       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 syntax highlighting and more
-    if vim.g.is_win then
-      use({ "numirias/semshi", ft = "python", config = "vim.cmd [[UpdateRemotePlugins]]" })
-    end
-
     -- Python indent (follows the PEP8 style)
     use({ "Vimjas/vim-python-pep8-indent", ft = { "python" } })
 
@@ -70,16 +68,24 @@ require("packer").startup({
     end
 
     -- Super fast buffer jump
-    use { 'phaazon/hop.nvim', event = "VimEnter", config = [[require('config.nvim_hop')]] }
+    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"})
+    -- use({"romainl/vim-cool", event = "VimEnter"})
 
-    -- Show current search term in different color
-    use({"PeterRincker/vim-searchlight", event = "VimEnter"})
-
-    -- Show match number for search
-    use({"kevinhwang91/nvim-hlslens", 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'})
@@ -92,11 +98,11 @@ require("packer").startup({
     end
 
     use {
-      'nvim-telescope/telescope.nvim',
+      'nvim-telescope/telescope.nvim', cmd = 'Telescope',
       requires = { {'nvim-lua/plenary.nvim'} }
     }
     -- search emoji and other symbols
-    use 'nvim-telescope/telescope-symbols.nvim'
+    use {'nvim-telescope/telescope-symbols.nvim', after = 'telescope.nvim'}
 
     -- Another similar plugin is command-t
     -- use 'wincent/command-t'
@@ -117,27 +123,43 @@ require("packer").startup({
     use({"NTBBloodbath/doom-one.nvim", opt = true})
     use({"sainnhe/everforest", opt = true})
     use({"EdenEast/nightfox.nvim", opt = true})
+    use({"rebelot/kanagawa.nvim", 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'
 
-    -- colorful status line and theme
-    use({"vim-airline/vim-airline-themes", after = 'vim-signify',})
-    use({"vim-airline/vim-airline", after = 'vim-airline-themes',})
+    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')]] })
 
-    use { 'goolord/alpha-nvim', config = [[require('config.alpha-nvim')]] }
     -- fancy start screen
-    use({ "lukas-reineke/indent-blankline.nvim", event = "VimEnter", config = [[require('config.indent-blankline')]] })
+    use { 'goolord/alpha-nvim', event = 'VimEnter', config = [[require('config.alpha-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 = [[require('config.nvim-notify')]] })
+    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.
@@ -148,8 +170,6 @@ require("packer").startup({
 
     -- Only install these plugins if ctags are installed on the system
     if utils.executable("ctags") then
-      -- plugin to manage your tags
-      use({"ludovicchabant/vim-gutentags", event = "VimEnter"})
       -- show file tags in vim window
       use({"liuchengxu/vista.vim", cmd = "Vista"})
     end
@@ -168,7 +188,13 @@ require("packer").startup({
     -- use 'mg979/vim-visual-multi'
 
     -- Autosave files on certain events
-    use({"Pocco81/AutoSave.nvim", event = "VimEnter", config = [[require('config.autosave')]]})
+    use({
+      "Pocco81/AutoSave.nvim",
+      event = "VimEnter",
+      config = function()
+        vim.defer_fn(function() require('config.autosave') end, 1500)
+      end
+    })
 
     -- Show undo history visually
     use({"simnalamburt/vim-mundo", cmd = {"MundoToggle", "MundoShow"}})
@@ -274,7 +300,13 @@ require("packer").startup({
 
     -- Smoothie motions
     -- use 'psliwka/vim-smoothie'
-    use({ "karb94/neoscroll.nvim", event = "VimEnter", config = [[require('config.neoscroll')]] })
+    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"}})
 
@@ -311,15 +343,26 @@ require("packer").startup({
     use({"gelguy/wilder.nvim", opt = true, setup = [[vim.cmd('packadd wilder.nvim')]]})
 
     -- showing keybindings
-    use {"folke/which-key.nvim", event = "VimEnter", config = [[require('config.which-key')]]}
+    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'}
   end,
   config = {
     max_jobs = 16,
+    compile_path = util.join_paths(vim.fn.stdpath('config'), 'lua', 'packer_compiled.lua'),
     git = {
       default_url_format = plug_url_format,
     },
   },
 })
+
+local status, _ = pcall(require, 'packer_compiled')
+if not status then
+  vim.notify("Error requiring packer_compiled.lua: run PackerSync to fix!")
+end

my_snippets/cpp.snippets

@@ -23,6 +23,7 @@ using std::pair;
 using std::make_pair;
 
 
+
 int main()
 {
 
@@ -41,8 +42,9 @@ void printList(const T& arr, const string& desc){
 	std::cout << desc << ": [";
 
 	for (auto it = arr.begin(); it != arr.end(); it++){
-		std::cout << *it << ((std::next(it) != arr.end()) ? ", " : "]\n");
+		std::cout << *it << ((std::next(it) != arr.end()) ? ", " : "");
 	}
+	std::cout << "]\n";
 }
 endsnippet
 
@@ -53,13 +55,25 @@ void printMat(const vector<vector<T>>& mat, const string& desc){
 
 	for (auto it1 = mat.begin(); it1 != mat.end(); it1++){
 		auto cur_vec = *it1;
+		cout << "[";
 		for (auto it2 = cur_vec.begin(); it2 != cur_vec.end(); it2++){
-			cout << *it2 << ((std::next(it2) != cur_vec.end()) ? ", " : "\n");
+			cout << *it2 << ((std::next(it2) != cur_vec.end()) ? ", " : "]\n");
 		}
 	}
 }
 endsnippet
 
+snippet pqueue "print queue"
+template <class T>
+void printQueue(T q){
+	while(!q.empty()){
+		std::cout << q.top() << " ";
+		q.pop();
+	}
+	std::cout << '\n';
+}
+endsnippet
+
 snippet cout "print a variable" w
 cout << "$1: " << $2 << endl;
 endsnippet

my_snippets/markdown.snippets

@@ -23,7 +23,7 @@ snippet k3 "Three key strokes shortcut"
 <kbd>${1:KEY}</kbd> + <kbd>${2:KEY}</kbd> + <kbd>${3:KEY}</kbd>
 endsnippet
 
-snippet "meta" "Markdown front matter (YAML format)" b
+snippet meta "Markdown front matter (YAML format)" b
 ---
 title: "$1"
 date: `!p from datetime import datetime

plugin/command.vim

@@ -3,3 +3,8 @@ command! -nargs=1 -complete=command Redir call utils#CaptureCommandOutput(<q-arg
 
 command! -bar -bang -nargs=+ -complete=file Edit call utils#MultiEdit([<f-args>])
 call utils#Cabbrev('edit', 'Edit')
+
+call utils#Cabbrev('man', 'Man')
+
+" show current date and time in human readable format
+command! -nargs=? Datetime echo utils#iso_time(<q-args>)

spell/en.utf-8.add

@@ -323,3 +323,35 @@ zshrc
 pdftoppm
 pdf2image
 pdffonts
+myers
+difftool
+vimdiff
+softmax
+lib64
+toolset
+sym
+ffmpeg
+PyAV
+mp4
+vint
+npm
+js
+sudo
+ps1
+tpm
+hacky
+PCRE
+teardown
+github
+fastgit
+EOL
+PyCharm
+deduplication
+STL
+delimitMate
+lspconfig
+lualine
+Keymap
+iCloud
+keyframe
+maskRCNN