Lualine async git info (#376)

make everything async and non-blocking and also remove the branch name fetching. It is not needed if we use the @{upstream} notation.

README.md

@@ -9,21 +9,18 @@
     <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.4-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.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" />
     </a>
@@ -191,7 +188,6 @@ 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                                    |
@@ -206,6 +202,7 @@ In addition to commands provided by various plugins, I have also created some cu
 | `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`            |
 
 # Contributing
 

after/ftplugin/lua.vim

@@ -3,3 +3,5 @@ set formatoptions-=o
 set formatoptions-=r
 
 nnoremap <buffer><silent> <F9> :luafile %<CR>
+
+nnoremap <buffer><silent> <space>f <cmd>silent !stylua %<CR>

init.lua

@@ -13,7 +13,7 @@ vim.loader.enable()
 
 local utils = require("utils")
 
-local expected_version = "0.10.1"
+local expected_version = "0.10.4"
 utils.is_compatible_version(expected_version)
 
 local config_dir = vim.fn.stdpath("config")
@@ -28,6 +28,6 @@ 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"))
+vim.cmd("source " .. vim.fs.joinpath(config_dir, "viml_conf/plugins.vim"))
 -- colorscheme settings
 require("colorschemes")

lua/colorschemes.lua

@@ -50,18 +50,18 @@ 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')
+    vim.cmd("colorscheme material")
   end,
-  arctic = function ()
+  arctic = function()
     vim.cmd("colorscheme arctic")
   end,
   kanagawa = function()
     vim.cmd("colorscheme kanagawa-wave")
-  end
+  end,
 }
 
 --- Use a random colorscheme from the pre-defined list of colorschemes.

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/git-linker.lua

@@ -5,16 +5,26 @@ 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,
 }
@@ -28,9 +38,9 @@ end, {
 })
 
 keymap.set("n", "<leader>gbr", function()
-  gitlinker.get_repo_url({
-    action_callback = gitlinker.actions.open_in_browser
-  })
+  gitlinker.get_repo_url {
+    action_callback = gitlinker.actions.open_in_browser,
+  }
 end, {
   silent = true,
   desc = "Git: 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

lua/config/lsp.lua

@@ -3,6 +3,7 @@ local api = vim.api
 local keymap = vim.keymap
 local lsp = vim.lsp
 local diagnostic = vim.diagnostic
+local lspconfig = require("lspconfig")
 
 local utils = require("utils")
 
@@ -12,10 +13,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)
@@ -38,7 +39,9 @@ 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" })
@@ -47,10 +50,14 @@ local custom_attach = function(client, bufnr)
   end, { desc = "list workspace folder" })
 
   -- Set some key bindings conditional on server capabilities
