diff --git a/lua/config/conform.lua b/lua/config/conform.lua index 2b881b9..96b5f1a 100644 --- a/lua/config/conform.lua +++ b/lua/config/conform.lua @@ -1,11 +1,12 @@ local vim = vim require("conform").setup({ + log_level = vim.log.levels.DEBUG, formatters_by_ft = { mason = { "html_beautify" }, html = { "html_beautify" }, xml = { "xmllint" }, - javascript = { "prettier" }, + javascript = { "biome" }, json = { "js_beautify" }, java = { "prettier" }, python = { "black" }, diff --git a/lua/config/java.lua b/lua/config/java.lua index d53a74b..b5f97e3 100644 --- a/lua/config/java.lua +++ b/lua/config/java.lua @@ -1,4 +1,4 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities() -require("lspconfig").jdtls.setup({ +vim.lsp.config("jdtls", { capabilities = capabilities, }) diff --git a/lua/config/lua.lua b/lua/config/lua.lua index 649aaba..a10ece8 100644 --- a/lua/config/lua.lua +++ b/lua/config/lua.lua @@ -1,4 +1,4 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities() -require("lspconfig").lua_ls.setup({ +vim.lsp.config("lua_ls", { capabilities = capabilities, }) diff --git a/lua/config/python.lua b/lua/config/python.lua index 867d39c..ca969e6 100644 --- a/lua/config/python.lua +++ b/lua/config/python.lua @@ -1,4 +1,4 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities() -require("lspconfig").pylsp.setup({ +vim.lsp.config("pylsp", { capabilities = capabilities, }) diff --git a/lua/config/typescript.lua b/lua/config/typescript.lua index 6b3791e..b6ab64e 100644 --- a/lua/config/typescript.lua +++ b/lua/config/typescript.lua @@ -1,4 +1,4 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities() -require("lspconfig").ts_ls.setup({ +vim.lsp.config("ts_ls", { capabilities = capabilities, }) diff --git a/lua/plugins.lua b/lua/plugins.lua index dacb05d..763086d 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -3,14 +3,15 @@ return { "tpope/vim-surround", "tpope/vim-sleuth", "tpope/vim-abolish", - "feline-nvim/feline.nvim", + "adpce/feline.nvim", "mattn/emmet-vim", "easymotion/vim-easymotion", "mhinz/vim-startify", - "simrat39/symbols-outline.nvim", + "jergason/symbols-outline.nvim", "neovim/nvim-lspconfig", { - "hrsh7th/nvim-cmp", + "vulns-are-features-too/nvim-cmp", + --"hrsh7th/nvim-cmp", dependencies = { "hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-buffer",