mirror of
https://github.com/kristoferssolo/SoloVim.git
synced 2026-02-04 06:42:05 +00:00
Update 2025-05-31
Update 2025-05-03 Update 2025-05-05 Update 2025-05-07 Update 2025-05-09 chore: use mini.nvim Update 2025-05-12 Update 2025-05-14 Update 2025-05-16 Update 2025-05-17 Update 2025-05-20 Update 2025-05-21 Update 2025-05-23 Update 2025-05-25 Update 2025-05-30
This commit is contained in:
@@ -7,7 +7,6 @@ return {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
"folke/trouble.nvim",
|
||||
"folke/neoconf.nvim",
|
||||
"piersolenski/telescope-import.nvim",
|
||||
"mrcjkb/rustaceanvim",
|
||||
"pmizio/typescript-tools.nvim",
|
||||
"nvim-java/nvim-java",
|
||||
@@ -28,11 +27,25 @@ return {
|
||||
end
|
||||
|
||||
local default_setup = function(server)
|
||||
local server_config = opts.servers[server]
|
||||
local capabilities = require("blink.cmp").get_lsp_capabilities()
|
||||
lspconfig[server].setup({
|
||||
capabilities = extend_capabilities(capabilities),
|
||||
})
|
||||
|
||||
local final_config = {}
|
||||
if server_config then
|
||||
-- Deep extend custom config with default capabilities
|
||||
final_config = vim.tbl_deep_extend("force", {}, server_config, {
|
||||
capabilities = extend_capabilities(capabilities),
|
||||
})
|
||||
else
|
||||
-- Basic setup with default capabilities if no custom config exists
|
||||
final_config = {
|
||||
capabilities = extend_capabilities(capabilities),
|
||||
}
|
||||
end
|
||||
|
||||
lspconfig[server].setup(final_config)
|
||||
end
|
||||
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
desc = "LSP actions",
|
||||
callback = function(event)
|
||||
@@ -71,12 +84,12 @@ return {
|
||||
nmap("<leader>lk", function()
|
||||
vim.diagnostic.jump({ count = -1, float = true })
|
||||
end, "Diagnostic Prev")
|
||||
-- nmap("]d", function()
|
||||
-- trouble.next({ mode = "diagnostics", skip_groups = true, jump = true })
|
||||
-- end, "LSP: Trouble Next")
|
||||
-- nmap("[d", function()
|
||||
-- trouble.prev({ mode = "diagnostics", skip_groups = true, jump = true })
|
||||
-- end, "Trouble Prev")
|
||||
nmap("]d", function()
|
||||
trouble:next({ mode = "diagnostics", skip_groups = true, jump = true })
|
||||
end, "LSP: Trouble Next")
|
||||
nmap("[d", function()
|
||||
trouble.prev({ mode = "diagnostics", skip_groups = true, jump = true })
|
||||
end, "Trouble Prev")
|
||||
vim.keymap.set(
|
||||
{ "n", "v" },
|
||||
"<leader>la",
|
||||
@@ -116,6 +129,7 @@ return {
|
||||
require("mason-lspconfig").setup({
|
||||
automatic_installation = true,
|
||||
automatic_setup = true,
|
||||
automatic_enable = true,
|
||||
ensure_installed = {
|
||||
"basedpyright",
|
||||
"bashls",
|
||||
@@ -139,12 +153,6 @@ return {
|
||||
},
|
||||
})
|
||||
|
||||
for server, config in pairs(opts.servers) do
|
||||
local capabilities = require("blink.cmp").get_lsp_capabilities(config.capabilities)
|
||||
config.capabilities = extend_capabilities(capabilities)
|
||||
lspconfig[server].setup(config)
|
||||
end
|
||||
|
||||
local function setup_ghostty_lsp()
|
||||
-- Only activate ghostty-lsp when editing the ghostty config
|
||||
if vim.fn.expand("%:p") == vim.fs.normalize("**/ghostty/config") then
|
||||
@@ -321,25 +329,25 @@ return {
|
||||
provideFormatter = false,
|
||||
},
|
||||
},
|
||||
-- tinymist = {
|
||||
-- offset_encoding = "utf-8",
|
||||
-- settings = {
|
||||
-- formatterMode = "typstyle",
|
||||
-- exportPdf = "none",
|
||||
-- outputPath = "$root/target/$dir/$name",
|
||||
-- semanticTokens = "disable",
|
||||
-- },
|
||||
-- },
|
||||
matlab_ls = {
|
||||
indexWorkspace = true,
|
||||
matlabConnectionTiming = "onStart",
|
||||
telemetry = false,
|
||||
filetypes = {
|
||||
"matlab",
|
||||
"octave",
|
||||
tinymist = {
|
||||
offset_encoding = "utf-8",
|
||||
settings = {
|
||||
formatterMode = "typstyle",
|
||||
exportPdf = "none",
|
||||
outputPath = "$root/target/$dir/$name",
|
||||
semanticTokens = "disable",
|
||||
},
|
||||
},
|
||||
-- jdtls = {},
|
||||
markdown_oxide = {
|
||||
capabilities = {
|
||||
workspace = {
|
||||
didChangeWatchedFiles = {
|
||||
dynamicRegistration = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
jdtls = {},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user