trying to fix auto indenting on some files part 3
This commit is contained in:
dlond
parent
2bbca46cd9
commit
1b1e2947f6
|
|
@ -1,122 +1,121 @@
|
||||||
return {
|
-- ~/dlond/nvim/lua/custom/plugins/lsp.lua
|
||||||
-- ========================================
|
-- LSP configuration, assuming LSP servers are installed via Nix/Home Manager
|
||||||
-- LSP Configuration Override
|
|
||||||
-- ========================================
|
|
||||||
{
|
|
||||||
-- Status updates for LSP
|
|
||||||
{ 'j-hui/fidget.nvim', opts = {} },
|
|
||||||
|
|
||||||
-- LSP source for nvim-cmp (ensure this is also listed as dep for nvim-cmp)
|
return {
|
||||||
'hrsh7th/cmp-nvim-lsp',
|
-- ========================================
|
||||||
|
-- LSP Configuration (LSP servers provided by Nix/Home Manager)
|
||||||
|
-- ========================================
|
||||||
|
{
|
||||||
|
'neovim/nvim-lspconfig',
|
||||||
|
event = { "BufReadPre", "BufNewFile" }, -- Load LSP config early
|
||||||
|
dependencies = {
|
||||||
|
-- Dependencies for nvim-lspconfig itself, if any.
|
||||||
|
-- Mason and mason-lspconfig are removed as Nix handles LSP installation.
|
||||||
|
{ 'j-hui/fidget.nvim', opts = {} }, -- Useful status updates for LSP
|
||||||
|
'hrsh7th/cmp-nvim-lsp', -- LSP completion source for nvim-cmp
|
||||||
},
|
},
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
-- Get LSP capabilities, augmented by nvim-cmp
|
-- This config function runs AFTER the plugin and its dependencies are loaded.
|
||||||
local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
|
-- It sets up the LSP servers.
|
||||||
|
|
||||||
local servers_to_setup = { 'lua_ls', 'clangd', 'pyright' } -- <-- EXPLICIT LIST HERE
|
-- Get LSP capabilities, augmented by nvim-cmp
|
||||||
|
local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
|
|
||||||
-- Iterate through the defined servers list and set them up with lspconfig
|
-- Define the list of LSP servers you want to configure.
|
||||||
for _, server_name in ipairs(servers_to_setup) do
|
-- These servers must be installed via Nix/Home Manager and be in your PATH.
|
||||||
require('lspconfig')[server_name].setup {
|
local servers_to_setup = {
|
||||||
capabilities = capabilities, -- Pass augmented capabilities
|
"lua_ls",
|
||||||
-- Add any server-specific overrides here if needed
|
"clangd",
|
||||||
}
|
"pyright",
|
||||||
end
|
"nixd",
|
||||||
|
-- Add other servers like "bashls", "yamlls", "gopls", "rust_analyzer" etc.
|
||||||
|
-- Ensure the corresponding packages (e.g., pkgs.bash-language-server)
|
||||||
|
-- are in your Home Manager home.packages list.
|
||||||
|
}
|
||||||
|
|
||||||
-- Setup keymaps and diagnostics based on kickstart's original init.lua LSP section
|
-- Iterate through the defined servers list and set them up with lspconfig
|
||||||
vim.api.nvim_create_autocmd('LspAttach', {
|
for _, server_name in ipairs(servers_to_setup) do
|
||||||
group = vim.api.nvim_create_augroup('kickstart-lsp-attach-override', { clear = true }),
|
-- print('Attempting to set up LSP server: ' .. server_name) -- Debug print
|
||||||
callback = function(event)
|
require('lspconfig')[server_name].setup {
|
||||||
local map = function(keys, func, desc, mode)
|
capabilities = capabilities, -- Pass augmented capabilities
|
||||||
mode = mode or 'n'
|
-- Add any server-specific overrides here if needed, e.g.:
|
||||||
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
|
-- For lua_ls:
|
||||||
end
|
-- settings = { Lua = { diagnostics = { globals = {'vim'} } } },
|
||||||
|
|
||||||
-- Standard LSP keymaps
|
|
||||||
map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
|
|
||||||
map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
|
|
||||||
map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
|
|
||||||
map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
|
|
||||||
map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
|
|
||||||
map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
|
||||||
map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
|
|
||||||
map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
|
|
||||||
map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
|
|
||||||
|
|
||||||
-- Highlight references
|
|
||||||
local client = vim.lsp.get_client_by_id(event.data.client_id)
|
|
||||||
local function client_supports_method(client, method, bufnr)
|
|
||||||
if vim.fn.has 'nvim-0.11' == 1 then
|
|
||||||
return client:supports_method(method, { bufnr = bufnr })
|
|
||||||
else
|
|
||||||
return client.supports_method(method, { bufnr = bufnr })
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if client and client_supports_method(client, 'textDocument/documentHighlight', event.buf) then
|
|
||||||
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight-override',
|
|
||||||
{ clear = false })
|
|
||||||
vim.api.nvim_create_autocmd(
|
|
||||||
{ 'CursorHold', 'CursorHoldI' },
|
|
||||||
{ buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.document_highlight }
|
|
||||||
)
|
|
||||||
vim.api.nvim_create_autocmd(
|
|
||||||
{ 'CursorMoved', 'CursorMovedI' },
|
|
||||||
{ buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.clear_references }
|
|
||||||
)
|
|
||||||
vim.api.nvim_create_autocmd('LspDetach', {
|
|
||||||
group = vim.api.nvim_create_augroup('kickstart-lsp-detach-override', { clear = true }),
|
|
||||||
callback = function(event2)
|
|
||||||
vim.lsp.buf.clear_references()
|
|
||||||
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight-override', buffer = event2.buf }
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Inlay hints toggle
|
|
||||||
if client and client_supports_method(client, 'textDocument/inlayHint', event.buf) then
|
|
||||||
map('<leader>th', function()
|
|
||||||
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
|
|
||||||
end, '[T]oggle Inlay [H]ints')
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- Diagnostic configuration
|
|
||||||
vim.diagnostic.config {
|
|
||||||
severity_sort = true,
|
|
||||||
float = { border = 'rounded', source = 'if_many' },
|
|
||||||
underline = { severity = vim.diagnostic.severity.ERROR },
|
|
||||||
signs = vim.g.have_nerd_font and {
|
|
||||||
text = {
|
|
||||||
[vim.diagnostic.severity.ERROR] = ' ',
|
|
||||||
[vim.diagnostic.severity.WARN] = ' ',
|
|
||||||
[vim.diagnostic.severity.INFO] = ' ',
|
|
||||||
[vim.diagnostic.severity.HINT] = ' ',
|
|
||||||
},
|
|
||||||
} or {},
|
|
||||||
virtual_text = {
|
|
||||||
source = 'if_many',
|
|
||||||
spacing = 2,
|
|
||||||
format = function(diagnostic)
|
|
||||||
local diagnostic_message = {
|
|
||||||
[vim.diagnostic.severity.ERROR] = diagnostic.message,
|
|
||||||
[vim.diagnostic.severity.WARN] = diagnostic.message,
|
|
||||||
[vim.diagnostic.severity.INFO] = diagnostic.message,
|
|
||||||
[vim.diagnostic.severity.HINT] = diagnostic.message,
|
|
||||||
}
|
|
||||||
return diagnostic_message[diagnostic.severity]
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
end, -- End of config function
|
end
|
||||||
|
|
||||||
-- lazydev setup
|
-- Setup keymaps and diagnostics based on kickstart's original init.lua LSP section
|
||||||
{
|
vim.api.nvim_create_autocmd('LspAttach', {
|
||||||
'folke/lazydev.nvim',
|
group = vim.api.nvim_create_augroup('kickstart-lsp-attach-override', { clear = true }),
|
||||||
ft = 'lua',
|
callback = function(event)
|
||||||
opts = {
|
local map = function(keys, func, desc, mode)
|
||||||
library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } },
|
mode = mode or 'n'
|
||||||
|
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Standard LSP keymaps
|
||||||
|
map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
|
||||||
|
map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
|
||||||
|
map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
|
||||||
|
map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
|
||||||
|
map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
|
||||||
|
map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
||||||
|
map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols')
|
||||||
|
map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols')
|
||||||
|
map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition')
|
||||||
|
|
||||||
|
-- Highlight references
|
||||||
|
local client = vim.lsp.get_client_by_id(event.data.client_id)
|
||||||
|
local function client_supports_method(client, method, bufnr)
|
||||||
|
if vim.fn.has 'nvim-0.11' == 1 then
|
||||||
|
return client:supports_method(method, { bufnr = bufnr })
|
||||||
|
else
|
||||||
|
return client.supports_method(method, { bufnr = bufnr })
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if client and client_supports_method(client, 'textDocument/documentHighlight', event.buf) then
|
||||||
|
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight-override', { clear = false })
|
||||||
|
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.document_highlight })
|
||||||
|
vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.clear_references })
|
||||||
|
vim.api.nvim_create_autocmd('LspDetach', { group = vim.api.nvim_create_augroup('kickstart-lsp-detach-override', { clear = true }), callback = function(event2) vim.lsp.buf.clear_references(); vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight-override', buffer = event2.buf } end })
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Inlay hints toggle
|
||||||
|
if client and client_supports_method(client, 'textDocument/inlayHint', event.buf) then
|
||||||
|
map('<leader>th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints')
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Diagnostic configuration
|
||||||
|
vim.diagnostic.config {
|
||||||
|
severity_sort = true,
|
||||||
|
float = { border = 'rounded', source = 'if_many' },
|
||||||
|
underline = { severity = vim.diagnostic.severity.ERROR },
|
||||||
|
signs = vim.g.have_nerd_font and {
|
||||||
|
text = {
|
||||||
|
[vim.diagnostic.severity.ERROR] = ' ', [vim.diagnostic.severity.WARN] = ' ', [vim.diagnostic.severity.INFO] = ' ', [vim.diagnostic.severity.HINT] = ' ',
|
||||||
|
},
|
||||||
|
} or {},
|
||||||
|
virtual_text = {
|
||||||
|
source = 'if_many', spacing = 2,
|
||||||
|
format = function(diagnostic)
|
||||||
|
local diagnostic_message = { [vim.diagnostic.severity.ERROR] = diagnostic.message, [vim.diagnostic.severity.WARN] = diagnostic.message, [vim.diagnostic.severity.INFO] = diagnostic.message, [vim.diagnostic.severity.HINT] = diagnostic.message }
|
||||||
|
return diagnostic_message[diagnostic.severity]
|
||||||
|
end,
|
||||||
},
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
end, -- End of config function
|
||||||
|
},
|
||||||
|
|
||||||
|
-- lazydev setup (still useful for Neovim Lua development)
|
||||||
|
{
|
||||||
|
'folke/lazydev.nvim',
|
||||||
|
ft = 'lua',
|
||||||
|
opts = {
|
||||||
|
library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } },
|
||||||
},
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue