update nvim-tree conf

nvim-tree: fix shortcut and repo

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.8.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
     </a>
     <a href="https://github.com/jdhao/nvim-config/search?l=vim-script">
       <img src="https://img.shields.io/github/languages/top/jdhao/nvim-config" alt="Top languages"/>
     </a>
+    <a href="https://github.com/jdhao/nvim-config/graphs/commit-activity">
+      <img src="https://img.shields.io/github/commit-activity/m/jdhao/nvim-config?style=flat-square" />
+    </a>
+    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.8.1">
+      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.8.1?style=flat-square" />
+    </a>
+    <a href="https://github.com/jdhao/nvim-config/graphs/contributors">
+      <img src="https://img.shields.io/github/contributors/jdhao/nvim-config?style=flat-square" />
+    </a>
+    <a>
+      <img src="https://img.shields.io/github/repo-size/jdhao/nvim-config?style=flat-square" />
+    </a>
     <a href="https://github.com/jdhao/nvim-config/blob/master/LICENSE">
       <img src="https://img.shields.io/github/license/jdhao/nvim-config?style=flat-square&logo=GNU&label=License" alt="License"/>
     </a>
@@ -66,7 +69,7 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + Fast buffer jump via [hop.nvim](https://github.com/phaazon/hop.nvim).
 + Powerful snippet insertion via [Ultisnips](https://github.com/SirVer/ultisnips).
 + Beautiful statusline via [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim).
-+ File tree explorer via [nvim-tree.lua](https://github.com/kyazdani42/nvim-tree.lua).
++ File tree explorer via [nvim-tree.lua](https://github.com/nvim-tree/nvim-tree.lua).
 + Better quickfix list with [nvim-bqf](https://github.com/kevinhwang91/nvim-bqf).
 + Show search index and count with [nvim-hlslens](https://github.com/kevinhwang91/nvim-hlslens).
 + Command line auto-completion via [wilder.nvim](https://github.com/gelguy/wilder.nvim).
@@ -76,9 +79,8 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + Code editing using true nvim inside browser via [firenvim](https://github.com/glacambre/firenvim).
 + Beautiful colorscheme via [sainnhe/gruvbox-material](https://github.com/sainnhe/gruvbox-material) and other colorschemes.
 + Markdown writing and previewing via [vim-markdown](https://github.com/preservim/vim-markdown) and [markdown-preview.nvim](https://github.com/iamcco/markdown-preview.nvim).
-+ LaTeX editing and previewing via [vimtex](https://github.com/lervag/vimtex) <sup id="a1">[1](#f1)</sup>.
++ LaTeX editing and previewing via [vimtex](https://github.com/lervag/vimtex)
 + Animated GUI style notification via [nvim-notify](https://github.com/rcarriga/nvim-notify).
-+ Smooth scroll experience via [neoscroll](https://github.com/karb94/neoscroll.nvim).
 + Tags navigation via [vista](https://github.com/liuchengxu/vista.vim).
 + Code formatting via [Neoformat](https://github.com/sbdchd/neoformat).
 + Undo management via [vim-mundo](https://github.com/simnalamburt/vim-mundo)
@@ -214,5 +216,3 @@ You may also be interested in my posts on configuring Nvim:
 + [Config nvim on Linux for Python development](https://jdhao.github.io/2018/12/24/centos_nvim_install_use_guide_en/)
 + [Nvim config on Windows 10](https://jdhao.github.io/2018/11/15/neovim_configuration_windows/)
 + [Nvim-qt config on Windows 10](https://jdhao.github.io/2019/01/17/nvim_qt_settings_on_windows/)
-
-<b id="f1">1:</b> Not enabled for Linux, you need to tweak [`lua/plugins.lua`](lua/plugins.lua) and change the condition for installing vimtex.[↩](#a1)

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/lua.vim

@@ -2,12 +2,7 @@
 set formatoptions-=o
 set formatoptions-=r
 
-set tabstop=2       " number of visual spaces per TAB
+nnoremap <buffer><silent> <F9> :luafile %<CR>
-set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=2    " number of spaces to use for autoindent
-set expandtab       " expand tab to spaces so that tabs are spaces
-
-nnoremap <silent> <F9> :luafile %<CR>
 
 " 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/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
+nnoremap <buffer><silent> <F9> :source %<CR>
-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>

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

core/colorschemes.lua

@@ -7,17 +7,19 @@ local M = {}
 -- Colorscheme to its directory name mapping, because colorscheme repo name is not necessarily
 -- the same as the colorscheme name itself.
 M.colorscheme2dir = {
-  gruvbox8 = "vim-gruvbox8",
   onedark = "onedark.nvim",
   edge = "edge",
   sonokai = "sonokai",
   gruvbox_material = "gruvbox-material",
   nord = "nord.nvim",
-  doom_one = "doom-one.nvim",
   everforest = "everforest",
   nightfox = "nightfox.nvim",
   kanagawa = "kanagawa.nvim",
   catppuccin = "catppuccin",
+  rose_pine = "rose-pine",
+  onedarkpro = "onedarkpro.nvim",
+  monokai = "monokai.nvim",
+  material = "material.nvim",
 }
 
 M.gruvbox8 = function()
@@ -50,6 +52,10 @@ M.sonokai = function()
 end
 
 M.gruvbox_material = function()
+  -- foreground option can be material, mix, or original
+  vim.g.gruvbox_material_foreground = "material"
+  --background option can be hard, medium, soft
+  vim.g.gruvbox_material_background = "soft"
   vim.g.gruvbox_material_enable_italic = 1
   vim.g.gruvbox_material_better_performance = 1
 
@@ -88,6 +94,30 @@ M.catppuccin = function()
   vim.cmd([[colorscheme catppuccin]])
 end
 
+M.rose_pine = function()
+  require('rose-pine').setup({
+    --- @usage 'main' | 'moon'
+    dark_variant = 'moon',
+  })
+
+  -- set colorscheme after options
+  vim.cmd('colorscheme rose-pine')
+end
+
+M.onedarkpro = function()
+  -- set colorscheme after options
+  vim.cmd('colorscheme onedark_vivid')
+end
+
+M.monokai = function()
+  vim.cmd('colorscheme monokai_pro')
+end
+
+M.material = function ()
+  vim.g.material_style = "oceanic"
+  vim.cmd('colorscheme material')
+end
+
 --- Use a random colorscheme from the pre-defined list of colorschemes.
 M.rand_colorscheme = function()
   local colorscheme = utils.rand_element(vim.tbl_keys(M.colorscheme2dir))

core/globals.lua

@@ -5,7 +5,7 @@ local utils = require('utils')
 
 -- Inspect something
 function _G.inspect(item)
-  vim.pretty_print(item)
+  vim.print(item)
 end
 
 ------------------------------------------------------------------------
@@ -43,9 +43,7 @@ vim.g.mapleader = ','
 vim.g.vimsyn_embed = 'l'
 
 -- Use English as main language
-if not vim.g.is_mac then
+vim.cmd [[language en_US.UTF-8]]
-  vim.cmd [[language en_US.utf-8]]
-end
 
 -- Disable loading certain plugins
 

core/mappings.lua

@@ -1,5 +1,6 @@
 local keymap = vim.keymap
 local api = vim.api
+local uv = vim.loop
 
 -- Save key strokes (now we do not need to press shift to enter command mode).
 keymap.set({ "n", "x" }, ";", ":")
@@ -85,16 +86,15 @@ keymap.set("n", "<leader>ev", "<cmd>tabnew $MYVIMRC <bar> tcd %:h<cr>", {
   desc = "open init.lua",
 })
 
-keymap.set("n", "<leader>sv", "", {
+keymap.set("n", "<leader>sv", function()
-  silent = true,
-  desc = "reload init.lua",
-  callback = function()
   vim.cmd([[
       update $MYVIMRC
       source $MYVIMRC
     ]])
   vim.notify("Nvim config successfully reloaded!", vim.log.levels.INFO, { title = "nvim-config" })
-  end,
+end, {
+  silent = true,
+  desc = "reload init.lua",
 })
 
 -- Reselect the text that has just been pasted, see also https://stackoverflow.com/a/4317090/6064933.
@@ -173,25 +173,23 @@ keymap.set({ "x", "o" }, "iu", "<cmd>call text_obj#URL()<cr>", { desc = "URL tex
 keymap.set({ "x", "o" }, "iB", "<cmd>call text_obj#Buffer()<cr>", { desc = "buffer text object" })
 
 -- Do not move my cursor when joining lines.
-keymap.set("n", "J", "", {
+keymap.set("n", "J", function()
-  desc = "join line",
-  callback = function()
   vim.cmd([[
       normal! mzJ`z
       delmarks z
     ]])
-  end,
+end, {
+  desc = "join line",
 })
 
-keymap.set("n", "gJ", "mzgJ`z", {
+keymap.set("n", "gJ", function()
-  desc = "join visual lines",
-  callback = function()
   -- we must use `normal!`, otherwise it will trigger recursive mapping
   vim.cmd([[
       normal! zmgJ`z
       delmarks z
     ]])
-  end,
+end, {
+  desc = "join visual lines",
 })
 
 -- Break inserted text into smaller undo units when we insert some punctuation chars.
@@ -226,3 +224,22 @@ keymap.set("c", "<C-A>", "<HOME>")
 
 -- Delete the character to the right of the cursor
 keymap.set("i", "<C-D>", "<DEL>")
+
+keymap.set("n", "<leader>cb", function()
+  local cnt = 0
+  local blink_times = 7
+  local timer = uv.new_timer()
+
+  timer:start(0, 100, vim.schedule_wrap(function()
+    vim.cmd[[
+      set cursorcolumn!
+      set cursorline!
+    ]]
+
+    if cnt == blink_times then
+      timer:close()
+    end
+
+    cnt = cnt + 1
+  end))
+end)

core/options.vim

@@ -3,10 +3,6 @@ scriptencoding utf-8
 " change fillchars for folding, vertical split, end of buffer, and message separator
 set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾
 
-" Paste mode toggle, it seems that Nvim's bracketed paste mode
-" does not work very well for nvim-qt, so we use good-old paste mode
-set pastetoggle=<F12>
-
 " Split window below/right when creating horizontal/vertical windows
 set splitbelow splitright
 
@@ -44,9 +40,9 @@ set backup  " create backup for files
 set backupcopy=yes  " copy the original file to backupdir and overwrite it
 
 " General tab settings
-set tabstop=4       " number of visual spaces per TAB
+set tabstop=2       " number of visual spaces per TAB
-set softtabstop=4   " number of spaces in tab when editing
+set softtabstop=2   " number of spaces in tab when editing
-set shiftwidth=4    " number of spaces to use for autoindent
+set shiftwidth=2    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces
 
 " Set matching pairs of characters and highlight matching brackets
@@ -75,6 +71,7 @@ set scrolloff=3
 " Use mouse to select and resize windows, etc.
 set mouse=nic  " Enable mouse in several mode
 set mousemodel=popup  " Set the behaviour of mouse
+set mousescroll=ver:1,hor:6
 
 " Disable showing current mode on command line since statusline plugins can show it.
 set noshowmode
@@ -144,7 +141,7 @@ set formatoptions+=mM
 " Tilde (~) is an operator, thus must be followed by motions like `e` or `w`.
 set tildeop
 
-set synmaxcol=200  " Text after this column number is not highlighted
+set synmaxcol=250  " Text after this column number is not highlighted
 set nostartofline
 
 " External program to use for grep command
@@ -175,6 +172,7 @@ set diffopt+=filler  " show filler for deleted lines
 set diffopt+=closeoff  " turn off diff when one file window is closed
 set diffopt+=context:3  " context for diff
 set diffopt+=internal,indent-heuristic,algorithm:histogram
+set diffopt+=linematch:60
 
 set nowrap  " do no wrap
 set noruler

core/plugins.vim

@@ -137,31 +137,6 @@ let g:mundo_width = 80
 
 nnoremap <silent> <Space>u :MundoToggle<CR>
 
-""""""""""""""""""""""""""""vim-yoink settings"""""""""""""""""""""""""
-if g:is_win || g:is_mac
-  " ctrl-n and ctrl-p will not work if you add the TextChanged event to vim-auto-save events.
-  " nmap <c-n> <plug>(YoinkPostPasteSwapBack)
-  " nmap <c-p> <plug>(YoinkPostPasteSwapForward)
-
-  " The following p/P mappings are also needed for ctrl-n and ctrl-p to work
-  " nmap p <plug>(YoinkPaste_p)
-  " nmap P <plug>(YoinkPaste_P)
-
-  " Cycle the yank stack with the following mappings
-  nmap [y <plug>(YoinkRotateBack)
-  nmap ]y <plug>(YoinkRotateForward)
-
-  " Do not change the cursor position
-  nmap y <plug>(YoinkYankPreserveCursorPosition)
-  xmap y <plug>(YoinkYankPreserveCursorPosition)
-
-  " Move cursor to end of paste after multiline paste
-  let g:yoinkMoveCursorToEndOfPaste = 0
-
-  " Record yanks in system clipboard
-  let g:yoinkSyncSystemClipboardOnFocus = 1
-endif
-
 """"""""""""""""""""""""""""better-escape.vim settings"""""""""""""""""""""""""
 let g:better_escape_interval = 200
 
@@ -243,7 +218,7 @@ nmap s <Nop>
 omap s <Nop>
 
 """"""""""""""""""""""""""""vimtex settings"""""""""""""""""""""""""""""
-if ( g:is_win || g:is_mac ) && executable('latex')
+if executable('latex')
   " Hacks for inverse search to work semi-automatically,
   " see https://jdhao.github.io/2021/02/20/inverse_search_setup_neovim_vimtex/.
   function! s:write_server_name() abort

docs/nvim_setup_linux.sh

@@ -124,27 +124,27 @@ fi
 #######################################################################
 #                         lua-language-server                         #
 #######################################################################
-SUMNEKO_LUA_DIR=$HOME/tools/lua-language-server
+LUA_LS_DIR=$HOME/tools/lua-language-server
-SUMNEKO_LUA_SRC_NAME=$HOME/packages/lua-language-server.tar.gz
+LUA_LS_SRC=$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_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"
+        mkdir -p "$LUA_LS_DIR"
-        echo "Extracting to directory $SUMNEKO_LUA_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."

docs/nvim_setup_windows.ps1

@@ -36,19 +36,19 @@ scoop install vcredist2022
 scoop install 7zip
 
 # Install lua-language-server
-$sumneko_lua_link = "https://github.com/sumneko/lua-language-server/releases/download/3.5.3/lua-language-server-3.5.3-win32-x64.zip"
+$lua_ls_link = "https://github.com/LuaLS/lua-language-server/releases/download/3.6.11/lua-language-server-3.6.11-win32-x64.zip"
-$sumneko_lua_install_dir = "D:\portable_tools"
+$lua_ls_install_dir = "D:\portable_tools"
-$sumneko_lua_src_dir = "$sumneko_lua_install_dir\lua-language-server.zip"
+$lua_ls_src_path = "$lua_ls_install_dir\lua-language-server.zip"
-$sumneko_lua_dir = "$sumneko_lua_install_dir\lua-language-server"
+$lua_ls_dir = "$lua_ls_install_dir\lua-language-server"
 
 # Download file, ref: https://stackoverflow.com/a/51225744/6064933
-Invoke-WebRequest $sumneko_lua_link -OutFile "$sumneko_lua_src_dir"
+Invoke-WebRequest $lua_ls_link -OutFile "$lua_ls_src_path"
 
 # Extract the zip file using 7zip, ref: https://stackoverflow.com/a/41933215/6064933
-7z x "$sumneko_lua_src_dir" -o"$sumneko_lua_dir"
+7z x "$lua_ls_src_path" -o"$lua_ls_dir"
 
 # Setup PATH env variable, ref: https://stackoverflow.com/q/714877/6064933
-[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$sumneko_lua_dir\bin", "Machine")
+[Environment]::SetEnvironmentVariable("Path", $env:Path + ";$lua_ls_dir\bin", "Machine")
 
 # Install neovim nightly
 scoop bucket add versions

init.lua

@@ -4,19 +4,23 @@
 -- 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
 
 local api = vim.api
-local utils = require("utils")
+local version = vim.version
 
 -- check if we have the latest stable version of nvim
-local expected_ver = "0.8.0"
+local expected_ver = "0.9.0"
-local nvim_ver = utils.get_nvim_version()
+local ev = version.parse(expected_ver)
+local actual_ver = version()
 
-if nvim_ver ~= expected_ver then
+if version.cmp(ev, actual_ver) ~= 0 then
-  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, nvim_ver)
+  local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
+  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, _ver)
   api.nvim_err_writeln(msg)
   return
 end

lua/config/dashboard-nvim.lua

@@ -1,3 +1,5 @@
+local api = vim.api
+local keymap = vim.keymap
 local dashboard = require("dashboard")
 
 dashboard.custom_header = {
@@ -56,10 +58,11 @@ dashboard.custom_center = {
   },
 }
 
-vim.cmd([[
+api.nvim_create_autocmd("FileType", {
-  augroup dashboard_enter
+  pattern = "dashboard",
-    au!
+  group = api.nvim_create_augroup("dashboard_enter", { clear = true }),
-    autocmd FileType dashboard nnoremap <buffer> q :qa<CR>
+  callback = function ()
-    autocmd FileType dashboard nnoremap <buffer> e :enew<CR>
+    keymap.set("n", "q", ":qa<CR>", { buffer = true, silent = true })
-  augroup END
+    keymap.set("n", "e", ":enew<CR>", { buffer = true, silent = true })
-]])
+  end
+})

lua/config/gitsigns.lua

@@ -49,9 +49,9 @@ vim.api.nvim_create_autocmd('ColorScheme', {
   pattern = "*",
   callback = function()
     vim.cmd [[
-      hi GitSignsChangeInline guibg=fg guifg=bg
+      hi GitSignsChangeInline gui=reverse
-      hi GitSignsAddInline guibg=fg guifg=bg
+      hi GitSignsAddInline gui=reverse
-      hi GitSignsDeleteInline guibg=fg guifg=bg
+      hi GitSignsDeleteInline gui=reverse
     ]]
   end
 })

lua/config/hlslens.lua

@@ -34,5 +34,15 @@ keymap.set("n", "N", "", {
   end,
 })
 
-keymap.set("n", "*", "<Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>")
+keymap.set("n", "*", "", {
-keymap.set("n", "#", "<Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>")
+  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/lsp.lua

@@ -2,6 +2,7 @@ local fn = vim.fn
 local api = vim.api
 local keymap = vim.keymap
 local lsp = vim.lsp
+local diagnostic = vim.diagnostic
 
 local utils = require("utils")
 
@@ -20,11 +21,9 @@ local custom_attach = function(client, bufnr)
   map("n", "<C-k>", vim.lsp.buf.signature_help)
   map("n", "<space>rn", vim.lsp.buf.rename, { desc = "varialbe rename" })
   map("n", "gr", vim.lsp.buf.references, { desc = "show references" })
-  map("n", "[d", vim.diagnostic.goto_prev, { desc = "previous diagnostic" })
+  map("n", "[d", diagnostic.goto_prev, { desc = "previous diagnostic" })
-  map("n", "]d", vim.diagnostic.goto_next, { desc = "next diagnostic" })
+  map("n", "]d", diagnostic.goto_next, { desc = "next diagnostic" })
-  map("n", "<space>q", function()
+  map("n", "<space>q", diagnostic.setqflist, { desc = "put diagnostic to qf" })
-    vim.diagnostic.setqflist { open = true }
-  end, { desc = "put diagnostic to qf" })
   map("n", "<space>ca", vim.lsp.buf.code_action, { desc = "LSP code action" })
   map("n", "<space>wa", vim.lsp.buf.add_workspace_folder, { desc = "add workspace folder" })
   map("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, { desc = "remove workspace folder" })
@@ -54,9 +53,9 @@ local custom_attach = function(client, bufnr)
 
       local cursor_pos = api.nvim_win_get_cursor(0)
       if (cursor_pos[1] ~= vim.b.diagnostics_pos[1] or cursor_pos[2] ~= vim.b.diagnostics_pos[2])
-          and #vim.diagnostic.get() > 0
+          and #diagnostic.get() > 0
       then
-        vim.diagnostic.open_float(nil, float_opts)
+        diagnostic.open_float(nil, float_opts)
       end
 
       vim.b.diagnostics_pos = cursor_pos
@@ -69,12 +68,24 @@ local custom_attach = function(client, bufnr)
       hi! link LspReferenceRead Visual
       hi! link LspReferenceText Visual
       hi! link LspReferenceWrite Visual
-      augroup lsp_document_highlight
-        autocmd! * <buffer>
-        autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
-        autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
-      augroup END
     ]])
+
+    local gid = api.nvim_create_augroup("lsp_document_highlight", { clear = true })
+    api.nvim_create_autocmd("CursorHold" , {
+      group = gid,
+      buffer = bufnr,
+      callback = function ()
+        lsp.buf.document_highlight()
+      end
+    })
+
+    api.nvim_create_autocmd("CursorMoved" , {
+      group = gid,
+      buffer = bufnr,
+      callback = function ()
+        lsp.buf.clear_references()
+      end
+    })
   end
 
   if vim.g.logging_level == "debug" then
@@ -83,9 +94,7 @@ local custom_attach = function(client, bufnr)
   end
 end
 
-local capabilities = lsp.protocol.make_client_capabilities()
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
-capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
-capabilities.textDocument.completion.completionItem.snippetSupport = true
 
 local lspconfig = require("lspconfig")
 
@@ -122,6 +131,20 @@ end
 --   vim.notify("pyright not found!", vim.log.levels.WARN, {title = 'Nvim-config'})
 -- end
 
+if utils.executable("ltex-ls") then
+  lspconfig.ltex.setup {
+    on_attach = custom_attach,
+    cmd = { "ltex-ls" },
+    filetypes = { "text", "plaintex", "tex", "markdown" },
+    settings = {
+      ltex = {
+        language = "en"
+      },
+    },
+    flags = { debounce_text_changes = 300 },
+}
+end
+
 if utils.executable("clangd") then
   lspconfig.clangd.setup {
     on_attach = custom_attach,
@@ -131,8 +154,6 @@ if utils.executable("clangd") then
       debounce_text_changes = 500,
     },
   }
-else
-  vim.notify("clangd not found!", vim.log.levels.WARN, { title = "Nvim-config" })
 end
 
 -- set up vim-language-server
@@ -157,8 +178,8 @@ if utils.executable("bash-language-server") then
 end
 
 if utils.executable("lua-language-server") then
-  -- settings for lua-language-server can be found on https://github.com/sumneko/lua-language-server/wiki/Settings .
+  -- settings for lua-language-server can be found on https://github.com/LuaLS/lua-language-server/wiki/Settings .
-  lspconfig.sumneko_lua.setup {
+  lspconfig.lua_ls.setup {
     on_attach = custom_attach,
     settings = {
       Lua = {
@@ -172,8 +193,8 @@ if utils.executable("lua-language-server") then
         },
         workspace = {
           -- Make the server aware of Neovim runtime files,
-          -- see also https://github.com/sumneko/lua-language-server/wiki/Libraries#link-to-workspace .
+          -- see also https://github.com/LuaLS/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 .
+          -- 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"),
@@ -194,7 +215,7 @@ fn.sign_define("DiagnosticSignInformation", { text = "", texthl = "Diagnostic
 fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" })
 
 -- global config for diagnostic
-vim.diagnostic.config {
+diagnostic.config {
   underline = false,
   virtual_text = false,
   signs = true,

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

@@ -35,7 +35,6 @@ cmp.setup {
     { name = "ultisnips" }, -- For ultisnips user.
     { name = "path" }, -- for path completion
     { name = "buffer", keyword_length = 2 }, -- for buffer word completion
-    { name = "omni" },
     { name = "emoji", insert = true }, -- emoji completion
   },
   completion = {
@@ -61,6 +60,15 @@ cmp.setup {
   },
 }
 
+cmp.setup.filetype("tex", {
+  sources = {
+    { name = "omni" },
+    { name = "ultisnips" }, -- For ultisnips user.
+    { name = "buffer", keyword_length = 2 }, -- for buffer word completion
+    { name = "path" }, -- for path completion
+  },
+})
+
 --  see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu
 vim.cmd([[
   highlight! link CmpItemMenu Comment

lua/config/nvim-tree.lua

@@ -7,9 +7,6 @@ nvim_tree.setup {
   hijack_cursor = false,
   hijack_netrw = true,
   hijack_unnamed_buffer_when_opening = false,
-  ignore_buffer_on_setup = false,
-  open_on_setup = false,
-  open_on_setup_file = false,
   open_on_tab = false,
   sort_by = "name",
   update_cwd = false,
@@ -50,7 +47,6 @@ nvim_tree.setup {
     update_cwd = false,
     ignore_list = {},
   },
-  ignore_ft_on_setup = {},
   system_open = {
     cmd = "",
     args = {},
@@ -113,6 +109,7 @@ nvim_tree.setup {
   },
 }
 
-keymap.set("n", "<space>s", function()
+keymap.set("n", "<space>s", require("nvim-tree.api").tree.toggle, {
-  return require("nvim-tree").toggle(false, true)
+  silent = true,
-end, { silent = true, desc = "toggle nvim-tree" })
+  desc = "toggle nvim-tree",
+})

lua/config/statusline.lua

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

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/custom-autocmd.lua

@@ -25,17 +25,6 @@ api.nvim_create_autocmd({ "TextYankPost" }, {
   end,
 })
 
--- Auto-generate packer_compiled.lua file
-api.nvim_create_autocmd({ "BufWritePost" }, {
-  pattern = "*/nvim/lua/plugins.lua",
-  group = api.nvim_create_augroup("packer_auto_compile", { clear = true }),
-  callback = function(ctx)
-    local cmd = "source " .. ctx.file
-    vim.cmd(cmd)
-    vim.cmd("PackerCompile")
-  end,
-})
-
 -- Auto-create dir when saving a file, in case some intermediate directory does not exist
 api.nvim_create_autocmd({ "BufWritePre" }, {
   pattern = "*",

lua/plugins.lua

@@ -1,27 +1,35 @@
-local utils = require("utils")
+local api = vim.api
 local fn = vim.fn
 
+local utils = require("utils")
+
 -- The root dir to install all plugins. Plugins are under opt/ or start/ sub-directory.
 vim.g.plugin_home = fn.stdpath("data") .. "/site/pack/packer"
 
--- Where to install packer.nvim -- the package manager (we make it opt)
+--- Install packer if it has not been installed.
-local packer_dir = vim.g.plugin_home .. "/opt/packer.nvim"
+--- Return:
+--- true: if this is a fresh install of packer
+--- false: if packer has been installed
+local function packer_ensure_install()
+  -- Where to install packer.nvim -- the package manager (we make it opt)
+  local packer_dir = vim.g.plugin_home .. "/opt/packer.nvim"
 
--- Whether this is a fresh install, i.e., packer itself and plugins have not been installed.
+  if fn.glob(packer_dir) ~= "" then
-local fresh_install = false
+    return false
+  end
 
--- Auto-install packer in case it hasn't been installed.
+  -- Auto-install packer in case it hasn't been installed.
-if fn.glob(packer_dir) == "" then
+  vim.api.nvim_echo({ { "Installing packer.nvim", "Type" } }, true, {})
-  fresh_install = true
 
-  -- Now we need to install packer.nvim first.
   local packer_repo = "https://github.com/wbthomason/packer.nvim"
   local install_cmd = string.format("!git clone --depth=1 %s %s", packer_repo, packer_dir)
-
-  vim.api.nvim_echo({ { "Installing packer.nvim", "Type" } }, true, {})
   vim.cmd(install_cmd)
+
+  return true
 end
 
+local fresh_install = packer_ensure_install()
+
 -- Load packer.nvim
 vim.cmd("packadd packer.nvim")
 
@@ -99,9 +107,6 @@ packer.startup {
       config = [[require('config.hlslens')]],
     }
 
-    -- Stay after pressing * and search selected text
-    use { "haya14busa/vim-asterisk", event = "VimEnter" }
-
     -- File search, tag search and more
     if vim.g.is_win then
       use { "Yggdroot/LeaderF", cmd = "Leaderf" }
@@ -118,19 +123,21 @@ packer.startup {
     use { "nvim-telescope/telescope-symbols.nvim", after = "telescope.nvim" }
 
     -- A list of colorscheme plugin you may want to try. Find what suits you.
-    use { "lifepillar/vim-gruvbox8", opt = true }
     use { "navarasu/onedark.nvim", opt = true }
     use { "sainnhe/edge", opt = true }
     use { "sainnhe/sonokai", opt = true }
     use { "sainnhe/gruvbox-material", opt = true }
     use { "shaunsingh/nord.nvim", opt = true }
-    use { "NTBBloodbath/doom-one.nvim", opt = true }
     use { "sainnhe/everforest", opt = true }
     use { "EdenEast/nightfox.nvim", opt = true }
     use { "rebelot/kanagawa.nvim", opt = true }
     use { "catppuccin/nvim", as = "catppuccin", opt = true }
+    use({ "rose-pine/neovim", as = 'rose-pine', opt = true })
+    use { "olimorris/onedarkpro.nvim", opt = true }
+    use { "tanvirtin/monokai.nvim", opt = true }
+    use { "marko-cerovac/material.nvim", opt = true }
 
-    use { "kyazdani42/nvim-web-devicons", event = "VimEnter" }
+    use { "nvim-tree/nvim-web-devicons", event = "VimEnter" }
 
     use {
       "nvim-lualine/lualine.nvim",
@@ -201,10 +208,14 @@ packer.startup {
     -- Show undo history visually
     use { "simnalamburt/vim-mundo", cmd = { "MundoToggle", "MundoShow" } }
 
+    -- better UI for some nvim actions
+    use {'stevearc/dressing.nvim'}
+
     -- Manage your yank history
-    if vim.g.is_win or vim.g.is_mac then
+    use({
-      use { "svermeulen/vim-yoink", event = "VimEnter" }
+      "gbprod/yanky.nvim",
-    end
+      config = [[require('config.yanky')]]
+    })
 
     -- Handy unix command inside Vim (Rename, Move etc.)
     use { "tpope/vim-eunuch", cmd = { "Rename", "Delete" } }
@@ -255,9 +266,6 @@ packer.startup {
     -- Vim tabular plugin for manipulate tabular, required by markdown plugins
     use { "godlygeek/tabular", cmd = { "Tabularize" } }
 
-    -- Markdown JSON header highlight plugin
-    use { "elzr/vim-json", ft = { "json", "markdown" } }
-
     -- Markdown previewing (only for Mac and Windows)
     if vim.g.is_win or vim.g.is_mac then
       use {
@@ -286,7 +294,7 @@ packer.startup {
     use { "michaeljsmith/vim-indent-object", event = "VimEnter" }
 
     -- Only use these plugin on Windows and Mac and when LaTeX is installed
-    if vim.g.is_win or vim.g.is_mac and utils.executable("latex") then
+    if utils.executable("latex") then
       use { "lervag/vimtex", ft = { "tex" } }
     end
 
@@ -300,17 +308,6 @@ packer.startup {
     -- Modern matchit implementation
     use { "andymass/vim-matchup", event = "VimEnter" }
 
-    -- Smoothie motions
-    use {
-      "karb94/neoscroll.nvim",
-      event = "VimEnter",
-      config = function()
-        vim.defer_fn(function()
-          require("config.neoscroll")
-        end, 2000)
-      end,
-    }
-
     use { "tpope/vim-scriptease", cmd = { "Scriptnames", "Message", "Verbose" } }
 
     -- Asynchronous command execution
@@ -361,8 +358,8 @@ packer.startup {
 
     -- file explorer
     use {
-      "kyazdani42/nvim-tree.lua",
+      "nvim-tree/nvim-tree.lua",
-      requires = { "kyazdani42/nvim-web-devicons" },
+      requires = { "nvim-tree/nvim-web-devicons" },
       config = [[require('config.nvim-tree')]],
     }
 
@@ -388,3 +385,15 @@ else
     vim.notify(msg, vim.log.levels.ERROR, { title = "nvim-config" })
   end
 end
+
+-- Auto-generate packer_compiled.lua file
+api.nvim_create_autocmd({ "BufWritePost" }, {
+  pattern = "*/nvim/lua/plugins.lua",
+  group = api.nvim_create_augroup("packer_auto_compile", { clear = true }),
+  callback = function(ctx)
+    local cmd = "source " .. ctx.file
+    vim.cmd(cmd)
+    vim.cmd("PackerCompile")
+    vim.notify("PackerCompile done!", vim.log.levels.INFO, { title = "Nvim-config" })
+  end,
+})

lua/utils.lua

@@ -31,13 +31,6 @@ function M.may_create_dir(dir)
   end
 end
 
-function M.get_nvim_version()
-  local actual_ver = vim.version()
-
-  local nvim_ver_str = string.format("%d.%d.%d", actual_ver.major, actual_ver.minor, actual_ver.patch)
-  return nvim_ver_str
-end
-
 --- Generate random integers in the range [Low, High], inclusive,
 --- adapted from https://stackoverflow.com/a/12739441/6064933
 --- @low: the lower value for this range

plugin/abbrev.vim

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

spell/en.utf-8.add

@@ -194,7 +194,6 @@ wiki
 backticks
 Reddit
 LeaderF
-gruvbox8
 tabpage
 ccls
 cmake
@@ -203,6 +202,8 @@ llvm
 subsampling
 refactor
 colorschemes
+gruvbox8
+gruvbox
 Gruvbox
 monokai
 NeoSolarized
@@ -440,3 +441,20 @@ Postgres
 plpgsql
 postgres
 PySpark
+winbar
+cmdline
+shada
+async
+localhost
+JetBrains
+localhost
+MariaDB
+SQLite
+Pgadmin
+Datagrip
+mysql
+cwd
+pyright
+stubgen
+pylance
+variadic