bump neovim version to 0.9.5

Deal with other variant of unix timestamp
Add diffview.nvim for viewing diffs
2025-06-08 14:14:33 +02:00 · 2024-01-07 14:45:29 +01:00 · 2023-10-21 00:53:15 +02:00 · 2023-10-18 22:10:11 +02:00 · 2023-10-12 23:26:43 +02:00 · 2023-10-11 20:43:24 +02:00
16 changed files with 197 additions and 132 deletions
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
      <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.9.1-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
+      <img src="https://img.shields.io/badge/Neovim-0.9.5-blueviolet.svg?style=flat-square&logo=Neovim&logoColor=green" alt="Neovim minimum version"/>
    </a>
    <a href="https://github.com/jdhao/nvim-config/search?l=vim-script">
      <img src="https://img.shields.io/github/languages/top/jdhao/nvim-config" alt="Top languages"/>
@@ -21,8 +21,8 @@
    <a href="https://github.com/jdhao/nvim-config/graphs/commit-activity">
      <img src="https://img.shields.io/github/commit-activity/m/jdhao/nvim-config?style=flat-square" />
    </a>
-    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.9.1">
-      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.9.1?style=flat-square" />
+    <a href="https://github.com/jdhao/nvim-config/releases/tag/v0.9.5">
+      <img src="https://img.shields.io/github/commits-since/jdhao/nvim-config/v0.9.5?style=flat-square" />
    </a>
    <a href="https://github.com/jdhao/nvim-config/graphs/contributors">
      <img src="https://img.shields.io/github/contributors/jdhao/nvim-config?style=flat-square" />
--- a/autoload/utils.vim
+++ b/autoload/utils.vim
@@ -128,11 +128,22 @@ endfunction

 " Output current time or unix timestamp in human-readable format.
 function! utils#iso_time(timestamp) abort
-  if a:timestamp
-    return strftime('%Y-%m-%d %H:%M:%S%z', a:timestamp)
+  " Get current datetime
+  if !a:timestamp
+    return strftime('%Y-%m-%d %H:%M:%S%z')
  endif

-  return strftime('%Y-%m-%d %H:%M:%S%z')
+  " this timestamp in expressed in milliseconds
+  if len(a:timestamp) == 13
+    let l:timestamp = a:timestamp[:-4]
+  " this timestamp in expressed in microseconds
+  elseif len(a:timestamp) == 16
+    let l:timestamp = a:timestamp[:-7]
+  else
+    let l:timestamp = a:timestamp
+  endif
+  return strftime('%Y-%m-%d %H:%M:%S%z', l:timestamp)
+
 endfunction

 " Check if we are inside a Git repo.
--- a/init.lua
+++ b/init.lua
@@ -11,19 +11,17 @@
 -- StackOverflow: https://stackoverflow.com/users/6064933/jdhao
 vim.loader.enable()

-local api = vim.api
 local version = vim.version

 -- check if we have the latest stable version of nvim
-local expected_ver = "0.9.1"
+local expected_ver = "0.9.5"
 local ev = version.parse(expected_ver)
 local actual_ver = version()

 if version.cmp(ev, actual_ver) ~= 0 then
  local _ver = string.format("%s.%s.%s", actual_ver.major, actual_ver.minor, actual_ver.patch)
-  local msg = string.format("Unsupported nvim version: expect %s, but got %s instead!", expected_ver, _ver)
-  api.nvim_err_writeln(msg)
-  return
+  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 = {
@@ -35,10 +33,11 @@ local core_conf_files = {
  "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/core/%s", vim.fn.stdpath("config"), file_name)
+    local path = string.format("%s/%s", viml_conf_dir, file_name)
    local source_cmd = "source " .. path
    vim.cmd(source_cmd)
  else
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,71 +1,70 @@
 {
-  "LeaderF": { "branch": "master", "commit": "3ded37f92807d8c6ad831d5af2c4ff22bfd32fc8" },
-  "asyncrun.vim": { "branch": "master", "commit": "42385d54b8546c163b946fd50eed2103ef7993c9" },
+  "LeaderF": { "branch": "master", "commit": "a77f45791edeaa82fa75c5959ca73a59d7549549" },
+  "asyncrun.vim": { "branch": "master", "commit": "61cc3081963a12048e00e89f8cedc8bd1cb83b8c" },
  "better-escape.vim": { "branch": "master", "commit": "6b16a45a839727977277f6ab11bded63e9ed86bb" },
-  "bufferline.nvim": { "branch": "main", "commit": "417b303328118b6d836ae330142e88771c48a8a3" },
-  "catppuccin": { "branch": "main", "commit": "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46" },
+  "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" },
+  "catppuccin": { "branch": "main", "commit": "fc537040147f0374a22b88142a20eb6781141f0b" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
  "cmp-nvim-ultisnips": { "branch": "main", "commit": "24bca5c3e137b28cd87442d4fc51a2b312dd99cc" },
-  "cmp-omni": { "branch": "main", "commit": "9436e6cdd7c5dfa24a99a60d9280b24dbdea3649" },
+  "cmp-omni": { "branch": "main", "commit": "4ef610bbd85a5ee4e97e09450c0daecbdc60de86" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
  "committia.vim": { "branch": "master", "commit": "0b4df1a7f48ffbc23b009bd14d58ee1be541917c" },
-  "dashboard-nvim": { "branch": "master", "commit": "9134d7befd50ff920ede5b0f7d6c3dbb9f7c0ecb" },
+  "dashboard-nvim": { "branch": "master", "commit": "8721edccead31c07c2cda0bc5ac75b0491b5adcd" },
  "delimitMate": { "branch": "master", "commit": "537a1da0fa5eeb88640425c37e545af933c56e1b" },
-  "dressing.nvim": { "branch": "master", "commit": "c7b035de7f91bb6b62b4308f105c56d1a968b8c5" },
+  "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" },
  "edge": { "branch": "master", "commit": "a4fd4f458331d42677d992f428235c491b2016aa" },
-  "emmylua-nvim": { "branch": "master", "commit": "60178ca58f75f5ea68a20205895ea50f5593f205" },
+  "emmylua-nvim": { "branch": "master", "commit": "c8f3c20276041c2b847cf041bca5928671b2eaa0" },
  "everforest": { "branch": "master", "commit": "83b666410d7ae0eccf96dbbe3b4b6ac5b8172d38" },
  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
  "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" },
  "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d8590288417fef2430f85bc8b312fae8b1cf2c40" },
-  "gruvbox-material": { "branch": "master", "commit": "b5f8c6a6c1cda630c53b061b765068a0898d47a3" },
-  "hop.nvim": { "branch": "master", "commit": "03f0434869f1f38868618198b5f4f2ab6d39aef2" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
-  "kanagawa.nvim": { "branch": "master", "commit": "0a24e504a3a278849ad0aef31cd6dd24c73ca3db" },
-  "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
+  "gitsigns.nvim": { "branch": "main", "commit": "ff01d34daaed72f271a8ffa088a7e839a60c640f" },
+  "gruvbox-material": { "branch": "master", "commit": "c75bf1e96fdc33b8b3b613e5172a0acdba198fca" },
+  "hop.nvim": { "branch": "master", "commit": "1cbaa79457e6b5e9b04e6d5d8d19bd6b65ffa2be" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "0fe34b4c1b926e106d105d3ae88ef6cbf6743572" },
+  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
+  "lazy.nvim": { "branch": "main", "commit": "33c447b96e1cb1a5a2be87982d5d32bb5054079d" },
  "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
-  "material.nvim": { "branch": "main", "commit": "1ecaa2d065a1ea308bd7702a77c2bf35ede8f536" },
+  "material.nvim": { "branch": "main", "commit": "6989f7e0076f4fa4e01056bd62c785cf0fef4caf" },
  "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" },