-  if client.server_capabilities.documentFormattingProvider then
-    map("n", "<space>f", vim.lsp.buf.format, { desc = "format code" })
+  if client.server_capabilities.documentFormattingProvider and client.name ~= "lua_ls" then
+    map({ "n", "x" }, "<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()
@@ -67,8 +74,9 @@ 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
@@ -86,20 +94,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
 
@@ -109,70 +117,101 @@ 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
+  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.pylsp.setup {
+  lspconfig.pyright.setup {
+    cmd = { "delance-langserver", "--stdio" },
     on_attach = custom_attach,
+    capabilities = merged_capability,
     settings = {
-      pylsp = {
-        plugins = {
-          -- formatter options
-          black = { enabled = true },
-          autopep8 = { enabled = false },
-          yapf = { enabled = false },
-          -- linter options
-          pylint = { enabled = true, executable = "pylint" },
-          ruff = { enabled = false },
-          pyflakes = { enabled = false },
-          pycodestyle = { enabled = false },
-          -- type checker
-          pylsp_mypy = {
-            enabled = true,
-            overrides = { "--python-executable", py_path, true },
-            report_progress = true,
-            live_mode = false
+      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,
           },
-          -- auto-completion options
-          jedi_completion = { fuzzy = true },
-          -- import sorting
-          isort = { enabled = true },
         },
       },
     },
-    flags = {
-      debounce_text_changes = 200,
-    },
-    capabilities = capabilities,
   }
 else
-  vim.notify("pylsp not found!", vim.log.levels.WARN, { title = "Nvim-config" })
+  vim.notify("pyright not found!", vim.log.levels.WARN, { title = "Nvim-config" })
 end
 
--- 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("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("ltex-ls") then
   lspconfig.ltex.setup {
@@ -181,11 +220,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
@@ -220,8 +259,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 = {
@@ -230,6 +269,9 @@ 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,
+        },
       },
     },
     capabilities = capabilities,
@@ -237,10 +279,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/lualine.lua

@@ -1,5 +1,71 @@
 local fn = vim.fn
 
+local git_status_cache = {}
+
+local on_exit_fetch = function(result)
+  if result.code == 0 then
+    git_status_cache.fetch_success = true
+  end
+end
+
+local function handle_numeric_result(cache_key)
+  return function(result)
+    if result.code == 0 then
+      git_status_cache[cache_key] = tonumber(result.stdout:match("(%d+)")) or 0
+    end
+  end
+end
+
+local async_cmd = function(cmd_str, on_exit)
+  local cmd = vim.tbl_filter(function(element)
+    return element ~= ""
+  end, vim.split(cmd_str, " "))
+
+  vim.system(cmd, { text = true }, on_exit)
+end
+
+local async_git_status_update = function()
+  -- Fetch the latest changes from the remote repository (replace 'origin' if needed)
+  async_cmd("git fetch origin", on_exit_fetch)
+  if not git_status_cache.fetch_success then
+    return
+  end
+
+  -- Get the number of commits behind
+  -- the @{upstream} notation is inspired by post: https://www.reddit.com/r/neovim/comments/t48x5i/git_branch_aheadbehind_info_status_line_component/
+  -- note that here we should use double dots instead of triple dots
+  local behind_cmd_str = "git rev-list --count HEAD..@{upstream}"
+  async_cmd(behind_cmd_str, handle_numeric_result("behind_count"))
+
+  -- Get the number of commits ahead
+  local ahead_cmd_str = "git rev-list --count @{upstream}..HEAD"
+  async_cmd(ahead_cmd_str, handle_numeric_result("ahead_count"))
+end
+
+local function get_ahead_behind_info()
+  local status = git_status_cache
+  if not status then
+    return ""
+  end
+
+  local msg = ""
+
+  if type(status.ahead_count) == "number" and status.ahead_count > 0 then
+    local ahead_str = string.format("↑[%d] ", status.ahead_count)
+    msg = msg .. ahead_str
+  end
+
+  if type(status.behind_count) == "number" and status.behind_count > 0 then
+    local behind_str = string.format("↓[%d] ", status.behind_count)
+    msg = msg .. behind_str
+  end
+
+  return msg
+end
+
+local timer = vim.loop.new_timer()
+timer:start(0, 1000, async_git_status_update)
+
 local function spell()
   if vim.o.spell then
     return string.format("[SPELL]")
@@ -119,7 +185,7 @@ local virtual_env = function()
 end
 
 local get_active_lsp = function()
-  local msg = "No Active Lsp"
+  local msg = "🚫"
   local buf_ft = vim.api.nvim_get_option_value("filetype", {})
   local clients = vim.lsp.get_clients { bufnr = 0 }
   if next(clients) == nil then
@@ -140,13 +206,20 @@ require("lualine").setup {
   options = {
     icons_enabled = true,
     theme = "auto",
+    component_separators = { left = "⏐", right = "⏐" },
     section_separators = "",
-    component_separators = "",
     disabled_filetypes = {},
     always_divide_middle = true,
   },
   sections = {
-    lualine_a = { "mode" },
+    lualine_a = {
+      {
+        "filename",
+        symbols = {
+          readonly = "[🔒]",
+        },
+      },
+    },
     lualine_b = {
       {
         "branch",
@@ -154,6 +227,15 @@ require("lualine").setup {
           -- truncate branch name in case the name is too long
           return string.sub(name, 1, 20)
         end,
+        color = { gui = "italic,bold" },
+      },
+      {
+        get_ahead_behind_info,
+        color = { fg = "#E0C479" },
+      },
+      {
+        "diff",
+        source = diff,
       },
       {
         virtual_env,
@@ -162,18 +244,8 @@ require("lualine").setup {
     },
     lualine_c = {
       {
-        "filename",
-        symbols = {
-          readonly = "[🔒]",
-        },
-      },
-      {
-        "diff",
-        source = diff,
-      },
-      {
-        ime_state,
-        color = { fg = "black", bg = "#f46868" },
+        "%S",
+        color = { gui = "bold", fg = "cyan" },
       },
       {
         spell,
@@ -183,16 +255,27 @@ require("lualine").setup {
     lualine_x = {
       {
         get_active_lsp,
-        icon = " LSP:",
+        icon = "📡",
       },
       {
         "diagnostics",
         sources = { "nvim_diagnostic" },
         symbols = { error = "🆇 ", warn = "⚠️ ", info = "ℹ️ ", hint = " " },
       },
+      {
+        trailing_space,
+        color = "WarningMsg",
+      },
+      {
+        mixed_indent,
+        color = "WarningMsg",
+      },
     },
     lualine_y = {
-      "encoding",
+      {
+        "encoding",
+        fmt = string.upper,
+      },
       {
         "fileformat",
         symbols = {
@@ -202,17 +285,14 @@ require("lualine").setup {
         },
       },
       "filetype",
+      {
+        ime_state,
+        color = { fg = "black", bg = "#f46868" },
+      },
     },
     lualine_z = {
-      {
-        trailing_space,
-        color = "WarningMsg",
-      },
-      {
-        mixed_indent,
-        color = "WarningMsg",
-      },
-      "progress"
+      "location",
+      "progress",
     },
   },
   inactive_sections = {

lua/config/nvim-statuscol.lua

@@ -3,7 +3,7 @@ local ffi = require("statuscol.ffidef")
 local C = ffi.C
 
 -- only show fold level up to this level
-local fold_level_limit = 2
+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

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/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/which-key.lua

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

lua/custom-autocmd.lua

@@ -135,48 +135,6 @@ api.nvim_create_autocmd("TermOpen", {
   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 = "*",
@@ -204,20 +162,18 @@ api.nvim_create_autocmd("ColorScheme", {
   pattern = "*",
   desc = "Define or overrride some highlight groups",
   callback = function()
-    vim.cmd([[
-      " For yank highlight
-      highlight YankColor ctermfg=59 ctermbg=41 guifg=#34495E guibg=#2ECC71
+    -- For yank highlight
+    vim.api.nvim_set_hl(0, "YankColor", { fg = "#34495E", bg = "#2ECC71", ctermfg = 59, ctermbg = 41 })
 
-      " For cursor colors
-      highlight Cursor cterm=bold gui=bold guibg=#00c918 guifg=black
-      highlight Cursor2 guifg=red guibg=red
+    -- 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
-      highlight FloatBorder guifg=LightGreen guibg=NONE
+    -- For floating windows border highlight
+    vim.api.nvim_set_hl(0, "FloatBorder", { fg = "LightGreen" })
 
-      " highlight for matching parentheses
-      highlight MatchParen cterm=bold,underline gui=bold,underline
-    ]])
+    -- highlight for matching parentheses
+    vim.api.nvim_set_hl(0, "MatchParen", { bold = true, underline = true })
   end,
 })
 
@@ -226,14 +182,14 @@ api.nvim_create_autocmd("BufEnter", {
   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 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')
+      local bf = fn.getbufvar(buf, "&filetype")
 
       if fn.index(quit_filetypes, bf) == -1 then
         should_quit = false
@@ -243,14 +199,14 @@ api.nvim_create_autocmd("BufEnter", {
     if should_quit then
       vim.cmd("qall")
     end
-  end
+  end,
 })
 
-api.nvim_create_autocmd({"VimEnter", "DirChanged"}, {
+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()"
+  command = "call utils#Inside_git_repo()",
 })
 
 -- ref: https://vi.stackexchange.com/a/169/15292
@@ -258,8 +214,8 @@ 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
+  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
@@ -271,5 +227,5 @@ api.nvim_create_autocmd("BufReadPre", {
       vim.bo.bufhidden = "unload"
       vim.bo.undolevels = -1
     end
-  end
+  end,
 })

lua/globals.lua

@@ -1,28 +1,28 @@
 local fn = vim.fn
 local api = vim.api
 
-local utils = require('utils')
+local utils = require("utils")
 
 ------------------------------------------------------------------------
 --                          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 +32,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/plugin_specs.lua

@@ -278,15 +278,9 @@ local plugin_specs = {
   -- Multiple cursor plugin like Sublime Text?
   -- 'mg979/vim-visual-multi'
 
-  -- Autosave files on certain events
-  { "907th/vim-auto-save", event = "InsertEnter" },
-
   -- Show undo history visually
   { "simnalamburt/vim-mundo", cmd = { "MundoToggle", "MundoShow" } },
 
-  -- better UI for some nvim actions
-  { "stevearc/dressing.nvim" },
-
   -- Manage your yank history
   {
     "gbprod/yanky.nvim",
@@ -357,9 +351,6 @@ local plugin_specs = {
     end,
   },
 
-  -- Better git commit experience
-  { "rhysd/committia.vim", lazy = true },
-
   {
     "sindrets/diffview.nvim",
   },
@@ -516,7 +507,23 @@ local plugin_specs = {
       require("config.which-key")
     end,
   },
-
+  {
+    "folke/snacks.nvim",
+    priority = 1000,
+    lazy = false,
+    opts = {
+      -- more beautiful vim.ui.input
+      input = {
+        enabled = true,
+        win = {
+          relative = "cursor",
+          backdrop = true,
+        },
+      },
+      -- more beautiful vim.ui.select
+      picker = { enabled = true },
+    },
+  },
   -- show and trim trailing whitespaces
   { "jdhao/whitespace.nvim", event = "VeryLazy" },
 
@@ -545,7 +552,6 @@ local plugin_specs = {
   },
   {
     "CopilotC-Nvim/CopilotChat.nvim",
-    branch = "canary",
     dependencies = {
       { "zbirenbaum/copilot.lua" }, -- or github/copilot.vim
       { "nvim-lua/plenary.nvim" }, -- for curl, log wrapper
@@ -573,6 +579,31 @@ local plugin_specs = {
     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("lazy").setup {
@@ -584,5 +615,6 @@ require("lazy").setup {
   },
   rocks = {
     enabled = false,
+    hererocks = false,
   },
 }

plugin/command.lua

@@ -0,0 +1,58 @@
+-- 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,6 +45,3 @@ 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

@@ -470,3 +470,9 @@ qpdf
 Elasticsearch
 kibana
 submodule
+unix
+GCP
+Kubernetes
+pubsub
+Luarocks
+luarocks

viml_conf/options.vim

@@ -72,7 +72,7 @@ set wildmode=list:longest
 set scrolloff=3
 
 " Use mouse to select and resize windows, etc.
-set mouse=nic  " Enable mouse in several mode
+set mouse=n
 set mousemodel=popup  " Set the behaviour of mouse
 set mousescroll=ver:1,hor:0
 
@@ -179,3 +179,5 @@ set diffopt+=linematch:60
 
 set nowrap  " do no wrap
 set noruler
+
+set showcmdloc=statusline

viml_conf/plugins.vim

@@ -79,7 +79,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<CR>
+nnoremap <silent> <leader>fg :<C-U>Leaderf rg --no-messages --popup  --nameOnly<CR>
 
 " Search vim help files
 nnoremap <silent> <leader>fh :<C-U>Leaderf help --popup<CR>
@@ -384,6 +384,3 @@ function! s:wilder_init() abort
     echohl Error |echomsg "Wilder.nvim missing"| echohl None
   endtry
 endfunction
-
-""""""""""""""""""""""""""""""vim-auto-save settings""""""""""""""""""""""""""""""
-let g:auto_save = 1  " enable AutoSave on Vim startup