Merge 4d289d16b3 into e815de294f

README.md

@@ -9,20 +9,20 @@
     <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/neovim/neovim/releases/tag/stable">
-      <img src="https://img.shields.io/badge/Neovim-0.10.3-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
-    </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.10.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.10.2">
-      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.10.2?style=flat-square" />
+    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.10.0">
+      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.10.0?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" />
@@ -84,7 +84,6 @@ and how to set up on different platforms (Linux, macOS, and Windows).
 + 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)
-+ Code folding with [nvim-ufo](https://github.com/kevinhwang91/nvim-ufo) and [statuscol.nvim](https://github.com/luukvbaal/statuscol.nvim)
 + ......
 
 # UI Demo
@@ -141,12 +140,6 @@ Go to a string starting with `se`
 <img src="https://user-images.githubusercontent.com/16662357/128589873-aadb8264-1098-4834-9876-fa66a309be05.gif" width="800">
 </p>
 
-## code folding with nvim-ufo and statuscol.nvim
-
-<p align="center">
-<img src="https://github.com/user-attachments/assets/a01a56b2-7c91-43de-b305-f2fbaa81dcec" width="800">
-</p>
-
 # Shortcuts
 
 Some of the shortcuts I use frequently are listed here. In the following shortcuts, `<leader>` represents ASCII character `,`.
@@ -172,14 +165,12 @@ Some of the shortcuts I use frequently are listed here. In the following shortcu
 | `<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                                                           |
 | `<leader>gpl`     | Normal        | Linux/macOS/Win | Run git pull                                                             |
 | `<leader>gpu`     | Normal        | Linux/macOS/Win | Run git push                                                             |
-| `<leader>gbd`     | Normal        | Linux/macOS/Win | Delete a branch                                                          |
-| `<leader>gbn`     | Normal        | Linux/macOS/Win | Create a new branch                                                      |
 | `<leader>gl`      | Normal/Visual | Linux/macOS/Win | Get perm link for current/visually-select lines                          |
-| `<leader>gbr`     | Normal        | macOS           | Browse current git repo in browser                                       |
-| `<leader>gb`      | Visual        | macOS           | Blame current line                                                       |
+| `<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                                                        |
@@ -191,6 +182,7 @@ Some of the shortcuts I use frequently are listed here. In the following shortcu
 | `Alt-j`           | Normal        | Linux/macOS/Win | Move current line or selected lines down                                 |
 | `Alt-m`           | Normal        | macOS/Win       | Markdown previewing in system browser                                    |
 | `Alt-Shift-m`     | Normal        | macOS/Win       | Stopping Markdown previewing in system browser                           |
+| `ob`              | Normal/Visual | macOS/Win       | Open link under cursor or search visual selection                        |
 | `ctrl-u`          | Insert        | Linux/macOS/Win | Turn word under cursor to upper case                                     |
 | `ctrl-t`          | Insert        | Linux/macOS/Win | Turn word under cursor to title case                                     |
 | `jk`              | Insert        | Linux/macOS/Win | Return to Normal mode without lagging                                    |
@@ -199,13 +191,11 @@ Some of the shortcuts I use frequently are listed here. In the following shortcu
 
 In addition to commands provided by various plugins, I have also created some 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` |
-| `JSONFormat` | format a JSON file                                                      | `JSONFormat`                   |
-| `CopyPath`   | copy current file path to clipboard                                     | `CopyPath relative`            |
+| 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` |
 
 # Contributing
 

after/ftplugin/json.vim

@@ -0,0 +1,2 @@
+" let the initial folding state be that all folds are closed.
+setlocal foldlevel=0

after/ftplugin/lua.vim

@@ -4,4 +4,6 @@ set formatoptions-=r
 
 nnoremap <buffer><silent> <F9> :luafile %<CR>
 
-nnoremap <buffer><silent> <space>f <cmd>silent !stylua %<CR>
+" Use nvim-treesitter for folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()

after/ftplugin/python.vim

@@ -12,3 +12,7 @@ set tabstop=4       " number of visual spaces per TAB
 set softtabstop=4   " number of spaces in tab when editing
 set shiftwidth=4    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces
+
+" Use nvim-treesitter for folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()

docs/README.md

@@ -118,16 +118,16 @@ The version of Git on the Linux system may be too old so that plugins may break.
 Check [here](https://jdhao.github.io/2021/03/27/upgrade_git_on_linux/) on how to install and set up the latest version of Git.
 For Windows, install [Git for Windows](https://git-scm.com/download/win) and make sure you can run `git` from command line.
 
-### universal-ctags
+### ctags
 
 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 it on Linux, we need to build it from source. See [here](https://askubuntu.com/a/836521/768311) for the details.
-To install ctags on macOS, use [Homebrew](https://formulae.brew.sh/formula/universal-ctags):
+To install ctags on macOS, use [Homebrew](https://github.com/universal-ctags/homebrew-universal-ctags):
 
 ```bash
-brew install universal-ctags
+brew install ctags
 ```
 
 To install it Windows, use [chocolatey](https://chocolatey.org/) or [scoop](https://scoop.sh/)
@@ -166,9 +166,35 @@ Set their PATH properly and make sure you can run `pylint`, `flake8` and `vint`
 There are various ways to install Nvim depending on your system.
 This config is only maintained for [the latest nvim stable release](https://github.com/neovim/neovim/releases/tag/stable).
 
-Please check the official doc on how to install Neovim on different systems: https://github.com/neovim/neovim/blob/master/INSTALL.md
+### Linux
 
-After installing Nvim, we need to set the PATH to nvim correctly.
+You can directly download the binary release from [here](https://github.com/neovim/neovim/releases/download/stable/nvim-linux64.tar.gz).
+You can also use the system package manager to install nvim,
+but that is not reliable since the latest version may not be available.
+
+### Windows
+
+You may download from [nvim release](https://github.com/neovim/neovim/releases/download/stable/nvim-win64.zip) from GitHub and manually extract it.
+
+Another way to install Nvim on Windows is via chocolatey or scoop:
+
+```
+choco install neovim
+
+# via scoop
+# scoop bucket add versions
+# scoop install neovim
+```
+
+### macOS
+
+It is recommended to install neovim via [Homebrew](https://brew.sh/) on macOS. Simply run the following command:
+
+```bash
+brew install neovim
+```
+
+After installing Nvim, we need to set the path to nvim correctly.
 **Make sure that you can run `nvim` from the command line after all these setups**.
 
 ## Setting up Nvim

init.lua

@@ -11,23 +11,40 @@
 -- StackOverflow: https://stackoverflow.com/users/6064933/jdhao
 vim.loader.enable()
 
-local utils = require("utils")
+local version = vim.version
 
-local expected_version = "0.10.3"
-utils.is_compatible_version(expected_version)
+-- check if we have the latest stable version of nvim
+local expected_ver = "0.10.1"
+local expect_ver = version.parse(expected_ver)
+local actual_ver = version()
 
-local config_dir = vim.fn.stdpath("config")
----@cast config_dir string
+local result = version.cmp(expect_ver, actual_ver)
 
--- some global settings
-require("globals")
--- setting options in nvim
-vim.cmd("source " .. vim.fs.joinpath(config_dir, "viml_conf/options.vim"))
--- various autocommands
-require("custom-autocmd")
--- all the user-defined mappings
-require("mappings")
--- all the plugins installed and their configurations
-vim.cmd("source " .. vim.fs.joinpath(config_dir, "viml_conf/plugins.vim"))
--- colorscheme settings
-require("colorschemes")
+if  result ~= 0 then
+  local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
+  local msg = string.format("Expect nvim %s, but got %s instead. Use at your own risk!", expected_ver, _ver)
+  vim.api.nvim_err_writeln(msg)
+end
+
+local core_conf_files = {
+  "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 _, 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

lua/colorschemes.lua

@@ -24,9 +24,9 @@ M.colorscheme_conf = {
   end,
   gruvbox_material = function()
     -- foreground option can be material, mix, or original
-    vim.g.gruvbox_material_foreground = "original"
+    vim.g.gruvbox_material_foreground = "material"
     --background option can be hard, medium, soft
-    vim.g.gruvbox_material_background = "medium"
+    vim.g.gruvbox_material_background = "soft"
     vim.g.gruvbox_material_enable_italic = 1
     vim.g.gruvbox_material_better_performance = 1
 
@@ -50,17 +50,11 @@ M.colorscheme_conf = {
   end,
   onedarkpro = function()
     -- set colorscheme after options
-    vim.cmd("colorscheme onedark_vivid")
+    vim.cmd('colorscheme onedark_vivid')
   end,
   material = function()
     vim.g.material_style = "oceanic"
-    vim.cmd("colorscheme material")
-  end,
-  arctic = function()
-    vim.cmd("colorscheme arctic")
-  end,
-  kanagawa = function()
-    vim.cmd("colorscheme kanagawa-wave")
+    vim.cmd('colorscheme material')
   end,
 }
 

lua/config/bufferline.lua

@@ -1,6 +1,6 @@
 require("bufferline").setup {
   options = {
-    numbers = "none",
+    numbers = "buffer_id",
     close_command = "bdelete! %d",
     right_mouse_command = nil,
     left_mouse_command = "buffer %d",
@@ -44,7 +44,3 @@ require("bufferline").setup {
     sort_by = "id",
   },
 }
-
-vim.keymap.set("n", "<space>bp", "<cmd>BufferLinePick<CR>", {
-  desc = "pick a buffer",
-})

lua/config/dashboard-nvim.lua

@@ -59,17 +59,17 @@ conf.center = {
   },
 }
 
-dashboard.setup {
-  theme = "doom",
-  shortcut_type = "number",
-  config = conf,
-}
+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()
+  callback = function ()
     keymap.set("n", "q", ":qa<CR>", { buffer = true, silent = true })
     keymap.set("n", "e", ":enew<CR>", { buffer = true, silent = true })
-  end,
+  end
 })

lua/config/fugitive.lua

@@ -1,27 +1,11 @@
 local keymap = vim.keymap
 
-keymap.set("n", "<leader>gs", "<cmd>Git<cr>", { desc = "Git: show status" })
-keymap.set("n", "<leader>gw", "<cmd>Gwrite<cr>", { desc = "Git: add file" })
-keymap.set("n", "<leader>gc", "<cmd>Git commit<cr>", { desc = "Git: commit changes" })
-keymap.set("n", "<leader>gpl", "<cmd>Git pull<cr>", { desc = "Git: pull changes" })
-keymap.set("n", "<leader>gpu", "<cmd>15 split|term git push<cr>", { desc = "Git: push changes" })
-keymap.set("v", "<leader>gb", ":Git blame<cr>", { desc = "Git: blame selected line" })
+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")
-
-keymap.set("n", "<leader>gbn", function()
-  vim.ui.input({ prompt = "Enter a new branch name" }, function(user_input)
-    if user_input == nil or user_input == "" then
-      return
-    end
-
-    local cmd_str = string.format("G checkout -b %s", user_input)
-    vim.cmd(cmd_str)
-  end)
-end, {
-  desc = "Git: create new branch",
-})
-
-keymap.set("n", "<leader>gf", ":Git fetch ", { desc = "Git: prune branches" })
-keymap.set("n", "<leader>gbd", ":Git branch -D ", { desc = "Git: delete branch" })
+vim.fn['utils#Cabbrev']('git', 'Git')

lua/config/git-linker.lua

@@ -5,26 +5,16 @@ gitlinker.setup {
   callbacks = {
     ["dev.azure.com"] = function(url_data)
       vim.print(url_data)
-      local url = require("gitlinker.hosts").get_base_https_url(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"
+        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,
+    end
   },
   mappings = nil,
 }
@@ -34,14 +24,14 @@ keymap.set({ "n", "v" }, "<leader>gl", function()
   gitlinker.get_buf_range_url(mode)
 end, {
   silent = true,
-  desc = "Git: get permlink",
+  desc = "get git permlink",
 })
 
-keymap.set("n", "<leader>gbr", function()
-  gitlinker.get_repo_url {
-    action_callback = gitlinker.actions.open_in_browser,
-  }
+keymap.set("n", "<leader>gb", function()
+  gitlinker.get_repo_url({
+    action_callback = gitlinker.actions.open_in_browser
+  })
 end, {
   silent = true,
-  desc = "Git: browse repo in browser",
+  desc = "browse repo in browser",
 })

lua/config/gitsigns.lua

@@ -45,13 +45,13 @@ gs.setup {
   end,
 }
 
-vim.api.nvim_create_autocmd("ColorScheme", {
+vim.api.nvim_create_autocmd('ColorScheme', {
   pattern = "*",
   callback = function()
-    vim.cmd([[
+    vim.cmd [[
       hi GitSignsChangeInline gui=reverse
       hi GitSignsAddInline gui=reverse
       hi GitSignsDeleteInline gui=reverse
-    ]])
-  end,
+    ]]
+  end
 })

lua/config/hlslens.lua

@@ -14,7 +14,7 @@ local activate_hlslens = function(direction)
 
   -- Deal with the case that there is no such pattern in current buffer.
   if not status then
-    local start_idx, _ = string.find(msg, "E486", 1, true)
+    local start_idx, _ = string.find(msg, 'E486', 1, true)
     local msg_part = string.sub(msg, start_idx)
     api.nvim_err_writeln(msg_part)
     return
@@ -35,48 +35,15 @@ keymap.set("n", "N", "", {
   end,
 })
 
-local check_cursor_word = function()
-  local cursor_word = vim.fn.expand("<cword>")
-  local result = cursor_word == ""
-  if result then
-    local msg = "E348: No string under cursor"
-    api.nvim_err_writeln(msg)
-  end
-
-  return result, cursor_word
-end
-
 keymap.set("n", "*", "", {
   callback = function()
-    local cursor_word_empty, cursor_word = check_cursor_word()
-    if cursor_word_empty then
-      return
-    end
-
-    local cmd = string.format([[normal! /\v<%s>]], cursor_word)
-
-    -- In order to say that we are pressing Enter key, instead of typing literally the character,
-    -- we need to replace special notation with their internal representation.
-    local escaped_enter = vim.api.nvim_replace_termcodes("<CR>", true, false, true)
-
-    -- character `N` is used to keep the cursor when pressing `*`
-    local full_cmd = cmd .. escaped_enter .. "N"
-    vim.fn.execute(full_cmd)
+    vim.fn.execute("normal! *N")
     hlslens.start()
   end,
 })
 keymap.set("n", "#", "", {
   callback = function()
-    local cursor_word_empty, cursor_word = check_cursor_word()
-    if cursor_word_empty then
-      return
-    end
-
-    local cmd = string.format([[normal! ?\v<%s>]], cursor_word)
-    local escaped_enter = vim.api.nvim_replace_termcodes("<CR>", true, false, true)
-
-    local full_cmd = cmd .. escaped_enter .. "N"
-    vim.fn.execute(full_cmd)
+    vim.fn.execute("normal! #N")
     hlslens.start()
   end,
 })

lua/config/live-command.lua

@@ -1,4 +0,0 @@
-require("live-command").setup {
-  enable_highlighting = true,
-  inline_highlighting = true,
-}

lua/config/lsp.lua

@@ -3,7 +3,6 @@ local api = vim.api
 local keymap = vim.keymap
 local lsp = vim.lsp
 local diagnostic = vim.diagnostic
-local lspconfig = require("lspconfig")
 
 local utils = require("utils")
 
@@ -13,10 +12,10 @@ local set_qflist = function(buf_num, severity)
   diagnostics = diagnostic.get(buf_num, { severity = severity })
 
   local qf_items = diagnostic.toqflist(diagnostics)
-  vim.fn.setqflist({}, " ", { title = "Diagnostics", items = qf_items })
+  vim.fn.setqflist({}, ' ', { title = 'Diagnostics', items = qf_items })
 
   -- open quickfix by default
-  vim.cmd([[copen]])
+  vim.cmd[[copen]]
 end
 
 local custom_attach = function(client, bufnr)
@@ -39,25 +38,19 @@ local custom_attach = function(client, bufnr)
   -- 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>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()
-    vim.print(vim.lsp.buf.list_workspace_folders())
+    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 and client.name ~= "lua_ls" then
-    map({ "n", "x" }, "<space>f", vim.lsp.buf.format, { desc = "format code" })
+  if client.server_capabilities.documentFormattingProvider then
+    map("n", "<space>f", vim.lsp.buf.format, { desc = "format code" })
   end
 
-  -- Uncomment code below to enable inlay hint from language server, some LSP server supports inlay hint,
-  -- but disable this feature by default, so you may need to enable inlay hint in the LSP server config.
-  -- vim.lsp.inlay_hint.enable(true, {buffer=bufnr})
-
   api.nvim_create_autocmd("CursorHold", {
     buffer = bufnr,
     callback = function()
@@ -74,9 +67,8 @@ 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 #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
         diagnostic.open_float(nil, float_opts)
       end
@@ -94,20 +86,20 @@ local custom_attach = function(client, bufnr)
     ]])
 
     local gid = api.nvim_create_augroup("lsp_document_highlight", { clear = true })
-    api.nvim_create_autocmd("CursorHold", {
+    api.nvim_create_autocmd("CursorHold" , {
       group = gid,
       buffer = bufnr,
-      callback = function()
+      callback = function ()
         lsp.buf.document_highlight()
-      end,
+      end
     })
 
-    api.nvim_create_autocmd("CursorMoved", {
+    api.nvim_create_autocmd("CursorMoved" , {
       group = gid,
       buffer = bufnr,
-      callback = function()
+      callback = function ()
         lsp.buf.clear_references()
-      end,
+      end
     })
   end
 
@@ -117,101 +109,65 @@ local custom_attach = function(client, bufnr)
   end
 end
 
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
--- required by nvim-ufo
-capabilities.textDocument.foldingRange = {
-  dynamicRegistration = false,
-  lineFoldingOnly = true,
-}
+local lspconfig = require("lspconfig")
 
--- For what diagnostic is enabled in which type checking mode, check doc:
--- https://github.com/microsoft/pyright/blob/main/docs/configuration.md#diagnostic-settings-defaults
--- Currently, the pyright also has some issues displaying hover documentation:
--- https://www.reddit.com/r/neovim/comments/1gdv1rc/what_is_causeing_the_lsp_hover_docs_to_looks_like/
+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
 
-if utils.executable("pyright") then
-  local new_capability = {
-    -- this will remove some of the diagnostics that duplicates those from ruff, idea taken and adapted from
-    -- here: https://github.com/astral-sh/ruff-lsp/issues/384#issuecomment-1989619482
-    textDocument = {
-      publishDiagnostics = {
-        tagSupport = {
-          valueSet = { 2 },
-        },
-      },
-      hover = {
-        contentFormat = { "plaintext" },
-        dynamicRegistration = true,
-      },
-    },
-  }
-  local merged_capability = vim.tbl_deep_extend("force", capabilities, new_capability)
-
-  lspconfig.pyright.setup {
-    cmd = { "delance-langserver", "--stdio" },
+  lspconfig.pylsp.setup {
     on_attach = custom_attach,
-    capabilities = merged_capability,
     settings = {
-      pyright = {
-        -- disable import sorting and use Ruff for this
-        disableOrganizeImports = true,
-        disableTaggedHints = false,
-      },
-      python = {
-        analysis = {
-          autoSearchPaths = true,
-          diagnosticMode = "workspace",
-          typeCheckingMode = "standard",
-          useLibraryCodeForTypes = true,
-          -- we can this setting below to redefine some diagnostics
-          diagnosticSeverityOverrides = {
-            deprecateTypingAliases = false,
-          },
-          -- inlay hint settings are provided by pylance?
-          inlayHints = {
-            callArgumentNames = "partial",
-            functionReturnTypes = true,
-            pytestParameters = true,
-            variableTypes = true,
+      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 },
+          -- import sorting
+          isort = { enabled = true },
         },
       },
     },
+    flags = {
+      debounce_text_changes = 200,
+    },
+    capabilities = capabilities,
   }
 else
-  vim.notify("pyright not found!", vim.log.levels.WARN, { title = "Nvim-config" })
+  vim.notify("pylsp not found!", vim.log.levels.WARN, { title = "Nvim-config" })
 end
 
-if utils.executable("ruff") then
-  require("lspconfig").ruff.setup {
-    on_attach = custom_attach,
-    capabilities = capabilities,
-    init_options = {
-      -- the settings can be found here: https://docs.astral.sh/ruff/editors/settings/
-      settings = {
-        organizeImports = true,
-      },
-    },
-  }
-end
-
--- Disable ruff hover feature in favor of Pyright
-vim.api.nvim_create_autocmd("LspAttach", {
-  group = vim.api.nvim_create_augroup("lsp_attach_disable_ruff_hover", { clear = true }),
-  callback = function(args)
-    local client = vim.lsp.get_client_by_id(args.data.client_id)
-    -- vim.print(client.name, client.server_capabilities)
-
-    if client == nil then
-      return
-    end
-    if client.name == "ruff" then
-      client.server_capabilities.hoverProvider = false
-    end
-  end,
-  desc = "LSP: Disable hover capability from Ruff",
-})
+-- if utils.executable('pyright') then
+--   lspconfig.pyright.setup{
+--     on_attach = custom_attach,
+--     capabilities = capabilities
+--   }
+-- else
+--   vim.notify("pyright not found!", vim.log.levels.WARN, {title = 'Nvim-config'})
+-- end
 
 if utils.executable("ltex-ls") then
   lspconfig.ltex.setup {
@@ -220,11 +176,11 @@ if utils.executable("ltex-ls") then
     filetypes = { "text", "plaintex", "tex", "markdown" },
     settings = {
       ltex = {
-        language = "en",
+        language = "en"
       },
     },
     flags = { debounce_text_changes = 300 },
-  }
+}
 end
 
 if utils.executable("clangd") then
@@ -259,8 +215,8 @@ if utils.executable("bash-language-server") then
   }
 end
 
--- settings for lua-language-server can be found on https://luals.github.io/wiki/settings/
 if utils.executable("lua-language-server") then
+  -- 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 = {
@@ -269,8 +225,20 @@ if utils.executable("lua-language-server") then
           -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
           version = "LuaJIT",
         },
-        hint = {
-          enable = true,
+        diagnostics = {
+          -- Get the language server to recognize the `vim` global
+          globals = { "vim" },
+        },
+        workspace = {
+          -- Make the server aware of Neovim runtime files,
+          -- 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 = {
+            vim.env.VIMRUNTIME,
+            fn.stdpath("config"),
+          },
+          maxPreload = 2000,
+          preloadFileSize = 50000,
         },
       },
     },
@@ -279,10 +247,10 @@ if utils.executable("lua-language-server") then
 end
 
 -- Change diagnostic signs.
-fn.sign_define("DiagnosticSignError", { text = "🆇", texthl = "DiagnosticSignError" })
-fn.sign_define("DiagnosticSignWarn", { text = "⚠️", texthl = "DiagnosticSignWarn" })
-fn.sign_define("DiagnosticSignInfo", { 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
 diagnostic.config {

lua/config/nvim-cmp.lua

@@ -35,6 +35,7 @@ cmp.setup {
     { 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,
@@ -49,14 +50,12 @@ cmp.setup {
       menu = {
         nvim_lsp = "[LSP]",
         ultisnips = "[US]",
+        nvim_lua = "[Lua]",
         path = "[Path]",
         buffer = "[Buffer]",
         emoji = "[Emoji]",
         omni = "[Omni]",
       },
-      show_labelDetails = true,
-      maxwidth = 40,
-      ellipsis_char = "...",
     },
   },
 }

lua/config/nvim-statuscol.lua

@@ -1,23 +0,0 @@
-local builtin = require("statuscol.builtin")
-local ffi = require("statuscol.ffidef")
-local C = ffi.C
-
--- only show fold level up to this level
-local fold_level_limit = 3
-local function foldfunc(args)
-  local foldinfo = C.fold_info(args.wp, args.lnum)
-  if foldinfo.level > fold_level_limit then
-    return " "
-  end
-
-  return builtin.foldfunc(args)
-end
-
-require("statuscol").setup {
-  relculright = false,
-  segments = {
-    { text = { "%s" }, click = "v:lua.ScSa" },
-    { text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa" },
-    { text = { foldfunc, " " }, condition = { true, builtin.not_empty }, click = "v:lua.ScFa" },
-  },
-}

lua/config/nvim_hop.lua

@@ -4,7 +4,7 @@ hop.setup {
   case_insensitive = true,
   char2_fallback_key = "<CR>",
   quit_key = "<Esc>",
-  match_mappings = { "zh_sc" },
+  match_mappings = { "zh_sc" }
 }
 
 keymap.set({ "n", "v", "o" }, "f", "", {
@@ -24,5 +24,5 @@ vim.api.nvim_create_autocmd("ColorScheme", {
       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,
+  end
 })

lua/config/nvim_ufo.lua

@@ -1,44 +0,0 @@
-local handler = function(virtText, lnum, endLnum, width, truncate)
-  local newVirtText = {}
-  local foldedLines = endLnum - lnum
-  local suffix = (" 󰁂  %d"):format(foldedLines)
-  local sufWidth = vim.fn.strdisplaywidth(suffix)
-  local targetWidth = width - sufWidth
-  local curWidth = 0
-
-  for _, chunk in ipairs(virtText) do
-    local chunkText = chunk[1]
-    local chunkWidth = vim.fn.strdisplaywidth(chunkText)
-    if targetWidth > curWidth + chunkWidth then
-      table.insert(newVirtText, chunk)
-    else
-      chunkText = truncate(chunkText, targetWidth - curWidth)
-      local hlGroup = chunk[2]
-      table.insert(newVirtText, { chunkText, hlGroup })
-      chunkWidth = vim.fn.strdisplaywidth(chunkText)
-      -- str width returned from truncate() may less than 2nd argument, need padding
-      if curWidth + chunkWidth < targetWidth then
-        suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth)
-      end
-      break
-    end
-    curWidth = curWidth + chunkWidth
-  end
-  local rAlignAppndx = math.max(math.min(vim.opt.textwidth["_value"], width - 1) - curWidth - sufWidth, 0)
-  suffix = (" "):rep(rAlignAppndx) .. suffix
-  table.insert(newVirtText, { suffix, "MoreMsg" })
-  return newVirtText
-end
-
-require("ufo").setup {
-  fold_virt_text_handler = handler,
-}
-
-vim.keymap.set("n", "zR", require("ufo").openAllFolds)
-vim.keymap.set("n", "zM", require("ufo").closeAllFolds)
-vim.keymap.set("n", "zr", require("ufo").openFoldsExceptKinds)
-vim.keymap.set("n", "<leader>K", function()
-  local _ = require("ufo").peekFoldedLinesUnderCursor()
-end, {
-  desc = "Preview folded maps",
-})

lua/config/statusline.lua

@@ -99,12 +99,12 @@ end
 
 local virtual_env = function()
   -- only show virtual env for Python
-  if vim.bo.filetype ~= "python" then
+  if vim.bo.filetype ~= 'python' then
     return ""
   end
 
-  local conda_env = os.getenv("CONDA_DEFAULT_ENV")
-  local venv_path = os.getenv("VIRTUAL_ENV")
+  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
@@ -113,93 +113,53 @@ local virtual_env = function()
       return string.format("  %s (conda)", conda_env)
     end
   else
-    local venv_name = vim.fn.fnamemodify(venv_path, ":t")
+    local venv_name = vim.fn.fnamemodify(venv_path, ':t')
     return string.format("  %s (venv)", venv_name)
   end
 end
 
-local get_active_lsp = function()
-  local msg = "No Active Lsp"
-  local buf_ft = vim.api.nvim_get_option_value("filetype", {})
-  local clients = vim.lsp.get_clients { bufnr = 0 }
-  if next(clients) == nil then
-    return msg
-  end
-
-  for _, client in ipairs(clients) do
-    ---@diagnostic disable-next-line: undefined-field
-    local filetypes = client.config.filetypes
-    if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then
-      return client.name
-    end
-  end
-  return msg
-end
-
 require("lualine").setup {
   options = {
     icons_enabled = true,
     theme = "auto",
-    component_separators = { left = "⏐", right = "⏐" },
+    -- component_separators = { left = "", right = "" },
+    -- section_separators = { left = "", right = "" },
     section_separators = "",
+    component_separators = "",
     disabled_filetypes = {},
     always_divide_middle = true,
   },
   sections = {
-    lualine_a = {
-      "mode",
-    },
+    lualine_a = { "mode" },
     lualine_b = {
-      {
-        "branch",
-        fmt = function(name, _)
-          -- truncate branch name in case the name is too long
-          return string.sub(name, 1, 20)
-        end,
-        color = { gui = "italic,bold" },
-      },
-      {
-        virtual_env,
-        color = { fg = "black", bg = "#F1CA81" },
-      },
-    },
-    lualine_c = {
-      {
-        "filename",
-        symbols = {
-          readonly = "[🔒]",
-        },
-      },
+      "branch",
       {
         "diff",
         source = diff,
       },
       {
-        "%S",
-        color = { gui = "bold", fg = "cyan" },
-      },
-      {
-        spell,
-        color = { fg = "black", bg = "#a7c080" },
-      },
+        virtual_env,
+        color = { fg = 'black', bg = "#F1CA81" }
+      }
     },
-    lualine_x = {
+    lualine_c = {
+      "filename",
       {
         ime_state,
         color = { fg = "black", bg = "#f46868" },
       },
       {
-        get_active_lsp,
-        icon = " LSP:",
+        spell,
+        color = { fg = "black", bg = "#a7c080" },
       },
       {
         "diagnostics",
         sources = { "nvim_diagnostic" },
-        symbols = { error = "🆇 ", warn = "⚠️ ", info = "ℹ️ ", hint = " " },
+        symbols = {error = '🆇 ', warn = '⚠️ ', info = 'ℹ️ ', hint = ' '},
       },
     },
-    lualine_y = {
-      { "encoding", fmt = string.upper },
+    lualine_x = {
+      "encoding",
       {
         "fileformat",
         symbols = {
@@ -210,6 +170,9 @@ require("lualine").setup {
       },
       "filetype",
     },
+    lualine_y = {
+      "location",
+    },
     lualine_z = {
       {
         trailing_space,
@@ -219,8 +182,6 @@ require("lualine").setup {
         mixed_indent,
         color = "WarningMsg",
       },
-      "location",
-      "progress",
     },
   },
   inactive_sections = {

lua/config/treesitter.lua

@@ -3,6 +3,6 @@ require("nvim-treesitter.configs").setup {
   ignore_install = {}, -- List of parsers to ignore installing
   highlight = {
     enable = true, -- false will disable the whole extension
-    disable = { "help" }, -- list of language that will be disabled
+    disable = { 'help' }, -- list of language that will be disabled
   },
 }

lua/config/ufo.lua

@@ -0,0 +1,22 @@
+local keymap = vim.keymap
+
+-- disable foldcolumn, see https://github.com/kevinhwang91/nvim-ufo/issues/4
+vim.o.foldcolumn = '0'
+vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
+vim.o.foldlevelstart = 99
+vim.o.foldenable = true -- Don't set nofoldenable in ftplugin
+
+-- treesitter as a main provider instead
+-- Only depend on `nvim-treesitter/queries/filetype/folds.scm`,
+-- performance and stability are better than `foldmethod=nvim_treesitter#foldexpr()`
+require('ufo').setup({
+    provider_selector = function(bufnr, filetype, buftype)
+        return {'treesitter', 'indent'}
+    end
+})
+
+local ufo = require('ufo')
+keymap.set('n', 'zR', ufo.openAllFolds, { desc = 'Open all folds' })
+keymap.set('n', 'zM', ufo.closeAllFolds, { desc = 'Close all folds' })
+keymap.set('n', 'zr', ufo.openFoldsExceptKinds, { desc = 'Fold less' })
+keymap.set('n', 'zm', ufo.closeFoldsWith, { desc = 'Fold more' })

lua/config/which-key.lua

@@ -1,6 +1,6 @@
 require("which-key").setup {
   preset = "modern",
   icons = {
-    mappings = false,
-  },
+    mappings = false
+  }
 }

lua/config/yanky.lua

@@ -1,17 +1,13 @@
-require("yanky").setup {
+require("yanky").setup({
+  ring = {
+    history_length = 50,
+    storage = "memory",
+  },
   preserve_cursor_position = {
     enabled = false,
   },
-  highlight = {
-    on_put = true,
-    on_yank = false,
-    timer = 300,
-  },
-}
-
-vim.keymap.set({ "n", "x" }, "p", "<Plug>(YankyPutAfter)")
-vim.keymap.set({ "n", "x" }, "P", "<Plug>(YankyPutBefore)")
+})
 
 -- cycle through the yank history, only work after paste
-vim.keymap.set("n", "[y", "<Plug>(YankyPreviousEntry)")
-vim.keymap.set("n", "]y", "<Plug>(YankyNextEntry)")
+vim.keymap.set("n", "[y", "<Plug>(YankyCycleForward)")
+vim.keymap.set("n", "]y", "<Plug>(YankyCycleBackward)")

lua/config/zen-mode.lua

@@ -0,0 +1,15 @@
+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,
+    options = {
+      -- signcolumn = "no", -- disable signcolumn
+      -- number = false, -- disable number column
+      -- relativenumber = false, -- disable relative numbers
+      cursorline = false, -- disable cursorline
+      cursorcolumn = false, -- disable cursor column
+      foldcolumn = "0", -- disable fold column
+      list = false, -- disable whitespace characters
+    },
+  },
+}

lua/custom-autocmd.lua

@@ -38,8 +38,8 @@ 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)
+    if vim.v.event.operator == 'y' then
+      vim.fn.setpos('.', vim.g.current_cursor_pos)
     end
   end,
 })
@@ -102,173 +102,4 @@ local function open_nvim_tree(data)
   require("nvim-tree.api").tree.open()
 end
 
-api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
-
--- Do not use smart case in command line mode, extracted from https://vi.stackexchange.com/a/16511/15292.
-api.nvim_create_augroup("dynamic_smartcase", { clear = true })
-api.nvim_create_autocmd("CmdLineEnter", {
-  group = "dynamic_smartcase",
-  pattern = ":",
-  callback = function()
-    vim.o.smartcase = false
-  end,
-})
-
-api.nvim_create_autocmd("CmdLineLeave", {
-  group = "dynamic_smartcase",
-  pattern = ":",
-  callback = function()
-    vim.o.smartcase = true
-  end,
-})
-
-api.nvim_create_autocmd("TermOpen", {
-  group = api.nvim_create_augroup("term_start", { clear = true }),
-  pattern = "*",
-  callback = function()
-    -- Do not use number and relative number for terminal inside nvim
-    vim.wo.relativenumber = false
-    vim.wo.number = false
-
-    -- Go to insert mode by default to start typing command
-    vim.cmd("startinsert")
-  end,
-})
-
--- Return to last cursor position when opening a file, note that here we cannot use BufReadPost
--- as event. It seems that when BufReadPost is triggered, FileType event is still not run.
--- So the filetype for this buffer is empty string.
-api.nvim_create_autocmd("FileType", {
-  group = api.nvim_create_augroup("resume_cursor_position", { clear = true }),
-  pattern = "*",
-  callback = function(ev)
-    local mark_pos = api.nvim_buf_get_mark(ev.buf, '"')
-    local last_cursor_line = mark_pos[1]
-
-    local max_line = vim.fn.line("$")
-    local buf_filetype = api.nvim_get_option_value("filetype", { buf = ev.buf })
-    local buftype = api.nvim_get_option_value("buftype", { buf = ev.buf })
-
-    -- only handle normal files
-    if buf_filetype == "" or buftype ~= "" then
-      return
-    end
-
-    -- Only resume last cursor position when there is no go-to-line command (something like '+23').
-    if vim.fn.match(vim.v.argv, [[\v^\+(\d){1,}$]]) ~= -1 then
-      return
-    end
-
-    if last_cursor_line > 1 and last_cursor_line <= max_line then
-      -- vim.print(string.format("mark_pos: %s", vim.inspect(mark_pos)))
-      -- it seems that without vim.schedule, the cursor position can not be set correctly
-      vim.schedule(function()
-        local status, result = pcall(api.nvim_win_set_cursor, 0, mark_pos)
-        if not status then
-          api.nvim_err_writeln(
-            string.format("Failed to resume cursor position. Context %s, error: %s", vim.inspect(ev), result)
-          )
-        end
-      end)
-      -- the following two ways also seem to work,
-      -- ref: https://www.reddit.com/r/neovim/comments/104lc26/how_can_i_press_escape_key_using_lua/
-      -- vim.api.nvim_feedkeys("g`\"", "n", true)
-      -- vim.fn.execute("normal! g`\"")
-    end
-  end,
-})
-
-local number_toggle_group = api.nvim_create_augroup("numbertoggle", { clear = true })
-api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave", "WinEnter" }, {
-  pattern = "*",
-  group = number_toggle_group,
-  desc = "togger line number",
-  callback = function()
-    if vim.wo.number then
-      vim.wo.relativenumber = true
-    end
-  end,
-})
-
-api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter", "WinLeave" }, {
-  group = number_toggle_group,
-  desc = "togger line number",
-  callback = function()
-    if vim.wo.number then
-      vim.wo.relativenumber = false
-    end
-  end,
-})
-
-api.nvim_create_autocmd("ColorScheme", {
-  group = api.nvim_create_augroup("custom_highlight", { clear = true }),
-  pattern = "*",
-  desc = "Define or overrride some highlight groups",
-  callback = function()
-    -- For yank highlight
-    vim.api.nvim_set_hl(0, "YankColor", { fg = "#34495E", bg = "#2ECC71", ctermfg = 59, ctermbg = 41 })
-
-    -- For cursor colors
-    vim.api.nvim_set_hl(0, "Cursor", { fg = "black", bg = "#00c918", bold = true })
-    vim.api.nvim_set_hl(0, "Cursor2", { fg = "red", bg = "red" })
-
-    -- For floating windows border highlight
-    vim.api.nvim_set_hl(0, "FloatBorder", { fg = "LightGreen" })
-
-    -- highlight for matching parentheses
-    vim.api.nvim_set_hl(0, "MatchParen", { bold = true, underline = true })
-  end,
-})
-
-api.nvim_create_autocmd("BufEnter", {
-  pattern = "*",
-  group = api.nvim_create_augroup("auto_close_win", { clear = true }),
-  desc = "Quit Nvim if we have only one window, and its filetype match our pattern",
-  callback = function(ev)
-    local quit_filetypes = { "qf", "vista", "NvimTree" }
-
-    local should_quit = true
-    local tabwins = api.nvim_tabpage_list_wins(0)
-
-    for _, win in pairs(tabwins) do
-      local buf = api.nvim_win_get_buf(win)
-      local bf = fn.getbufvar(buf, "&filetype")
-
-      if fn.index(quit_filetypes, bf) == -1 then
-        should_quit = false
-      end
-    end
-
-    if should_quit then
-      vim.cmd("qall")
-    end
-  end,
-})
-
-api.nvim_create_autocmd({ "VimEnter", "DirChanged" }, {
-  group = api.nvim_create_augroup("git_repo_check", { clear = true }),
-  pattern = "*",
-  desc = "check if we are inside Git repo",
-  command = "call utils#Inside_git_repo()",
-})
-
--- ref: https://vi.stackexchange.com/a/169/15292
-api.nvim_create_autocmd("BufReadPre", {
-  group = api.nvim_create_augroup("large_file", { clear = true }),
-  pattern = "*",
-  desc = "check if we are inside Git repo",
-  callback = function(ev)
-    local file_size_limit = 524288 -- 0.5MB
-    local f = ev.file
-
-    if fn.getfsize(f) > file_size_limit or fn.getfsize(f) == -2 then
-      vim.o.eventignore = "all"
-      --  turning off relative number helps a lot
-      vim.wo.relativenumber = false
-
-      vim.bo.swapfile = false
-      vim.bo.bufhidden = "unload"
-      vim.bo.undolevels = -1
-    end
-  end,
-})
+vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })

lua/globals.lua

@@ -1,28 +1,33 @@
 local fn = vim.fn
 local api = vim.api
 
-local utils = require("utils")
+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.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
+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 utils.executable('python3') then
   if vim.g.is_win then
-    vim.g.python3_host_prog = fn.substitute(fn.exepath("python3"), ".exe$", "", "g")
+    vim.g.python3_host_prog = fn.substitute(fn.exepath("python3"), ".exe$", '', 'g')
   else
     vim.g.python3_host_prog = fn.exepath("python3")
   end
@@ -32,18 +37,18 @@ else
 end
 
 -- Custom mapping <leader> (see `:h mapleader` for more info)
-vim.g.mapleader = ","
+vim.g.mapleader = ','
 
 -- Enable highlighting for lua HERE doc inside vim script
-vim.g.vimsyn_embed = "l"
+vim.g.vimsyn_embed = 'l'
 
 -- Use English as main language
-vim.cmd([[language en_US.UTF-8]])
+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_netrw       = 1
 vim.g.loaded_netrwPlugin = 1
 vim.g.netrw_liststyle = 3
 if vim.g.is_win then

lua/mappings.lua

@@ -1,4 +1,5 @@
 local keymap = vim.keymap
+local api = vim.api
 local uv = vim.uv
 
 -- Save key strokes (now we do not need to press shift to enter command mode).
@@ -45,21 +46,7 @@ keymap.set("n", [[\x]], "<cmd>windo lclose <bar> cclose <cr>", {
 -- 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 current buffer",
-})
-
-keymap.set("n", [[\D]], function()
-  local buf_ids = vim.api.nvim_list_bufs()
-  local cur_buf = vim.api.nvim_win_get_buf(0)
-
-  for _, buf_id in pairs(buf_ids) do
-    -- do not Delete unlisted buffers, which may lead to unexpected errors
-    if vim.api.nvim_get_option_value("buflisted", { buf = buf_id }) and buf_id ~= cur_buf then
-      vim.api.nvim_buf_delete(buf_id, { force = true })
-    end
-  end
-end, {
-  desc = "delete other buffers",
+  desc = "delete buffer",
 })
 
 -- Insert a blank line below or above current line (do not move the cursor),
@@ -228,24 +215,19 @@ keymap.set("n", "<leader>cb", function()
   local cnt = 0
   local blink_times = 7
   local timer = uv.new_timer()
-  if timer == nil then
-    return
-  end
 
-  timer:start(
-    0,
-    100,
-    vim.schedule_wrap(function()
-      vim.cmd([[
+  timer:start(0, 100, vim.schedule_wrap(function()
+    vim.cmd [[
       set cursorcolumn!
       set cursorline!
-    ]])
+    ]]
 
-      if cnt == blink_times then
-        timer:close()
-      end
+    if cnt == blink_times then
+      timer:close()
+    end
 
-      cnt = cnt + 1
-    end)
+    cnt = cnt + 1
+  end)
   )
-end, { desc = "show cursor" })
+end,
+  { desc = "show cursor" })

lua/plugin_specs.lua

@@ -1,7 +1,6 @@
 local utils = require("utils")
 
-local plugin_dir = vim.fn.stdpath("data") .. "/lazy"
-local lazypath = plugin_dir .. "/lazy.nvim"
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 
 if not vim.uv.fs_stat(lazypath) then
   vim.fn.system {
@@ -23,8 +22,7 @@ end
 local plugin_specs = {
   -- auto-completion engine
   {
-    "iguanacucumber/magazine.nvim",
-    name = "nvim-cmp",
+    "hrsh7th/nvim-cmp",
     -- event = 'InsertEnter',
     event = "VeryLazy",
     dependencies = {
@@ -33,12 +31,14 @@ local plugin_specs = {
       "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" },
@@ -50,7 +50,7 @@ local plugin_specs = {
   {
     "nvim-treesitter/nvim-treesitter",
     enabled = function()
-      if vim.g.is_mac then
+      if vim.g.is_mac or vim.g.is_linux then
         return true
       end
       return false
@@ -62,6 +62,9 @@ local plugin_specs = {
     end,
   },
 
+  -- Python indent (follows the PEP8 style)
+  { "Vimjas/vim-python-pep8-indent", ft = { "python" } },
+
   -- Python-related text object
   { "jeetsukumaran/vim-pythonsense", ft = { "python" } },
 
@@ -105,12 +108,8 @@ local plugin_specs = {
     "Yggdroot/LeaderF",
     cmd = "Leaderf",
     build = function()
-      local leaderf_path = plugin_dir .. "/LeaderF"
-      vim.opt.runtimepath:append(leaderf_path)
-      vim.cmd("runtime! plugin/leaderf.vim")
-
       if not vim.g.is_win then
-        vim.cmd("LeaderfInstallCExtension")
+        vim.cmd(":LeaderfInstallCExtension")
       end
     end,
   },
@@ -123,19 +122,10 @@ local plugin_specs = {
     },
   },
   {
-    "ibhagwan/fzf-lua",
-    -- optional for icon support
-    dependencies = { "nvim-tree/nvim-web-devicons" },
-    config = function()
-      -- calling `setup` is optional for customization
-      require("fzf-lua").setup {}
-    end,
-  },
-  {
-    "MeanderingProgrammer/markdown.nvim",
-    main = "render-markdown",
-    opts = {},
-    dependencies = { "nvim-treesitter/nvim-treesitter", "nvim-tree/nvim-web-devicons" },
+      'MeanderingProgrammer/markdown.nvim',
+      main = "render-markdown",
+      opts = {},
+      dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' },
   },
   -- A list of colorscheme plugin you may want to try. Find what suits you.
   { "navarasu/onedark.nvim", lazy = true },
@@ -147,13 +137,7 @@ local plugin_specs = {
   { "catppuccin/nvim", name = "catppuccin", lazy = true },
   { "olimorris/onedarkpro.nvim", lazy = true },
   { "marko-cerovac/material.nvim", lazy = true },
-  {
-    "rockyzhang24/arctic.nvim",
-    dependencies = { "rktjmp/lush.nvim" },
-    name = "arctic",
-    branch = "v2",
-  },
-  { "rebelot/kanagawa.nvim", lazy = true },
+
   { "nvim-tree/nvim-web-devicons", event = "VeryLazy" },
 
   {
@@ -161,7 +145,7 @@ local plugin_specs = {
     event = "VeryLazy",
     cond = firenvim_not_active,
     config = function()
-      require("config.lualine")
+      require("config.statusline")
     end,
   },
 
@@ -186,33 +170,12 @@ local plugin_specs = {
   {
     "lukas-reineke/indent-blankline.nvim",
     event = "VeryLazy",
-    main = "ibl",
+    main = 'ibl',
     config = function()
       require("config.indent-blankline")
     end,
   },
-  {
-    "luukvbaal/statuscol.nvim",
-    opts = {},
-    config = function()
-      require("config.nvim-statuscol")
-    end,
-  },
-  {
-    "kevinhwang91/nvim-ufo",
-    dependencies = "kevinhwang91/promise-async",
-    event = "VeryLazy",
-    opts = {},
-    init = function()
-      vim.o.foldcolumn = "1" -- '0' is not bad
-      vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
-      vim.o.foldlevelstart = 99
-      vim.o.foldenable = true
-    end,
-    config = function()
-      require("config.nvim_ufo")
-    end,
-  },
+
   -- Highlight URLs inside vim
   { "itchyny/vim-highlighturl", event = "VeryLazy" },
 
@@ -228,12 +191,7 @@ local plugin_specs = {
   -- 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.
   {
-    "chrishrb/gx.nvim",
-    keys = { { "gx", "<cmd>Browse<cr>", mode = { "n", "x" } } },
-    cmd = { "Browse" },
-    init = function()
-      vim.g.netrw_nogx = 1 -- disable netrw gx
-    end,
+    "tyru/open-browser.vim",
     enabled = function()
       if vim.g.is_win or vim.g.is_mac then
         return true
@@ -241,9 +199,7 @@ local plugin_specs = {
         return false
       end
     end,
-    dependencies = { "nvim-lua/plenary.nvim" },
-    config = true, -- default settings
-    submodules = false, -- not needed, submodules are required only for tests
+    event = "VeryLazy",
   },
 
   -- Only install these plugins if ctags are installed on the system
@@ -267,9 +223,9 @@ local plugin_specs = {
 
   -- Automatic insertion and deletion of a pair of characters
   {
-    "windwp/nvim-autopairs",
-    event = "InsertEnter",
-    config = true,
+      'windwp/nvim-autopairs',
+      event = "InsertEnter",
+      config = true
   },
 
   -- Comment plugin
@@ -290,10 +246,10 @@ local plugin_specs = {
   -- Manage your yank history
   {
     "gbprod/yanky.nvim",
+    cmd = { "YankyRingHistory" },
     config = function()
       require("config.yanky")
     end,
-    event = "VeryLazy",
   },
 
   -- Handy unix command inside Vim (Rename, Move etc.)
@@ -357,8 +313,11 @@ local plugin_specs = {
     end,
   },
 
+  -- Better git commit experience
+  { "rhysd/committia.vim", lazy = true },
+
   {
-    "sindrets/diffview.nvim",
+    "sindrets/diffview.nvim"
   },
 
   {
@@ -391,6 +350,14 @@ local plugin_specs = {
     ft = { "markdown" },
   },
 
+  {
+    "folke/zen-mode.nvim",
+    cmd = "ZenMode",
+    config = function()
+      require("config.zen-mode")
+    end,
+  },
+
   {
     "rhysd/vim-grammarous",
     enabled = function()
@@ -442,7 +409,7 @@ local plugin_specs = {
 
   -- Modern matchit implementation
   { "andymass/vim-matchup", event = "BufRead" },
-  { "tpope/vim-scriptease", cmd = { "Scriptnames", "Messages", "Verbose" } },
+  { "tpope/vim-scriptease", cmd = { "Scriptnames", "Message", "Verbose" } },
 
   -- Asynchronous command execution
   { "skywind3000/asyncrun.vim", lazy = true, cmd = { "AsyncRun" } },
@@ -452,26 +419,17 @@ local plugin_specs = {
   {
     "glacambre/firenvim",
     enabled = function()
-      local result = vim.g.is_win or vim.g.is_mac
-      return result
+      if vim.g.is_win or vim.g.is_mac then
+        return true
+      end
+      return false
     end,
-    -- it seems that we can only call the firenvim function directly.
-    -- Using vim.fn or vim.cmd to call this function will fail.
     build = function()
-      local firenvim_path = plugin_dir .. "/firenvim"
-      vim.opt.runtimepath:append(firenvim_path)
-      vim.cmd("runtime! firenvim.vim")
-
-      -- macOS will reset the PATH when firenvim starts a nvim process, causing the PATH variable to change unexpectedly.
-      -- Here we are trying to get the correct PATH and use it for firenvim.
-      -- See also https://github.com/glacambre/firenvim/blob/master/TROUBLESHOOTING.md#make-sure-firenvims-path-is-the-same-as-neovims
-      local path_env = vim.env.PATH
-      local prologue = string.format('export PATH="%s"', path_env)
-      -- local prologue = "echo"
-      local cmd_str = string.format(":call firenvim#install(0, '%s')", prologue)
-      vim.cmd(cmd_str)
+      vim.fn["firenvim#install"](0)
     end,
+    lazy = true,
   },
+
   -- Debugger plugin
   {
     "sakhnik/nvim-gdb",
@@ -520,7 +478,7 @@ local plugin_specs = {
   -- file explorer
   {
     "nvim-tree/nvim-tree.lua",
-    event = "VeryLazy",
+    keys = { "<space>s" },
     dependencies = { "nvim-tree/nvim-web-devicons" },
     config = function()
       require("config.nvim-tree")
@@ -536,75 +494,22 @@ local plugin_specs = {
     end,
   },
   {
-    "folke/lazydev.nvim",
-    ft = "lua", -- only load on lua files
-    opts = {},
-  },
-  {
-    "CopilotC-Nvim/CopilotChat.nvim",
-    dependencies = {
-      { "zbirenbaum/copilot.lua" }, -- or github/copilot.vim
-      { "nvim-lua/plenary.nvim" }, -- for curl, log wrapper
-    },
-    opts = {
-      debug = true, -- Enable debugging
-      -- See Configuration section for rest
-    },
-    -- See Commands section for default commands if you want to lazy load on them
-  },
-  {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
+    'kevinhwang91/nvim-ufo',
+    dependencies = {'kevinhwang91/promise-async'},
+    event = { "VeryLazy" },
     config = function()
-      require("copilot").setup {}
-    end,
-  },
-  {
-    "smjonas/live-command.nvim",
-    -- live-command supports semantic versioning via Git tags
-    -- tag = "2.*",
-    cmd = "Preview",
-    config = function()
-      require("config.live-command")
-    end,
-    event = "VeryLazy",
-  },
-  {
-    -- show hint for code actions, the user can also implement code actions themselves,
-    -- see discussion here: https://github.com/neovim/neovim/issues/14869
-    "kosayoda/nvim-lightbulb",
-    config = function()
-      require("nvim-lightbulb").setup { autocmd = { enabled = true } }
-    end,
-  },
-  {
-    "Bekaboo/dropbar.nvim",
-  },
-  {
-    "vhyrro/luarocks.nvim",
-    priority = 1000, -- Very high priority is required, luarocks.nvim should run as the first plugin in your config.
-    opts = {
-      rocks = { "lua-toml" }, -- specifies a list of rocks to install
-      -- luarocks_build_args = { "--with-lua=/my/path" }, -- extra options to pass to luarocks's configuration script
-    },
-  },
-  {
-    "catgoose/nvim-colorizer.lua",
-    event = "BufReadPre",
-    opts = { -- set to setup table
-    },
-  },
+      require("config.ufo")
+    end
+  }
 }
 
-require("lazy").setup {
-  spec = plugin_specs,
+-- configuration for lazy itself.
+local lazy_opts = {
   ui = {
     border = "rounded",
     title = "Plugin Manager",
     title_pos = "center",
   },
-  rocks = {
-    enabled = false,
-    hererocks = false,
-  },
 }
+
+require("lazy").setup(plugin_specs, lazy_opts)

lua/utils.lua

@@ -1,5 +1,4 @@
 local fn = vim.fn
-local version = vim.version
 
 local M = {}
 
@@ -12,8 +11,9 @@ function M.executable(name)
 end
 
 --- check whether a feature exists in Nvim
---- @param feat string the feature name, like `nvim-0.7` or `unix`.
---- @return boolean
+--- @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
@@ -33,9 +33,8 @@ end
 
 --- Generate random integers in the range [Low, High], inclusive,
 --- adapted from https://stackoverflow.com/a/12739441/6064933
---- @param low integer the lower value for this range
---- @param high integer the upper value for this range
---- @return integer
+--- @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())
@@ -44,39 +43,17 @@ function M.rand_int(low, high)
 end
 
 --- Select a random element from a sequence/list.
---- @param seq any[] the sequence to choose an element
+--- @seq: the sequence to choose an element
 function M.rand_element(seq)
   local idx = M.rand_int(1, #seq)
 
   return seq[idx]
 end
 
---- check if the current nvim version is compatible with the allowed version
---- @param expected_version string
---- @return boolean
-function M.is_compatible_version(expected_version)
-  -- check if we have the latest stable version of nvim
-  local expect_ver = version.parse(expected_version)
-  local actual_ver = vim.version()
+function M.add_pack(name)
+  local status, error = pcall(vim.cmd, "packadd " .. name)
 
-  if expect_ver == nil then
-    local msg = string.format("Unsupported version string: %s", expected_version)
-    vim.api.nvim_err_writeln(msg)
-    return false
-  end
-
-  local result = version.cmp(expect_ver, actual_ver)
-  if result ~= 0 then
-    local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
-    local msg = string.format(
-      "Expect nvim version %s, but your current nvim version is %s. Use at your own risk!",
-      expected_version,
-      _ver
-    )
-    vim.api.nvim_err_writeln(msg)
-  end
-
-  return true
+  return status
 end
 
 return M

plugin/command.lua

@@ -1,58 +0,0 @@
--- Copy file path to clipboard
-vim.api.nvim_create_user_command("CopyPath", function(context)
-  local full_path = vim.fn.glob("%:p")
-
-  local file_path = nil
-  if context["args"] == "nameonly" then
-    file_path = vim.fn.fnamemodify(full_path, ":t")
-  end
-
-  -- get the file path relative to project root
-  if context["args"] == "relative" then
-    local project_marker = { ".git", "pyproject.toml" }
-    local project_root = vim.fs.root(0, project_marker)
-    if project_root == nil then
-      vim.print("can not find project root")
-      return
-    end
-
-    file_path = vim.fn.substitute(full_path, project_root, "<project-root>", "g")
-  end
-
-  if context["args"] == "absolute" then
-    file_path = full_path
-  end
-
-  vim.fn.setreg("+", file_path)
-  vim.print("Filepath copied to clipboard!")
-end, {
-  bang = false,
-  nargs = 1,
-  force = true,
-  desc = "Copy current file path to clipboard",
-  complete = function()
-    return { "nameonly", "relative", "absolute" }
-  end,
-})
-
--- JSON format part of or the whole file
-vim.api.nvim_create_user_command("JSONFormat", function(context)
-  local range = context["range"]
-  local line1 = context["line1"]
-  local line2 = context["line2"]
-
-  if range == 0 then
-    -- the command is invoked without range, then we assume whole buffer
-    local cmd_str = string.format("%s,%s!python -m json.tool", line1, line2)
-    vim.fn.execute(cmd_str)
-  elseif range == 2 then
-    -- the command is invoked with some range
-    local cmd_str = string.format("%s,%s!python -m json.tool", line1, line2)
-    vim.fn.execute(cmd_str)
-  else
-    vim.api.nvim_err_write(string.format("unsupported range: %s", range))
-  end
-end, {
-  desc = "Format JSON string",
-  range = "%",
-})

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

@@ -467,12 +467,3 @@ pylintrc
 PYTHONPATH
 Uvicorn
 qpdf
-Elasticsearch
-kibana
-submodule
-unix
-GCP
-Kubernetes
-pubsub
-Luarocks
-luarocks

viml_conf/autocommands.vim

@@ -0,0 +1,123 @@
+" Do not use smart case in command line mode, extracted from https://vi.stackexchange.com/a/16511/15292.
+augroup dynamic_smartcase
+  autocmd!
+  autocmd CmdLineEnter : set nosmartcase
+  autocmd CmdLineLeave : set smartcase
+augroup END
+
+augroup term_settings
+  autocmd!
+  " Do not use number and relative number for terminal inside nvim
+  autocmd TermOpen * setlocal norelativenumber nonumber
+  " Go to insert mode by default to start typing command
+  autocmd TermOpen * startinsert
+augroup END
+
+" More accurate syntax highlighting? (see `:h syn-sync`)
+augroup accurate_syn_highlight
+  autocmd!
+  autocmd BufEnter * :syntax sync fromstart
+augroup END
+
+" Return to last cursor position when opening a file
+augroup resume_cursor_position
+  autocmd!
+  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
+
+augroup numbertoggle
+  autocmd!
+  autocmd BufEnter,FocusGained,InsertLeave,WinEnter * if &nu | set rnu   | endif
+  autocmd BufLeave,FocusLost,InsertEnter,WinLeave   * if &nu | set nornu | endif
+augroup END
+
+" Define or override some highlight groups
+augroup custom_highlight
+  autocmd!
+  autocmd ColorScheme * call s:custom_highlight()
+augroup END
+
+function! s:custom_highlight() abort
+  " For yank highlight
+  highlight YankColor ctermfg=59 ctermbg=41 guifg=#34495E guibg=#2ECC71
+
+  " For cursor colors
+  highlight Cursor cterm=bold gui=bold guibg=#00c918 guifg=black
+  highlight Cursor2 guifg=red guibg=red
+
+  " For floating windows border highlight
+  highlight FloatBorder guifg=LightGreen guibg=NONE
+
+  " highlight for matching parentheses
+  highlight MatchParen cterm=bold,underline gui=bold,underline
+endfunction
+
+augroup auto_close_win
+  autocmd!
+  autocmd BufEnter * call s:quit_current_win()
+augroup END
+
+" Quit Nvim if we have only one window, and its filetype match our pattern.
+function! s:quit_current_win() abort
+  let l:quit_filetypes = ['qf', 'vista', 'NvimTree']
+
+  let l:should_quit = v:true
+
+  let l:tabwins = nvim_tabpage_list_wins(0)
+  for w in l:tabwins
+    let l:buf = nvim_win_get_buf(w)
+    let l:bf = getbufvar(l:buf, '&filetype')
+
+    if index(l:quit_filetypes, l:bf) == -1
+      let l:should_quit = v:false
+    endif
+  endfor
+
+  if l:should_quit
+    qall
+  endif
+endfunction
+
+augroup git_repo_check
+  autocmd!
+  autocmd VimEnter,DirChanged * call utils#Inside_git_repo()
+augroup END
+
+" ref: https://vi.stackexchange.com/a/169/15292
+function! s:handle_large_file() abort
+  let g:large_file = 10485760 " 10MB
+  let f = expand("<afile>")
+
+  if getfsize(f) > g:large_file || getfsize(f) == -2
+    set eventignore+=all
+    " turning off relative number helps a lot
+    set norelativenumber
+    setlocal noswapfile bufhidden=unload buftype=nowrite undolevels=-1
+  else
+    set eventignore-=all relativenumber
+  endif
+endfunction
+
+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,14 +1,11 @@
 scriptencoding utf-8
 
 " change fillchars for folding, vertical split, end of buffer, and message separator
-set fillchars=fold:\ ,foldsep:\ ,foldopen:,foldclose:,vert:\│,eob:\ ,msgsep:‾,diff:╱
+set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾,diff:╱
 
 " Split window below/right when creating horizontal/vertical windows
 set splitbelow splitright
 
-" avoid the flickering when splitting window horizontal
-set splitkeep=screen
-
 " Time in milliseconds to wait for a mapped sequence to complete,
 " see https://unix.stackexchange.com/q/36882/221410 for more info
 set timeoutlen=500
@@ -72,7 +69,7 @@ set wildmode=list:longest
 set scrolloff=3
 
 " Use mouse to select and resize windows, etc.
-set mouse=
+set mouse=nic  " Enable mouse in several mode
 set mousemodel=popup  " Set the behaviour of mouse
 set mousescroll=ver:1,hor:0
 
@@ -121,7 +118,7 @@ set completeopt+=menuone  " Show menu even if there is only one item
 set completeopt-=preview  " Disable the preview window
 
 set pumheight=10  " Maximum number of items to show in popup menu
-set pumblend=5  " pseudo transparency for completion menu
+set pumblend=10  " pseudo transparency for completion menu
 
 set winblend=0  " pseudo transparency for floating window
 
@@ -179,5 +176,3 @@ set diffopt+=linematch:60
 
 set nowrap  " do no wrap
 set noruler
-
-set showcmdloc=statusline

viml_conf/plugins.vim

@@ -58,6 +58,16 @@ endif
 " Only fuzzy-search files names
 let g:Lf_DefaultMode = 'FullPath'
 
+" Popup window settings
+let w = float2nr(&columns * 0.8)
+if w > 140
+  let g:Lf_PopupWidth = 140
+else
+  let g:Lf_PopupWidth = w
+endif
+
+let g:Lf_PopupPosition = [0, float2nr((&columns - g:Lf_PopupWidth)/2)]
+
 " Do not use version control tool to list files under a directory since
 " submodules are not searched by default.
 let g:Lf_UseVersionControlTool = 0
@@ -79,7 +89,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 --no-messages --popup  --nameOnly<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>
@@ -113,6 +123,16 @@ let g:Lf_PreviewResult = {
       \ 'Gtags': 0
       \}
 
+""""""""""""""""""""""""""""open-browser.vim settings"""""""""""""""""""
+if g:is_win || g:is_mac
+  " Disable netrw's gx mapping.
+  let g:netrw_nogx = 1
+
+  " Use another mapping for the open URL method
+  nmap ob <Plug>(openbrowser-smart-search)
+  xmap ob <Plug>(openbrowser-smart-search)
+endif
+
 """"""""""""""""""""""""""" vista settings """"""""""""""""""""""""""""""""""
 let g:vista#renderer#icons = {
       \ 'member': '',