-  "neoformat": { "branch": "master", "commit": "0c285d7a7c06a6ee88db70871a274797693fce42" },
-  "nightfox.nvim": { "branch": "main", "commit": "a48f6d9a0273101df76eb25d2f5477baa277f935" },
-  "nord.nvim": { "branch": "master", "commit": "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f" },
-  "nvim-bqf": { "branch": "main", "commit": "c920a55c6153766bd909e474b7feffa9739f07e8" },
+  "neoformat": { "branch": "master", "commit": "aedb6f9d3f53d5da229095f7d761d749f8c5c7e0" },
+  "nightfox.nvim": { "branch": "main", "commit": "fe2fc7b93d66349eff2c5baa6cec922ee3958f56" },
+  "nord.nvim": { "branch": "master", "commit": "0a22a387c92bb3b46e3d245522712ae7497bec38" },
+  "nvim-bqf": { "branch": "main", "commit": "8784eebf34371049b641646d00232c2603215297" },
  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
  "nvim-hlslens": { "branch": "main", "commit": "f0281591a59e95400babf61a96e59ba20e5c9533" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" },
-  "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
-  "nvim-tree.lua": { "branch": "master", "commit": "00741206c2df9c4b538055def19b99790f0c95c8" },
-  "nvim-treesitter": { "branch": "master", "commit": "08c830f625eb93db9c89c5e946e8eea7111bd568" },
-  "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" },
-  "onedark.nvim": { "branch": "master", "commit": "7bd3558c17045b95c961d28861c1b3bd9bdc992a" },
-  "onedarkpro.nvim": { "branch": "main", "commit": "c81dff789f7623c431d1f43cf334237e52bbfd61" },
+  "nvim-lspconfig": { "branch": "master", "commit": "cab7233cd6a89ec952dfd40c4b74341b1165830e" },
+  "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
+  "nvim-tree.lua": { "branch": "master", "commit": "53b0bcaadaffb505acff230578b56a86ec1ab38a" },
+  "nvim-treesitter": { "branch": "master", "commit": "783e5fc3079680b307e8ac518935317907e71a59" },
+  "nvim-web-devicons": { "branch": "master", "commit": "a1e6268779411048a87f767a27380089362a0ce2" },
+  "onedark.nvim": { "branch": "master", "commit": "826fb77e9ca92d3c0f3d937328663d4a6dc7fee1" },
+  "onedarkpro.nvim": { "branch": "main", "commit": "7c02b4eeb310173ef6d741e60200d72b76923eae" },
  "open-browser.vim": { "branch": "master", "commit": "7d4c1d8198e889d513a030b5a83faa07606bac27" },
-  "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
-  "rose-pine": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" },
+  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
  "sonokai": { "branch": "master", "commit": "17308ee6d9c764bfc1e0fa97213e7a99701b4144" },
  "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
  "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
  "telescope-symbols.nvim": { "branch": "master", "commit": "f2060117d965df4a626f068a4ebbd8ee051aa076" },
-  "telescope.nvim": { "branch": "master", "commit": "207285ccec21b69996a4d3bcfa59df35d48610e8" },
-  "ultisnips": { "branch": "master", "commit": "24a3ebb36687b6d59a19d63173713575b486d739" },
-  "unicode.vim": { "branch": "master", "commit": "c8aa12b1e2e1b6254885b12bdb239ce6c885fdb1" },
+  "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" },
+  "ultisnips": { "branch": "master", "commit": "f6d1501b630cb783b0af8507c5588328f826d40f" },
+  "unicode.vim": { "branch": "master", "commit": "bc20d0fb3331a7b41708388c56bb8221c2104da7" },
  "vim-auto-save": { "branch": "master", "commit": "2e3e54ea4c0fc946c21b0a4ee4c1c295ba736ee8" },
  "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
  "vim-conflicted": { "branch": "master", "commit": "068c320796f807ac4961618e3e62316773803996" },
  "vim-eunuch": { "branch": "master", "commit": "67f3dd32b4dcd1c427085f42ff5f29c7adc645c6" },
-  "vim-flog": { "branch": "master", "commit": "2cfa2e9d67a06a75d3d4e965c6bad558ff41e488" },
-  "vim-fugitive": { "branch": "master", "commit": "572c8510123cbde02e8a1dafcd376c98e1e13f43" },
+  "vim-flog": { "branch": "master", "commit": "58c1d39ec42f92d23a1204b1869e5d1dece8b86c" },
+  "vim-fugitive": { "branch": "master", "commit": "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1" },
  "vim-grammarous": { "branch": "master", "commit": "db46357465ce587d5325e816235b5e92415f8c05" },
  "vim-highlighturl": { "branch": "master", "commit": "012fee983e03913db6ba6393307eac434999b896" },
  "vim-indent-object": { "branch": "master", "commit": "5c5b24c959478929b54a9e831a8e2e651a465965" },
-  "vim-markdown": { "branch": "master", "commit": "cc82d88e2a791f54d2b6e2b26e41f743351ac947" },
+  "vim-markdown": { "branch": "master", "commit": "4e9b4deda11d05a157ab34e97f76089669b5b7af" },
  "vim-markdownfootnotes": { "branch": "master", "commit": "2b288149f48cfaf7465d25bb094ed62898f5e5b0" },
