1
0
mirror of https://github.com/jdhao/nvim-config.git synced 2025-06-08 14:14:33 +02:00

Compare commits

..

No commits in common. "f76ef3dbb46711c1de2b25b92d7092f8d5a13272" and "265f171172beb1289806bbc22c632c39048cfb86" have entirely different histories.

7 changed files with 89 additions and 102 deletions

View File

@ -69,6 +69,12 @@ M.rand_colorscheme = function()
-- Load the colorscheme and its settings -- Load the colorscheme and its settings
M.colorscheme_conf[colorscheme]() M.colorscheme_conf[colorscheme]()
if vim.g.logging_level == "debug" then
local msg = "Colorscheme: " .. colorscheme
vim.notify(msg, vim.log.levels.DEBUG, { title = "nvim-config" })
end
end end
return M return M

View File

@ -1,20 +0,0 @@
---@diagnostic disable: missing-fields
require("nvim-lightbulb").setup {
autocmd = {
enabled = true,
updatetime = -1,
},
---@diagnostic disable-next-line: unused-local
filter = function(client_name, result)
-- Ruff always sends these two actions even if there are no action to take,
-- so it is better to just ignore this to avoid noise. See also discussion below:
-- https://github.com/astral-sh/ruff-lsp/issues/91
local ignored_kinds = { "source.fixAll.ruff", "source.organizeImports.ruff" }
if vim.tbl_contains(ignored_kinds, result.kind) then
return false
end
return true
end,
}

View File

