From 99a33912bb71a8ebc30fc1e2b563936794af16bd Mon Sep 17 00:00:00 2001 From: Alzalia Date: Sat, 27 Sep 2025 21:00:07 +0200 Subject: [PATCH] feat: use installed lsp instead of fixed list --- lazy-lock.json | 41 +++++++++++++++++++++++++- lua/configs/conform.lua | 3 +- lua/configs/lspconfig.lua | 19 ------------ lua/custom/plugins/mason-lspconfig.lua | 12 ++++++++ 4 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 lua/custom/plugins/mason-lspconfig.lua diff --git a/lazy-lock.json b/lazy-lock.json index e843919..7f03992 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,30 +1,53 @@ { +<<<<<<< HEAD "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" }, "NvChad": { "branch": "v2.5", "commit": "d4e5b8a10f01c06e18d2a8bb66761a3596562a67" }, "base46": { "branch": "v3.0", "commit": "80358ecdb5779b199130ed03031c34c0c2bca3fc" }, +======= + "LuaSnip": { "branch": "master", "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9" }, + "NvChad": { "branch": "v2.5", "commit": "f107fabe11ac8013dc3435ecd5382bee872b1584" }, + "base46": { "branch": "v3.0", "commit": "db58475d3fd2a16f9b1467d6895e3c4c195ed7dd" }, + "cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" }, +>>>>>>> 5ad36f4 (feat: use installed lsp instead of fixed list) "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, +<<<<<<< HEAD "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" }, +======= + "conform.nvim": { "branch": "master", "commit": "3bad87250ed85246fe8c5bc10005ab5a6289ae4c" }, +>>>>>>> 5ad36f4 (feat: use installed lsp instead of fixed list) "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "floatty.nvim": { "branch": "main", "commit": "4867cdaa58316cfb663523c164b33b520b1b954a" }, + "floatty.nvim": { "branch": "main", "commit": "e82ae3bbe46b8e28918bcf7b9f3d5c36304e0c9f" }, "flutter-tools.nvim": { "branch": "main", "commit": "65b7399804315a1160933b64292d3c5330aa4e9f" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, +<<<<<<< HEAD "gitsigns.nvim": { "branch": "main", "commit": "e399f9748d7cfd8859747c8d6c4e9c8b4d50a1bd" }, +======= + "gitsigns.nvim": { "branch": "main", "commit": "23ae90a2a52fdc9b8c50dc61d6c30ebb18521343" }, +>>>>>>> 5ad36f4 (feat: use installed lsp instead of fixed list) "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "java.nvim": { "branch": "main", "commit": "be6b5775dc2f757ce605459f5bc33167aedcdfbc" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" }, +<<<<<<< HEAD "markview.nvim": { "branch": "main", "commit": "e6b0f5aee8105adab6077509c46459812db4cffa" }, "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" }, "menu": { "branch": "main", "commit": "8adb036ec34c679050913864cbc98cc64eb91f6c" }, +======= + "markview.nvim": { "branch": "main", "commit": "82c21e3b3f982ae76107a787fb28383d76fffeab" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f760507df8c49a4bf46a4d12e1fc616797508979" }, + "mason.nvim": { "branch": "main", "commit": "b3689a41dd77e5294498dba9757fb22cc80cbebd" }, + "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" }, +>>>>>>> 5ad36f4 (feat: use installed lsp instead of fixed list) "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, +<<<<<<< HEAD "nvim-dap": { "branch": "master", "commit": "7891b01beedc37cef4eaf2e92563bd0a5b6e9c58" }, "nvim-jdtls": { "branch": "master", "commit": "8eee2302598bad61c5674dc04d7e93cfd85f46f6" }, "nvim-lspconfig": { "branch": "master", "commit": "5a137448fd921a0c5d3939cb75e60d21f64e4606" }, @@ -39,4 +62,20 @@ "ui": { "branch": "v3.0", "commit": "9a60cd12635c7235200d810bf94019c0c931a656" }, "volt": { "branch": "main", "commit": "c45d5f48da8e802e608b5c6da471ca4d84276dfb" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } +======= + "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, + "nvim-jdtls": { "branch": "master", "commit": "b69924ca90014fef485ee153571bdcbc1ece8c2e" }, + "nvim-lspconfig": { "branch": "master", "commit": "336b388c272555d2ae94627a50df4c2f89a5e257" }, + "nvim-tree.lua": { "branch": "master", "commit": "e179ad2f83b5955ab0af653069a493a1828c2697" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-ufo": { "branch": "main", "commit": "d31e2a9fd572a25a4d5011776677223a8ccb7e35" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "ui": { "branch": "v3.0", "commit": "03b9718140375e7f3f5e4f3e04bc2b6c907440ec" }, + "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, + "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" } +>>>>>>> 5ad36f4 (feat: use installed lsp instead of fixed list) } diff --git a/lua/configs/conform.lua b/lua/configs/conform.lua index d9c20d5..d0209f7 100644 --- a/lua/configs/conform.lua +++ b/lua/configs/conform.lua @@ -3,12 +3,11 @@ local options = { lua = { "stylua" }, css = { "prettier" }, html = { "prettier" }, - typescript = { { "eslint", "prettier" } }, + typescript = { "prettier" }, typescriptreact = { "prettier" }, javascript = { "prettier" }, javascriptreact = { "prettier" }, json = { "prettier" }, - -- rust = { "rustfmt" }, }, format_on_save = { diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua index 4c2182e..9faa434 100644 --- a/lua/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -1,21 +1,2 @@ -- load defaults i.e lua_lsp require("nvchad.configs.lspconfig").defaults() - -local servers = { - html = {}, - cssls = {}, - clangd = {}, - ts_ls = {}, - tailwindcss = {}, - jdtls = {}, - texlab = {}, - jsonls = {}, - dartls = {}, - rust_analyzer = {}, - yamlls = {}, -} - -for name, opts in pairs(servers) do - vim.lsp.enable(name) - vim.lsp.config(name, opts) -end diff --git a/lua/custom/plugins/mason-lspconfig.lua b/lua/custom/plugins/mason-lspconfig.lua new file mode 100644 index 0000000..8ab44cc --- /dev/null +++ b/lua/custom/plugins/mason-lspconfig.lua @@ -0,0 +1,12 @@ +return { + "mason-org/mason-lspconfig.nvim", + lazy = false, + opts = {}, + dependencies = { + { "mason-org/mason.nvim", opts = {} }, + "neovim/nvim-lspconfig", + }, + config = function() + require("mason-lspconfig").setup() + end, +}