-  "vim-matchup": { "branch": "master", "commit": "582cbc8c2dc311deb7a03f7d505d52544c36d4b6" },
+  "vim-matchup": { "branch": "master", "commit": "6dbe108230c7dbbf00555b7d4d9f6a891837ef07" },
  "vim-mundo": { "branch": "master", "commit": "b53d35fb5ca9923302b9ef29e618ab2db4cc675e" },
  "vim-obsession": { "branch": "master", "commit": "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5" },
  "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" },
@@ -73,16 +72,16 @@
  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
  "vim-sandwich": { "branch": "master", "commit": "c5a2cc438ce6ea2005c556dc833732aa53cae21a" },
  "vim-scriptease": { "branch": "master", "commit": "18511d389675d773994215ddb572ccdc2b72f52b" },
-  "vim-snippets": { "branch": "master", "commit": "d37486881a0a771b844a235bc3e025046088690d" },
+  "vim-snippets": { "branch": "master", "commit": "ccc2fa1529d372f7ac16d5eb07a385a72b50e05d" },
  "vim-swap": { "branch": "master", "commit": "9358bfdc5e377aa13e7c2c2dd8699ba32b0dcf83" },
  "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
  "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
  "vim-xkbswitch": { "branch": "master", "commit": "42b55bfec8f6dbd715135ce582a6f769831face1" },
-  "vimtex": { "branch": "master", "commit": "534fd725f2475a9083b032e402c7e73b8a3fc6bb" },
-  "vista.vim": { "branch": "master", "commit": "f925e481bba7cd5451fb8bca9a6ecfc2bf1f2858" },
+  "vimtex": { "branch": "master", "commit": "cbb20643b7bfe721902dac5760bf0d4889fb5f7e" },
+  "vista.vim": { "branch": "master", "commit": "58dabc027909330970ac549e52bf799a723878c5" },
  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
  "whitespace.nvim": { "branch": "master", "commit": "f0fc9e9c4ce3f7d2166e9e5a069b64b9ca4a3f15" },
  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" },
-  "yanky.nvim": { "branch": "main", "commit": "95c2f006ea6eaed2b2d8b8b4943b8fcf13faf03f" },
-  "zen-mode.nvim": { "branch": "main", "commit": "68f554702de63f4b7b6b6d4bcb10178f41a0acc7" }
+  "yanky.nvim": { "branch": "main", "commit": "cc3fc03c780a14f189290edcf1c47dc1306626d4" },
+  "zen-mode.nvim": { "branch": "main", "commit": "cb73b8bd0ef9d765b942db09dc762c603a89ae44" }
 }
