From 6049b4260ee8284675a0b6cfff3387d7017f3f2b Mon Sep 17 00:00:00 2001 From: kenyzumm Date: Sat, 27 Jun 2026 11:43:47 +0200 Subject: [PATCH] asd --- lazy-lock.json | 30 +++++++++++++++--------------- lua/plugins/lsp.lua | 16 ++++++++++++++++ lua/plugins/mason.lua | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 66075b4..bff368f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,25 +1,25 @@ { - "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" }, - "catppuccin": { "branch": "main", "commit": "0a5de4da015a175f416d6ef1eda84661623e0500" }, + "LuaSnip": { "branch": "master", "commit": "0abc8f390b278c3b4aabc4c004ac8a088b65cf24" }, + "catppuccin": { "branch": "main", "commit": "0303a7208dba448c459767486a38a6ec05c4216b" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "image.nvim": { "branch": "master", "commit": "73a64613048216bda1a4f464bf7bed2dbaaf4cec" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2ab512d3d8e2fd1f679543c13e0dc4606c3d3d2e" }, - "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" }, + "image.nvim": { "branch": "master", "commit": "44e07129cd0ea0c60afa7a1991d35b5765b51a6b" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0a695750d747db1e7e70bcf0267ef8951c95fc83" }, + "mason.nvim": { "branch": "main", "commit": "16ba83bfc8a25f52bb545134f5bee082b195c460" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "ebd66767191714e008ce73b769518a763ff31bdc" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, - "nvim-dap": { "branch": "master", "commit": "b516f20b487b0ac6a281e376dfac1d16b5040041" }, - "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-lspconfig": { "branch": "master", "commit": "f386df19b145607a33885b6110ef5c04faae42cb" }, + "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, + "nvim-dap": { "branch": "master", "commit": "531771530d4f82ad2d21e436e3cc052d68d7aebb" }, + "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" }, + "nvim-lspconfig": { "branch": "master", "commit": "9573948c38bfabeec353ae7dd7d3ffec4c506a6b" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "main", "commit": "957f86ae3f049ab6681ed64c05b05768fcaed0d2" }, - "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "629eb9533ec989d9d5c6cab8f3ad5372422c24e0" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, + "render-markdown.nvim": { "branch": "main", "commit": "5adf0895310c1904e5abfaad40a2baad7fe44a07" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" } } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 3def804..0879105 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -11,7 +11,23 @@ return { root_markers = { "compile_commands.json", ".git" }, }) + vim.lsp.config('rust_analyzer', { + capabilities = capabilities, + cmd = { "rust-analyzer" }, + filetypes = { "rust" }, + root_markers = { "Cargo.toml", ".git" }, + }) + + vim.lsp.config('pyright', { + capabilities = capabilities, + filetypes = { "python" }, + root_markers = { "pyproject.toml", "setup.py", ".git" }, + }) + vim.lsp.enable('clangd') + vim.lsp.enable('rust_analyzer') + vim.lsp.enable('pyright') + vim.keymap.set('n', 'e', vim.diagnostic.open_float) end } diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua index 9657432..610f349 100644 --- a/lua/plugins/mason.lua +++ b/lua/plugins/mason.lua @@ -1,4 +1,3 @@ --- plugins/mason.lua return { { "williamboman/mason.nvim", @@ -8,10 +7,45 @@ return { }, { "williamboman/mason-lspconfig.nvim", + dependencies = { "williamboman/mason.nvim" }, config = function() require("mason-lspconfig").setup({ - ensure_installed = { "ts_ls", "eslint", "clangd", "html", "cssls", "emmet_ls" } + ensure_installed = { "ts_ls", "eslint", "clangd", "html", "cssls", "emmet_ls", "rust_analyzer", "pyright" } }) end + }, + { + "neovim/nvim-lspconfig", + dependencies = { "williamboman/mason-lspconfig.nvim" }, + config = function() + local cmp_nvim_lsp = require("cmp_nvim_lsp") + local capabilities = cmp_nvim_lsp.default_capabilities() + + vim.lsp.config('clangd', { + capabilities = capabilities, + cmd = { "clangd", "--background-index" }, + filetypes = { "c", "cpp", "objc", "objcpp" }, + root_markers = { "compile_commands.json", ".git" }, + }) + + vim.lsp.config('rust_analyzer', { + capabilities = capabilities, + cmd = { "rust-analyzer" }, + filetypes = { "rust" }, + root_markers = { "Cargo.toml", ".git" }, + }) + + vim.lsp.config('pyright', { + capabilities = capabilities, + filetypes = { "python" }, + root_markers = { "pyproject.toml", "setup.py", ".git" }, + }) + + vim.lsp.enable('clangd') + vim.lsp.enable('rust_analyzer') + vim.lsp.enable('pyright') + + vim.keymap.set('n', 'e', vim.diagnostic.open_float) + end } }