feat!: nvim v0.10 support

lazy-lock.json

@@ -88,9 +88,9 @@
  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
  "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
- "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" },
+ "vim-fugitive": { "branch": "master", "commit": "c0b03f1cac242d96837326d300f42a660306fc1a" },
  "vim-matchup": { "branch": "master", "commit": "2d660e4aa7c566014c667af2cda0458043527902" },
  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
  "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }
-}
+}

lua/core/event.lua

@@ -18,8 +18,19 @@ local mapping = require("keymap.completion")
 vim.api.nvim_create_autocmd("LspAttach", {
  group = vim.api.nvim_create_augroup("LspKeymapLoader", { clear = true }),
  callback = function(event)
- if not _G._debugging then
- mapping.lsp(event.buf)
+ if _G._debugging then
+ return
+ end
+
+ mapping.lsp(event.buf)
+ local enable_inlayhint = require("core.settings").enable_inlayhint
+ local client = vim.lsp.get_client_by_id(event.data.client_id)
+ if
+ client ~= nil
+ and client.server_capabilities.inlayHintProvider ~= nil
+ and type(enable_inlayhint) == "boolean"
+ then
+ vim.lsp.inlay_hint.enable(enable_inlayhint, { bufnr = event.buf })
  end
  end,
 })

lua/core/init.lua

@@ -144,6 +144,16 @@ You're recommended to install PowerShell for better experience.]],
  end
 end
 
+local _v0_10_workarounds = function()
+ local ok, watchfile = pcall(require, "vim.lsp._watchfiles")
+ if ok then
+ -- Disable lsp watcher
+ watchfile._watchfunc = function()
+ return function() end
+ end
+ end
+end
+
 local load_core = function()
  createdir()
  disable_distribution_plugins()
@@ -153,6 +163,7 @@ local load_core = function()
  neovide_config()
  clipboard_config()
  shell_config()
+ _v0_10_workarounds()
 
  require("core.options")
  require("core.mapping")

lua/core/settings.lua

@@ -214,4 +214,8 @@ settings["dashboard_image"] = {
  [[⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠛⢿⣿⣿⠂⠀⠀⠀⠀⠀⢀⣽⣿⣿⣿⣿⣿⣿⣿⣍⠛⠿⣿⣿⣿⣿⣿⣿]],
 }
 
+-- Set it to false if you don't want to show inlay hint
+---@type boolean
+settings["enable_inlayhint"] = true
+
 return require("modules.utils").extend_config(settings, "user.settings")

lua/keymap/helpers.lua

@@ -38,16 +38,3 @@ _G._toggle_lazygit = function()
  vim.notify("Command [lazygit] not found!", vim.log.levels.ERROR, { title = "toggleterm.nvim" })
  end
 end
-
--- TODO: Update this function to use `vim.getregion()` when v0.10 is released.
-_G._buf_vtext = function()
- local a_orig = vim.fn.getreg("a")
- local mode = vim.fn.mode()
- if mode ~= "v" and mode ~= "V" then
- vim.cmd([[normal! gv]])
- end
- vim.cmd([[silent! normal! "aygv]])
- local text = vim.fn.getreg("a")
- vim.fn.setreg("a", a_orig)
- return text
-end

lua/keymap/tool.lua

@@ -131,13 +131,7 @@ local plug_map = {
  :with_silent()
  :with_desc("edit: Change current directory by zoxide"),
  ["n|<leader>fb"] = map_cu("Telescope buffers"):with_noremap():with_silent():with_desc("find: Buffer opened"),
- ["n|<leader>fs"] = map_cu("Telescope grep_string"):with_noremap():with_silent():with_desc("find: Current word"),
- ["v|<leader>fs"] = map_callback(function()
- require("telescope.builtin").grep_string({ search = _buf_vtext() })
- end)
- :with_noremap()
- :with_silent()
- :with_desc("find: Selection text"),
+ ["nv|<leader>fs"] = map_cu("Telescope grep_string"):with_noremap():with_silent():with_desc("find: Current word"),
  ["n|<leader>fd"] = map_cu("Telescope persisted"):with_noremap():with_silent():with_desc("find: Session"),
 
  -- Plugin: dap

lua/modules/configs/completion/lspsaga.lua

@@ -28,7 +28,7 @@ return function()
  require("modules.utils").load_plugin("lspsaga", {
  -- Breadcrumbs: https://nvimdev.github.io/lspsaga/breadcrumbs/
  symbol_in_winbar = {
- enable = true,
+ enable = false,
  separator = " " .. icons.ui.Separator,
  hide_keyword = false,
  show_file = false,

lua/modules/configs/completion/mason-lspconfig.lua

@@ -1,5 +1,12 @@
 local M = {}
 
+local severity_map = {
+ ["Error"] = vim.diagnostic.severity.ERROR,
+ ["Warning"] = vim.diagnostic.severity.WARN,
+ ["Information"] = vim.diagnostic.severity.INFO,
+ ["Hint"] = vim.diagnostic.severity.HINT,
+}
+
 M.setup = function()
  local diagnostics_virtual_text = require("core.settings").diagnostics_virtual_text
  local diagnostics_level = require("core.settings").diagnostics_level
@@ -16,7 +23,9 @@ M.setup = function()
  signs = true,
  underline = true,
  virtual_text = diagnostics_virtual_text and {
- severity_limit = diagnostics_level,
+ severity = {
+ min = severity_map[diagnostics_level],
+ },
  } or false,
  -- set update_in_insert to false because it was enabled by lspsaga
  update_in_insert = false,

lua/modules/configs/completion/null-ls.lua

@@ -17,7 +17,7 @@ return function()
  -- Don't specify any config here if you are using the default one.
  local sources = {
  btns.formatting.clang_format.with({
- filetypes = { "c", "cpp" },
+ filetypes = { "c", "cpp", "cuda", "proto" },
  extra_args = formatter_args("clang_format"),
  }),
  btns.formatting.prettier.with({

lua/modules/configs/completion/servers/clangd.lua

@@ -39,6 +39,7 @@ return function(options)
  on_attach = options.on_attach,
  capabilities = vim.tbl_deep_extend("keep", { offsetEncoding = { "utf-16", "utf-8" } }, options.capabilities),
  single_file_support = true,
+ filetypes = { "c", "cpp", "objc", "objcpp", "cuda" },
  cmd = {
  "clangd",
  "-j=12",

lua/modules/configs/completion/servers/lua_ls.lua

@@ -2,18 +2,22 @@
 return {
  settings = {
  Lua = {
+ runtime = {
+ version = "LuaJIT",
+ },
  diagnostics = {
  globals = { "vim" },
  disable = { "different-requires", "undefined-field" },
  },
  workspace = {
  library = {
- [vim.fn.expand("$VIMRUNTIME/lua")] = true,
- [vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true,
+ vim.fn.expand("$VIMRUNTIME/lua"),
+ vim.fn.expand("$VIMRUNTIME/lua/vim/lsp"),
  },
  maxPreload = 100000,
  preloadFileSize = 10000,
  },
+ hint = { enable = true, setType = true },
  format = { enable = false },
  telemetry = { enable = false },
  -- Do not override treesitter lua highlighting with lua_ls's highlighting

lua/modules/configs/lang/crates-keymap.lua

@@ -1,120 +1,123 @@
+---@diagnostic disable: undefined-field
 local bind = require("keymap.bind")
 local map_callback = bind.map_callback
 
+local crates = require("crates")
+
 local crates_keymap = {
  ["n|<leader>ct"] = map_callback(function()
- require("crates").toggle()
+ crates.toggle()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Toggle spec activities"),
  ["n|<leader>cr"] = map_callback(function()
- require("crates").reload()
+ crates.reload()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Reload crate specs"),
 
  ["n|<leader>cs"] = map_callback(function()
- require("crates").show_popup()
+ crates.show_popup()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Toggle pop-up window"),
  ["n|<leader>cv"] = map_callback(function()
- require("crates").show_versions_popup()
- require("crates").show_popup()
+ crates.show_versions_popup()
+ crates.show_popup()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Select spec versions"),
  ["n|<leader>cf"] = map_callback(function()
- require("crates").show_features_popup()
- require("crates").show_popup()
+ crates.show_features_popup()
+ crates.show_popup()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Select spec features"),
  ["n|<leader>cd"] = map_callback(function()
- require("crates").show_dependencies_popup()
- require("crates").show_popup()
+ crates.show_dependencies_popup()
+ crates.show_popup()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Show project dependencies"),
 
  ["n|<leader>cu"] = map_callback(function()
- require("crates").update_crate()
+ crates.update_crate()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Update current crate's spec"),
  ["v|<leader>cu"] = map_callback(function()
- require("crates").update_crates()
+ crates.update_crates()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Update selected crate's spec"),
  ["n|<leader>ca"] = map_callback(function()
- require("crates").update_all_crates()
+ crates.update_all_crates()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Update all crates' specs"),
  ["n|<leader>cU"] = map_callback(function()
- require("crates").upgrade_crate()
+ crates.upgrade_crate()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Upgrade current crate"),
  ["v|<leader>cU"] = map_callback(function()
- require("crates").upgrade_crates()
+ crates.upgrade_crates()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Upgrade selected crates"),
  ["n|<leader>cA"] = map_callback(function()
- require("crates").upgrade_all_crates()
+ crates.upgrade_all_crates()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Upgrade all crates"),
 
  ["n|<leader>cH"] = map_callback(function()
- require("crates").open_homepage()
+ crates.open_homepage()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Open current crate's homepage"),
  ["n|<leader>cR"] = map_callback(function()
- require("crates").open_repository()
+ crates.open_repository()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Open current crate's repository"),
  ["n|<leader>cD"] = map_callback(function()
- require("crates").open_documentation()
+ crates.open_documentation()
  end)
  :with_noremap()
  :with_silent()
  :with_buffer(0)
  :with_desc("crates: Open current crate's documentation"),
  ["n|<leader>cC"] = map_callback(function()
- require("crates").open_crates_io()
+ crates.open_crates_io()
  end)
  :with_noremap()
  :with_silent()

lua/modules/configs/lang/go-nvim.lua

@@ -0,0 +1,15 @@
+return function()
+ require("modules.utils").load_plugin("go", {
+ lsp_keymaps = false,
+ dap_debug_keymap = false,
+ icons = false,
+ gofmt = "gopls",
+ goimports = "gopls",
+ lsp_gofumpt = "true",
+ lsp_inlay_hints = { enable = false },
+ run_in_floaterm = true,
+ trouble = true,
+ lsp_codelens = false,
+ lsp_cfg = require("modules.configs.completion.servers.gopls"),
+ })
+end

lua/modules/plugins/tool.lua

@@ -11,6 +11,12 @@ tool["tpope/vim-fugitive"] = {
 -- cond = vim.fn.executable("fcitx5-remote") == 1,
 -- config = require("tool.fcitx5"),
 -- }
+tool["Bekaboo/dropbar.nvim"] = {
+ lazy = false,
+ dependencies = {
+ "nvim-telescope/telescope-fzf-native.nvim",
+ },
+}
 tool["nvim-tree/nvim-tree.lua"] = {
  lazy = true,
  cmd = {

lua/modules/plugins/ui.lua

@@ -38,7 +38,6 @@ ui["nvim-lualine/lualine.nvim"] = {
 }
 ui["zbirenbaum/neodim"] = {
  lazy = true,
- commit = "9477da0",
  event = "LspAttach",
  config = require("ui.neodim"),
 }

lua/modules/utils/init.lua

@@ -277,9 +277,9 @@ local function tbl_recursive_merge(dst, src)
  for key, value in pairs(src) do
  if type(dst[key]) == "table" and type(value) == "function" then
  dst[key] = value(dst[key])
- elseif type(dst[key]) == "table" and vim.tbl_islist(dst[key]) and key ~= "dashboard_image" then
+ elseif type(dst[key]) == "table" and vim.islist(dst[key]) and key ~= "dashboard_image" then
  vim.list_extend(dst[key], value)
- elseif type(dst[key]) == "table" and type(value) == "table" and not vim.tbl_islist(dst[key]) then
+ elseif type(dst[key]) == "table" and type(value) == "table" and not vim.islist(dst[key]) then
  tbl_recursive_merge(dst[key], value)
  else
  dst[key] = value