diff --git a/lazy-lock.json b/lazy-lock.json index 4948d3f..c0fcbcd 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,35 +8,34 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "fidget.nvim": { "branch": "main", "commit": "2cb5edb2dd6700a958a446b20bb2be04d318da9d" }, - "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, + "fidget.nvim": { "branch": "main", "commit": "b45d21d33d61ed9295308eb6571c0a5f0f7f3765" }, + "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" }, "kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lspkind-nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, + "lspkind-nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, "minuet-ai.nvim": { "branch": "main", "commit": "2083b86ea01cb18dc9e7cb7a68f932ea06e999e8" }, + "mssql.nvim": { "branch": "main", "commit": "51bf5e8629c2f0153160e36afb57a3743b9b6fd9" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-dap": { "branch": "master", "commit": "a479e25ed5b5d331fb46ee4b9e160ff02ac64310" }, + "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-jdtls": { "branch": "master", "commit": "4d77ff02063cf88963d5cf10683ab1fd15d072de" }, - "nvim-lspconfig": { "branch": "master", "commit": "a6dbc91d9ae373a87bcd9e3c15853e309691c39b" }, + "nvim-jdtls": { "branch": "master", "commit": "b69924ca90014fef485ee153571bdcbc1ece8c2e" }, + "nvim-lspconfig": { "branch": "master", "commit": "ef73a4f2a1ddf0439eb97b46de2aab265ddba1cd" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "dca8726fea2c14e1ce6adbaa76a04816fbfaff61" }, + "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, - "opencode.nvim": { "branch": "main", "commit": "a429debd3e5b36ca91e2944e4c178c0633e96dd5" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, - "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, + "trouble.nvim": { "branch": "main", "commit": "f176232e7759c4f8abd923c21e3e5a5c76cd6837" }, "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index d345051..0fa84f0 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -59,11 +59,10 @@ return { 'neovim/nvim-lspconfig', config = function() local capabilities = require('cmp_nvim_lsp').default_capabilities() - local lspconfig = require('lspconfig') - lspconfig.lua_ls.setup { + vim.lsp.config('lua_ls', { capabilities = capabilities, - root_dir = lspconfig.util.root_pattern('.git'), + root_markers = { '.git' }, settings = { Lua = { runtime = { @@ -82,56 +81,56 @@ return { } }, on_attach = lsp_attach - } - lspconfig.ts_ls.setup { + }) + vim.lsp.config('ts_ls', { capabilities = capabilities, on_attach = lsp_attach - } - lspconfig.gopls.setup { + }) + vim.lsp.config('gopls', { capabilities = capabilities, on_attach = lsp_attach - } - --lspconfig.rust_analyzer.setup { + }) + --vim.lsp.config(rust_analyzer.setup { -- capabilities = capabilities, -- on_attach = lsp_attach - --} - lspconfig.bashls.setup { - capabilities = capabilities, - on_attach = lsp_attach - } - lspconfig.sqlls.setup({ + --}) + vim.lsp.config('bashls', { capabilities = capabilities, on_attach = lsp_attach }) - lspconfig.html.setup({ + vim.lsp.config('sqlls', { capabilities = capabilities, on_attach = lsp_attach }) - lspconfig.cssls.setup({ + vim.lsp.config('html', { capabilities = capabilities, on_attach = lsp_attach }) - lspconfig.tailwindcss.setup({ + vim.lsp.config('cssls', { capabilities = capabilities, on_attach = lsp_attach }) - lspconfig.phpactor.setup({ + vim.lsp.config('tailwindcss', { capabilities = capabilities, on_attach = lsp_attach }) - lspconfig.julials.setup({ + vim.lsp.config('phpactor', { capabilities = capabilities, on_attach = lsp_attach }) - lspconfig.wgsl_analyzer.setup({ + vim.lsp.config('julials', { capabilities = capabilities, on_attach = lsp_attach }) - lspconfig.glsl_analyzer.setup({ + vim.lsp.config('wgsl_analyzer', { capabilities = capabilities, on_attach = lsp_attach }) - lspconfig.emmet_ls.setup({ + vim.lsp.config('glsl_analyzer', { + capabilities = capabilities, + on_attach = lsp_attach + }) + vim.lsp.config('emmet_ls', { filetypes = { "css", "html", "javascript", "typescript" }, -- Read more about this options in the [vscode docs](https://code.visualstudio.com/docs/editor/emmet#_emmet-configuration). -- **Note:** only the options listed in the table are supported. @@ -156,14 +155,14 @@ return { variables = {}, }, }) - -- lspconfig.ccls.setup { + -- vim.lsp.config('ccls.setup { -- capabilities = capabilities, -- on_attach = lsp_attach, - -- } - lspconfig.clangd.setup { + -- }) + vim.lsp.config('clangd', { capabilities = capabilities, on_attach = lsp_attach, - } + }) end }, { @@ -335,6 +334,15 @@ return { jdtls.start_or_attach(config) end }, + { + "Kurren123/mssql.nvim", + opts = { + -- optional + keymap_prefix = "m" + }, + -- optional + dependencies = { "folke/which-key.nvim" } + }, { 'onsails/lspkind-nvim' }, -- pictograms replace (?) with lspsaga { 'j-hui/fidget.nvim',