Skip to content

Commit ab64369

Browse files
update to support nvim 0.11 and also remove mini.nvim text objects as
now using treesitter
1 parent 673d124 commit ab64369

3 files changed

Lines changed: 17 additions & 13 deletions

File tree

lua/plugins/lspconfig-plugin.lua

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ return {
2828
---@class lspconfig.options
2929
servers = {
3030
-- phpactor = {},
31-
volar = {},
31+
-- volar = {},
32+
vue_ls = {},
3233
-- harper_ls = {
3334
-- settings = {
3435
-- ["harper-ls"] = {
@@ -89,13 +90,14 @@ return {
8990
biome = {},
9091
oxlint = {},
9192
ocamlls = {},
92-
ccls = {
93-
init_options = {
94-
cache = {
95-
directory = ".ccls-cache",
96-
},
97-
}
98-
},
93+
clangd = {},
94+
-- ccls = {
95+
-- init_options = {
96+
-- cache = {
97+
-- directory = ".ccls-cache",
98+
-- },
99+
-- }
100+
-- },
99101
-- elmls = {},
100102
basedpyright = {},
101103
protols = {
@@ -145,12 +147,14 @@ return {
145147
},
146148
config = function(_, opts)
147149
vim.filetype.add({ extension = { templ = "templ" } })
148-
local lspconfig = require("lspconfig")
150+
local blink = require('blink.cmp')
149151
for server, config in pairs(opts.servers) do
150-
config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
151-
lspconfig[server].setup(config)
152+
config.capabilities = blink.get_lsp_capabilities(config.capabilities)
153+
vim.lsp.config(server, config)
154+
vim.lsp.enable(server)
152155
end
153156

157+
154158
vim.api.nvim_create_autocmd("LspAttach", {
155159
--- @param args vim.api.keyset.create_autocmd.callback_args
156160
callback = function(args)

lua/plugins/mini-plugin.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ return {
1717
})
1818
require('mini.jump').setup()
1919
require('mini.move').setup()
20-
require('mini.ai').setup()
20+
-- require('mini.ai').setup()
2121
end
2222
},
2323
{

lua/plugins/tree-sitter-plugin.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ return {
1010
-- disable rtp plugin, as we only need its queries for mini.ai
1111
-- In case other textobject modules are enabled, we will load them
1212
-- once nvim-treesitter is loaded
13-
require("lazy.core.loader").disable_rtp_plugin("nvim-treesitter-textobjects")
13+
-- require("lazy.core.loader").disable_rtp_plugin("nvim-treesitter-textobjects")
1414
vim.g.load_textobjects = true
1515
end,
1616
},

0 commit comments

Comments
 (0)