@ -5,77 +5,63 @@ local lspconfig = require("lspconfig")
local utils = require("utils") local utils = require("utils")
vim.api.nvim_create_autocmd("LspAttach", { local custom_attach = function(client, bufnr)
group = vim.api.nvim_create_augroup("buf_behavior_conf", { clear = true }), -- Mappings.
callback = function(event_context) local map = function(mode, l, r, opts)
local client = vim.lsp.get_client_by_id(event_context.data.client_id) opts = opts or {}
-- vim.print(client.name, client.server_capabilities) opts.silent = true
opts.buffer = bufnr
keymap.set(mode, l, r, opts)
end
if not client then map("n", "gd", vim.lsp.buf.definition, { desc = "go to definition" })
return map("n", "<C-]>", vim.lsp.buf.definition)
end map("n", "K", function()
vim.lsp.buf.hover { border = "single", max_height = 25, max_width = 120 }
end)
map("n", "<C-k>", vim.lsp.buf.signature_help)
map("n", "<space>rn", vim.lsp.buf.rename, { desc = "varialbe rename" })
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())
end, { desc = "list workspace folder" })
local bufnr = event_context.buf -- 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" })
end
-- Mappings. -- Uncomment code below to enable inlay hint from language server, some LSP server supports inlay hint,
local map = function(mode, l, r, opts) -- but disable this feature by default, so you may need to enable inlay hint in the LSP server config.
opts = opts or {} -- vim.lsp.inlay_hint.enable(true, {buffer=bufnr})
opts.silent = true
opts.buffer = bufnr
keymap.set(mode, l, r, opts)
end
map("n", "gd", vim.lsp.buf.definition, { desc = "go to definition" }) -- The blow command will highlight the current variable and its usages in the buffer.
map("n", "<C-]>", vim.lsp.buf.definition) if client.server_capabilities.documentHighlightProvider then
map("n", "K", function() local gid = api.nvim_create_augroup("lsp_document_highlight", { clear = true })
vim.lsp.buf.hover { border = "single", max_height = 25, max_width = 120 } api.nvim_create_autocmd("CursorHold", {
end) group = gid,
map("n", "<C-k>", vim.lsp.buf.signature_help) buffer = bufnr,
map("n", "<space>rn", vim.lsp.buf.rename, { desc = "varialbe rename" }) callback = function()
map("n", "<space>ca", vim.lsp.buf.code_action, { desc = "LSP code action" }) lsp.buf.document_highlight()
map("n", "<space>wa", vim.lsp.buf.add_workspace_folder, { desc = "add workspace folder" }) end,
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())
end, { desc = "list workspace folder" })
-- Set some key bindings conditional on server capabilities api.nvim_create_autocmd("CursorMoved", {
if client.server_capabilities.documentFormattingProvider and client.name ~= "lua_ls" then group = gid,
map({ "n", "x" }, "<space>f", vim.lsp.buf.format, { desc = "format code" }) buffer = bufnr,
end callback = function()
lsp.buf.clear_references()
end,
})
end
-- Disable ruff hover feature in favor of Pyright if vim.g.logging_level == "debug" then
if client.name == "ruff" then local msg = string.format("Language server %s started!", client.name)
client.server_capabilities.hoverProvider = false vim.notify(msg, vim.log.levels.DEBUG, { title = "Nvim-config" })
end end
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})
-- The blow command will highlight the current variable and its usages in the buffer.
if client.server_capabilities.documentHighlightProvider then
local gid = api.nvim_create_augroup("lsp_document_highlight", { clear = true })
api.nvim_create_autocmd("CursorHold", {
group = gid,
buffer = bufnr,
callback = function()
lsp.buf.document_highlight()
end,
})
api.nvim_create_autocmd("CursorMoved", {
group = gid,
buffer = bufnr,
callback = function()
lsp.buf.clear_references()
end,
})
end
end,
nested = true,
desc = "Configure buffer keymap and behavior based on LSP",
})
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
@ -110,6 +96,7 @@ if utils.executable("pyright") then
lspconfig.pyright.setup { lspconfig.pyright.setup {
cmd = { "delance-langserver", "--stdio" }, cmd = { "delance-langserver", "--stdio" },
on_attach = custom_attach,
capabilities = merged_capability, capabilities = merged_capability,
settings = { settings = {
pyright = { pyright = {
@ -144,6 +131,7 @@ end
if utils.executable("ruff") then if utils.executable("ruff") then
require("lspconfig").ruff.setup { require("lspconfig").ruff.setup {
on_attach = custom_attach,
capabilities = capabilities, capabilities = capabilities,
init_options = { init_options = {
-- the settings can be found here: https://docs.astral.sh/ruff/editors/settings/ -- the settings can be found here: https://docs.astral.sh/ruff/editors/settings/
@ -154,8 +142,26 @@ if utils.executable("ruff") then
} }
end 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 if utils.executable("ltex-ls") then
lspconfig.ltex.setup { lspconfig.ltex.setup {
on_attach = custom_attach,
cmd = { "ltex-ls" }, cmd = { "ltex-ls" },
filetypes = { "text", "plaintex", "tex", "markdown" }, filetypes = { "text", "plaintex", "tex", "markdown" },
settings = { settings = {
@ -169,6 +175,7 @@ end
if utils.executable("clangd") then if utils.executable("clangd") then
lspconfig.clangd.setup { lspconfig.clangd.setup {
on_attach = custom_attach,
capabilities = capabilities, capabilities = capabilities,
filetypes = { "c", "cpp", "cc" }, filetypes = { "c", "cpp", "cc" },
flags = { flags = {
@ -180,6 +187,7 @@ end
-- set up vim-language-server -- set up vim-language-server
if utils.executable("vim-language-server") then if utils.executable("vim-language-server") then
lspconfig.vimls.setup { lspconfig.vimls.setup {
on_attach = custom_attach,
flags = { flags = {
debounce_text_changes = 500, debounce_text_changes = 500,
}, },
@ -192,6 +200,7 @@ end
-- set up bash-language-server -- set up bash-language-server
if utils.executable("bash-language-server") then if utils.executable("bash-language-server") then
lspconfig.bashls.setup { lspconfig.bashls.setup {
on_attach = custom_attach,
capabilities = capabilities, capabilities = capabilities,
} }
end end
@ -199,6 +208,7 @@ end
-- settings for lua-language-server can be found on https://luals.github.io/wiki/settings/ -- settings for lua-language-server can be found on https://luals.github.io/wiki/settings/
if utils.executable("lua-language-server") then if utils.executable("lua-language-server") then
lspconfig.lua_ls.setup { lspconfig.lua_ls.setup {
on_attach = custom_attach,
settings = { settings = {
Lua = { Lua = {
runtime = { runtime = {

View File

@ -37,8 +37,7 @@ api.nvim_create_autocmd({ "CursorMoved" }, {
api.nvim_create_autocmd("TextYankPost", { api.nvim_create_autocmd("TextYankPost", {
pattern = "*", pattern = "*",
group = yank_group, group = yank_group,
---@diagnostic disable-next-line: unused-local callback = function(ev)
callback = function(context)
if vim.v.event.operator == "y" then if vim.v.event.operator == "y" then
vim.fn.setpos(".", vim.g.current_cursor_pos) vim.fn.setpos(".", vim.g.current_cursor_pos)
end end
@ -186,8 +185,7 @@ api.nvim_create_autocmd("BufEnter", {
pattern = "*", pattern = "*",
group = api.nvim_create_augroup("auto_close_win", { clear = true }), 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", desc = "Quit Nvim if we have only one window, and its filetype match our pattern",
---@diagnostic disable-next-line: unused-local callback = function(ev)
callback = function(context)
local quit_filetypes = { "qf", "vista", "NvimTree" } local quit_filetypes = { "qf", "vista", "NvimTree" }
local should_quit = true local should_quit = true
@ -195,9 +193,9 @@ api.nvim_create_autocmd("BufEnter", {
for _, win in pairs(tabwins) do for _, win in pairs(tabwins) do
local buf = api.nvim_win_get_buf(win) local buf = api.nvim_win_get_buf(win)
local buf_type = vim.api.nvim_get_option_value("filetype", { buf = buf }) local bf = fn.getbufvar(buf, "&filetype")
if not vim.tbl_contains(quit_filetypes, buf_type) then if fn.index(quit_filetypes, bf) == -1 then
should_quit = false should_quit = false
end end
end end

View File

@ -10,7 +10,7 @@ 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_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 = vim.log.levels.INFO vim.g.logging_level = "info"
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- builtin variables -- -- builtin variables --

View File

@ -553,13 +553,7 @@ local plugin_specs = {
{ {
"folke/lazydev.nvim", "folke/lazydev.nvim",
ft = "lua", -- only load on lua files ft = "lua", -- only load on lua files
opts = { opts = {},
library = {
-- See the configuration section for more details
-- Load luvit types when the `vim.uv` word is found
{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
},
},
}, },
{ {
"CopilotC-Nvim/CopilotChat.nvim", "CopilotC-Nvim/CopilotChat.nvim",
@ -595,7 +589,7 @@ local plugin_specs = {
-- see discussion here: https://github.com/neovim/neovim/issues/14869 -- see discussion here: https://github.com/neovim/neovim/issues/14869
"kosayoda/nvim-lightbulb", "kosayoda/nvim-lightbulb",
config = function() config = function()
require("config.lightbulb") require("nvim-lightbulb").setup { autocmd = { enabled = true } }
end, end,
}, },
{ {
@ -609,7 +603,6 @@ local plugin_specs = {
}, },
} }
---@diagnostic disable-next-line: missing-fields
require("lazy").setup { require("lazy").setup {
spec = plugin_specs, spec = plugin_specs,
ui = { ui = {

View File

@ -115,7 +115,7 @@ set shortmess+=S
" Disable showing intro message (:intro) " Disable showing intro message (:intro)
set shortmess+=I set shortmess+=I
set messagesopt=hit-enter,history:500 set messagesopt=wait:5000,history:500
" Completion behaviour " Completion behaviour
" set completeopt+=noinsert " Auto select the first completion entry " set completeopt+=noinsert " Auto select the first completion entry