--- a/lua/colorschemes.lua
+++ b/lua/colorschemes.lua
@@ -16,7 +16,6 @@ M.colorscheme2dir = {
  nightfox = "nightfox.nvim",
  kanagawa = "kanagawa.nvim",
  catppuccin = "catppuccin",
-  rose_pine = "rose-pine",
  onedarkpro = "onedarkpro.nvim",
  monokai = "monokai.nvim",
  material = "material.nvim",
@@ -94,16 +93,6 @@ M.catppuccin = function()
  vim.cmd([[colorscheme catppuccin]])
 end

-M.rose_pine = function()
-  require('rose-pine').setup({
-    --- @usage 'main' | 'moon'
-    dark_variant = 'moon',
-  })
-
-  -- set colorscheme after options
-  vim.cmd('colorscheme rose-pine')
-end
-
 M.onedarkpro = function()
  -- set colorscheme after options
  vim.cmd('colorscheme onedark_vivid')
--- a/lua/config/hlslens.lua
+++ b/lua/config/hlslens.lua
@@ -12,10 +12,11 @@ local activate_hlslens = function(direction)
  local cmd = string.format("normal! %s%szzzv", vim.v.count1, direction)
  local status, msg = pcall(vim.cmd, cmd)

+  -- Deal with the case that there is no such pattern in current buffer.
  if not status then
-    -- 13 is the index where real error message starts
-    msg = msg:sub(13)
-    api.nvim_err_writeln(msg)
+    local start_idx, _ = string.find(msg, 'E486', 1, true)
+    local msg_part = string.sub(msg, start_idx)
+    api.nvim_err_writeln(msg_part)
    return
  end

--- a/lua/config/indent-blankline.lua
+++ b/lua/config/indent-blankline.lua
@@ -1,21 +1,28 @@
 local api = vim.api

-local exclude_ft = { "help", "git", "markdown", "snippets", "text", "gitconfig", "alpha" }
-require("indent_blankline").setup {
-  -- U+2502 may also be a good choice, it will be on the middle of cursor.
-  -- U+250A is also a good choice
+local exclude_ft = { "help", "git", "markdown", "snippets", "text", "gitconfig", "alpha", "dashboard" }
+
+require("ibl").setup {
+  indent = {
+    -- -- U+2502 may also be a good choice, it will be on the middle of cursor.
+    -- -- U+250A is also a good choice
    char = "▏",
-  show_end_of_line = false,
-  disable_with_nolist = true,
-  buftype_exclude = { "terminal" },
-  filetype_exclude = exclude_ft,
+  },
+  scope = {
+    show_start = false,
+    show_end = false,
+  },
+  exclude = {
+    filetypes = exclude_ft,
+    buftypes = { "terminal" },
+  },
 }

 local gid = api.nvim_create_augroup("indent_blankline", { clear = true })
 api.nvim_create_autocmd("InsertEnter", {
  pattern = "*",
  group = gid,
-  command = "IndentBlanklineDisable",
+  command = "IBLDisable",
 })

 api.nvim_create_autocmd("InsertLeave", {
@@ -23,7 +30,7 @@ api.nvim_create_autocmd("InsertLeave", {
  group = gid,
  callback = function()
    if not vim.tbl_contains(exclude_ft, vim.bo.filetype) then
-      vim.cmd([[IndentBlanklineEnable]])
+      vim.cmd([[IBLEnable]])
    end
  end,
 })
--- a/lua/config/nvim-tree.lua
+++ b/lua/config/nvim-tree.lua
@@ -12,7 +12,6 @@ nvim_tree.setup {
  update_cwd = false,
  view = {
    width = 30,
-    hide_root_folder = false,
    side = "left",
    preserve_window_proportions = false,
    number = false,
--- a/lua/config/nvim_hop.lua
+++ b/lua/config/nvim_hop.lua
@@ -1,7 +1,3 @@
-vim.cmd([[hi HopNextKey cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff]])
-vim.cmd([[hi HopNextKey1 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff]])
-vim.cmd([[hi HopNextKey2 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff]])
-
 local keymap = vim.keymap
 local hop = require("hop")
 hop.setup {
@@ -18,3 +14,14 @@ keymap.set({ "n", "v", "o" }, "f", "", {
  end,
  desc = "nvim-hop char2",
 })
+
+vim.api.nvim_create_autocmd("ColorScheme", {
+  pattern = "*",
+  callback = function ()
+    vim.cmd([[
+      hi HopNextKey cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff
+      hi HopNextKey1 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff
+      hi HopNextKey2 cterm=bold ctermfg=176 gui=bold guibg=#ff00ff guifg=#ffffff
+    ]])
+  end
+})
--- a/lua/config/statusline.lua
+++ b/lua/config/statusline.lua
@@ -97,6 +97,27 @@ local diff = function()
  return info
 end

+local virtual_env = function()
+  -- only show virtual env for Python
+  if vim.bo.filetype ~= 'python' then
+    return ""
+  end
+
+  local conda_env = os.getenv('CONDA_DEFAULT_ENV')
+  local venv_path = os.getenv('VIRTUAL_ENV')
+
+  if venv_path == nil then
+    if conda_env == nil then
+      return ""
+    else
+      return string.format("  %s (conda)", conda_env)
+    end
+  else
+    local venv_name = vim.fn.fnamemodify(venv_path, ':t')
+    return string.format("  %s (venv)", venv_name)
+  end
+end
+
 require("lualine").setup {
  options = {
    icons_enabled = true,
@@ -116,6 +137,10 @@ require("lualine").setup {
        "diff",
        source = diff,
      },
+      {
+        virtual_env,
+        color = { fg = 'black', bg = "#F1CA81" }
+      }
    },
    lualine_c = {
      "filename",
--- a/lua/custom-autocmd.lua
+++ b/lua/custom-autocmd.lua
@@ -38,7 +38,9 @@ api.nvim_create_autocmd("TextYankPost", {
  pattern = "*",
  group = yank_group,
  callback = function(ev)
+    if vim.v.event.operator == 'y' then
      vim.fn.setpos('.', vim.g.current_cursor_pos)
+    end
  end,
 })

--- a/lua/plugin_specs.lua
+++ b/lua/plugin_specs.lua
@@ -19,13 +19,15 @@ local firenvim_not_active = function()
  return not vim.g.started_by_firenvim
 end

-require("lazy").setup {
-  { "onsails/lspkind-nvim", lazy = true },
+local plugin_specs = {
  -- auto-completion engine
  {
    "hrsh7th/nvim-cmp",
+    -- event = 'InsertEnter',
+    event = "VeryLazy",
    dependencies = {
      "hrsh7th/cmp-nvim-lsp",
+      "onsails/lspkind-nvim",
      "hrsh7th/cmp-path",
      "hrsh7th/cmp-buffer",
      "hrsh7th/cmp-omni",
@@ -37,9 +39,9 @@ require("lazy").setup {
    end,
  },

-  -- nvim-lsp configuration (it relies on cmp-nvim-lsp, so it should be loaded after cmp-nvim-lsp).
  {
    "neovim/nvim-lspconfig",
+    event = { "BufRead", "BufNewFile" },
    config = function()
      require("config.lsp")
    end,
@@ -53,7 +55,7 @@ require("lazy").setup {
      end
      return false
    end,
-    event = "BufEnter",
+    event = "VeryLazy",
    build = ":TSUpdate",
    config = function()
      require("config.treesitter")
@@ -66,7 +68,7 @@ require("lazy").setup {
  -- Python-related text object
  { "jeetsukumaran/vim-pythonsense", ft = { "python" } },

-  { "machakann/vim-swap", event = "VimEnter" },
+  { "machakann/vim-swap", event = "VeryLazy" },

  -- IDE for Lisp
  -- 'kovisoft/slimv'
@@ -86,12 +88,10 @@ require("lazy").setup {

  -- Super fast buffer jump
  {
-    "phaazon/hop.nvim",
-    event = "VimEnter",
+    "smoka7/hop.nvim",
+    event = "VeryLazy",
    config = function()
-      vim.defer_fn(function()
      require("config.nvim_hop")
-      end, 2000)
    end,
  },

@@ -123,25 +123,24 @@ require("lazy").setup {
  },

  -- A list of colorscheme plugin you may want to try. Find what suits you.
-  { "navarasu/onedark.nvim" },
-  { "sainnhe/edge" },
-  { "sainnhe/sonokai" },
-  { "sainnhe/gruvbox-material" },
-  { "shaunsingh/nord.nvim" },
-  { "sainnhe/everforest" },
-  { "EdenEast/nightfox.nvim" },
-  { "rebelot/kanagawa.nvim" },
-  { "catppuccin/nvim", name = "catppuccin" },
-  { "rose-pine/neovim", name = "rose-pine" },
-  { "olimorris/onedarkpro.nvim" },
-  { "tanvirtin/monokai.nvim" },
-  { "marko-cerovac/material.nvim" },
+  { "navarasu/onedark.nvim", lazy = true },
+  { "sainnhe/edge", lazy = true },
+  { "sainnhe/sonokai", lazy = true },
+  { "sainnhe/gruvbox-material", lazy = true },
+  { "shaunsingh/nord.nvim", lazy = true },
+  { "sainnhe/everforest", lazy = true },
+  { "EdenEast/nightfox.nvim", lazy = true },
+  { "rebelot/kanagawa.nvim", lazy = true },
+  { "catppuccin/nvim", name = "catppuccin", lazy = true },
+  { "olimorris/onedarkpro.nvim", lazy = true },
+  { "tanvirtin/monokai.nvim", lazy = true },
+  { "marko-cerovac/material.nvim", lazy = true },

-  { "nvim-tree/nvim-web-devicons", event = "VimEnter" },
+  { "nvim-tree/nvim-web-devicons", event = "VeryLazy" },

  {
    "nvim-lualine/lualine.nvim",
-    event = "VimEnter",
+    event = "VeryLazy",
    cond = firenvim_not_active,
    config = function()
      require("config.statusline")
@@ -150,7 +149,7 @@ require("lazy").setup {

  {
    "akinsho/bufferline.nvim",
-    event = "VimEnter",
+    event = { "BufEnter" },
    cond = firenvim_not_active,
    config = function()
      require("config.bufferline")
@@ -160,7 +159,6 @@ require("lazy").setup {
  -- fancy start screen
  {
    "nvimdev/dashboard-nvim",
-    event = "VimEnter",
    cond = firenvim_not_active,
    config = function()
      require("config.dashboard-nvim")
@@ -169,23 +167,22 @@ require("lazy").setup {

  {
    "lukas-reineke/indent-blankline.nvim",
-    event = "VimEnter",
+    event = "VeryLazy",
+    main = 'ibl',
    config = function()
      require("config.indent-blankline")
    end,
  },

  -- Highlight URLs inside vim
-  { "itchyny/vim-highlighturl", event = "VimEnter" },
+  { "itchyny/vim-highlighturl", event = "VeryLazy" },

  -- notification plugin
  {
    "rcarriga/nvim-notify",
-    event = "BufEnter",
+    event = "VeryLazy",
    config = function()
-      vim.defer_fn(function()
      require("config.nvim-notify")
-      end, 2000)
    end,
  },

@@ -200,7 +197,7 @@ require("lazy").setup {
        return false
      end
    end,
-    event = "VimEnter",
+    event = "VeryLazy",
  },

  -- Only install these plugins if ctags are installed on the system
@@ -226,7 +223,7 @@ require("lazy").setup {
  { "Raimondi/delimitMate", event = "InsertEnter" },

  -- Comment plugin
-  { "tpope/vim-commentary", event = "VimEnter" },
+  { "tpope/vim-commentary", event = "VeryLazy" },

  -- Multiple cursor plugin like Sublime Text?
  -- 'mg979/vim-visual-multi'
@@ -243,6 +240,7 @@ require("lazy").setup {
  -- Manage your yank history
  {
    "gbprod/yanky.nvim",
+    cmd = { "YankyRingHistory" },
    config = function()
      require("config.yanky")
    end,
@@ -252,7 +250,7 @@ require("lazy").setup {
  { "tpope/vim-eunuch", cmd = { "Rename", "Delete" } },

  -- Repeat vim motions
-  { "tpope/vim-repeat", event = "VimEnter" },
+  { "tpope/vim-repeat", event = "VeryLazy" },

  { "nvim-zh/better-escape.vim", event = { "InsertEnter" } },

@@ -311,6 +309,11 @@ require("lazy").setup {

  -- Better git commit experience
  { "rhysd/committia.vim", lazy = true },
+
+  {
+    "sindrets/diffview.nvim"
+  },
+
  {
    "kevinhwang91/nvim-bqf",
    ft = "qf",
@@ -360,17 +363,17 @@ require("lazy").setup {
    ft = { "markdown" },
  },

-  { "chrisbra/unicode.vim", event = "VimEnter" },
+  { "chrisbra/unicode.vim", event = "VeryLazy" },

  -- Additional powerful text object for vim, this plugin should be studied
  -- carefully to use its full power
-  { "wellle/targets.vim", event = "VimEnter" },
+  { "wellle/targets.vim", event = "VeryLazy" },

  -- Plugin to manipulate character pairs quickly
-  { "machakann/vim-sandwich", event = "VimEnter" },
+  { "machakann/vim-sandwich", event = "VeryLazy" },

  -- Add indent object for vim (useful for languages like Python)
-  { "michaeljsmith/vim-indent-object", event = "VimEnter" },
+  { "michaeljsmith/vim-indent-object", event = "VeryLazy" },

  -- Only use these plugin on Windows and Mac and when LaTeX is installed
  {
@@ -399,7 +402,7 @@ require("lazy").setup {
  },

  -- Modern matchit implementation
-  { "andymass/vim-matchup", event = "VimEnter" },
+  { "andymass/vim-matchup", event = "BufRead" },
  { "tpope/vim-scriptease", cmd = { "Scriptnames", "Message", "Verbose" } },

  -- Asynchronous command execution
@@ -449,25 +452,27 @@ require("lazy").setup {
  },

  -- The missing auto-completion for cmdline!
-  { "gelguy/wilder.nvim" },
+  {
+    "gelguy/wilder.nvim",
+    build = ":UpdateRemotePlugins",
+  },

  -- showing keybindings
  {
    "folke/which-key.nvim",
-    event = "VimEnter",
+    event = "VeryLazy",
    config = function()
-      vim.defer_fn(function()
      require("config.which-key")
-      end, 2000)
    end,
  },

  -- show and trim trailing whitespaces
-  { "jdhao/whitespace.nvim", event = "VimEnter" },
+  { "jdhao/whitespace.nvim", event = "VeryLazy" },

  -- file explorer
  {
    "nvim-tree/nvim-tree.lua",
+    keys = { "<space>s" },
    dependencies = { "nvim-tree/nvim-web-devicons" },
    config = function()
      require("config.nvim-tree")
@@ -477,9 +482,21 @@ require("lazy").setup {
  { "ii14/emmylua-nvim", ft = "lua" },
  {
    "j-hui/fidget.nvim",
+    event = "VeryLazy",
    tag = "legacy",
    config = function()
      require("config.fidget-nvim")
    end,
  },
 }
+
+-- configuration for lazy itself.
+local lazy_opts = {
+  ui = {
+    border = "rounded",
+    title = "Plugin Manager",
+    title_pos = "center",
+  },
+}
+
+require("lazy").setup(plugin_specs, lazy_opts)
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -458,3 +458,12 @@ pyright
 stubgen
 pylance
 variadic
+Vimium
+Databricks
+Jira
+databricks
+FastAPI
+pylintrc
+PYTHONPATH
+Uvicorn
+qpdf
--- a/viml_conf/autocommands.vim
+++ b/viml_conf/autocommands.vim
--- a/viml_conf/options.vim
+++ b/viml_conf/options.vim
@@ -1,7 +1,7 @@
 scriptencoding utf-8

 " change fillchars for folding, vertical split, end of buffer, and message separator
-set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾
+set fillchars=fold:\ ,vert:\│,eob:\ ,msgsep:‾,diff:╱

 " Split window below/right when creating horizontal/vertical windows
 set splitbelow splitright
--- a/viml_conf/plugins.vim
+++ b/viml_conf/plugins.vim
@@ -1,7 +1,7 @@
 scriptencoding utf-8

 " Plugin specification and lua stuff
-lua require('plugins')
+lua require('plugin_specs')

 " Use short names for common plugin manager commands to simplify typing.
 " To use these shortcuts: first activate command line with `:`, then input the
Author	SHA1	Message	Date
jdhao	df9491b05b	bump neovim version to 0.9.5	2024-01-07 14:45:29 +01:00
jdhao	17d2e3ab3e	Deal with other variant of unix timestamp	2023-10-21 00:53:15 +02:00
jdhao	2c9948300d	Add diffview.nvim for viewing diffs	2023-10-18 22:10:11 +02:00
jdhao	dfaa3d97a5	update plugin spec	2023-10-12 23:26:43 +02:00
jdhao	8d74fcb75c	Remove obsolete options for nvim-tree	2023-10-11 20:43:24 +02:00
jdhao	b1f0ef63ef	Rename vimscript conf directory	2023-10-11 20:41:25 +02:00
jdhao	54ca6d4191	update to nvim 0.9.4	2023-10-11 20:35:50 +02:00
jdhao	97af59e670	remove obsolete option for indent-blankline	2023-10-03 15:14:34 +02:00
jdhao	4d8ef868ad	upgrade indent-blankline to v3	2023-09-28 23:41:42 +02:00
jdhao	3137850db6	Show Py virtual env on statusline	2023-09-28 09:42:27 +02:00
jdhao	eccdc62f38	remove colorschemes rose-pine	2023-09-22 19:38:28 +02:00
jdhao	ad483a7dc0	Use the matained fork of hop.nvim	2023-09-16 14:47:43 +02:00
jdhao	6df27d1c22	upgrade to neovim 0.9.2	2023-09-16 14:26:38 +02:00
jdhao	7f6627cfa1	update plugin conf for Lazy.nvim	2023-09-10 22:16:16 +02:00
jdhao	7ff11a9760	update plugin lazy loading events	2023-09-05 00:22:02 +02:00
jdhao	cc4688d089	Loosen the version check condition Other version of nvim can still run this config, but should use with care.	2023-09-01 21:39:08 +02:00
jdhao	8a1b3193a4	fix bufferline loading issue	2023-09-01 21:27:13 +02:00
jdhao	e92362041c	fix hlslens issue when no pattern is found The captured error message is not correct before.	2023-09-01 21:22:22 +02:00
jdhao	63ff776758	fix loading order of nvim-cmp and nvim-lsp	2023-09-01 20:52:46 +02:00
jdhao	41c8c81f21	update spell	2023-09-01 01:08:41 +02:00
jdhao	997c6286df	Optimize plugin loading speed	2023-09-01 01:07:16 +02:00
jdhao	359621b126	fix multi visual line delete issue For TextYankPost event, it includes both yank and delete, we should only restore cursor position for yank, not for delete. Otherwise, it messes up with text deletion when you visually select multiple lines and delete them. See also issue reported here: https://github.com/jdhao/nvim-config/pull/222#issuecomment-1698634645	2023-09-01 00:26:08 +02:00