From 4da2691f1674ec4c80fda3e9af0fc62e4b2af4d2 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 3 Jun 2025 21:44:44 -0700 Subject: [PATCH] Add pyright for full LSP functionality --- .config/nvim/lua/plugins/language-server.lua | 136 ++++++++++--------- 1 file changed, 73 insertions(+), 63 deletions(-) diff --git a/.config/nvim/lua/plugins/language-server.lua b/.config/nvim/lua/plugins/language-server.lua index cb77b2a..ee07087 100644 --- a/.config/nvim/lua/plugins/language-server.lua +++ b/.config/nvim/lua/plugins/language-server.lua @@ -1,65 +1,75 @@ return { - { - "mason-org/mason.nvim", - tag = "v1.11.0", - config = function() - require("mason").setup({}) - end, - }, - { - "mason-org/mason-lspconfig.nvim", - tag = "v1.32.0", - config = function() - require("mason-lspconfig").setup({ - ensure_installed = { - "lua_ls", - "bashls", - "dockerls", - --"gh-actions-language-server", - "helm_ls", - "jsonls", - "marksman", - "nginx_language_server", - "ruff", - "yamlls", - }, - }) - end, - }, - { - "nvimtools/none-ls.nvim", - config = function() - local null_ls = require("null-ls") - null_ls.setup({ - sources = { - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.mdformat, - }, - }) - vim.keymap.set("n", "af", vim.lsp.buf.format, { desc = "Auto-Format File" }) - end, - }, - { - "neovim/nvim-lspconfig", - tag = "v1.8.0", - config = function() - local capabilities = require("cmp_nvim_lsp").default_capabilities() - local lspconfig = require("lspconfig") - lspconfig.ts_ls.setup({ - capabilities = capabilities, - }) - lspconfig.lua_ls.setup({ capabilities = capabilities }) - lspconfig.bashls.setup({ capabilities = capabilities }) - lspconfig.dockerls.setup({ capabilities = capabilities }) - lspconfig.helm_ls.setup({ capabilities = capabilities }) - lspconfig.jsonls.setup({ capabilities = capabilities }) - lspconfig.nginx_language_server.setup({ capabilities = capabilities }) - lspconfig.marksman.setup({ capabilities = capabilities }) - lspconfig.ruff.setup({ capabilities = capabilities }) - lspconfig.yamlls.setup({ capabilities = capabilities }) - vim.keymap.set("n", "d", vim.lsp.buf.hover, { desc = "Show Docstring" }) - vim.keymap.set("n", "gt", vim.lsp.buf.definition, { desc = "Go To Definition" }) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "Show Code Actions" }) - end, - }, + { + "mason-org/mason.nvim", + tag = "v1.11.0", + config = function() + require("mason").setup({}) + end, + }, + { + "mason-org/mason-lspconfig.nvim", + tag = "v1.32.0", + config = function() + require("mason-lspconfig").setup({ + ensure_installed = { + "lua_ls", + "bashls", + "dockerls", + --"gh-actions-language-server", + "helm_ls", + "jsonls", + "marksman", + "nginx_language_server", + "pyright", + "ruff", + "yamlls", + }, + }) + end, + }, + { + "nvimtools/none-ls.nvim", + config = function() + local null_ls = require("null-ls") + null_ls.setup({ + sources = { + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.mdformat, + }, + }) + vim.keymap.set("n", "af", vim.lsp.buf.format, { desc = "Auto-Format File" }) + end, + }, + { + "neovim/nvim-lspconfig", + tag = "v1.8.0", + lazy = true, + event = { "BufReadPost", "BufNewFile" }, + dependencies = { + "mason-org/mason.nvim", + "mason-org/mason-lspconfig.nvim", + }, + config = function() + local capabilities = require("cmp_nvim_lsp").default_capabilities() + local lspconfig = require("lspconfig") + lspconfig.ts_ls.setup({ + capabilities = capabilities, + }) + lspconfig.lua_ls.setup({ capabilities = capabilities }) + lspconfig.bashls.setup({ capabilities = capabilities }) + lspconfig.dockerls.setup({ capabilities = capabilities }) + lspconfig.helm_ls.setup({ capabilities = capabilities }) + lspconfig.jsonls.setup({ capabilities = capabilities }) + lspconfig.nginx_language_server.setup({ capabilities = capabilities }) + lspconfig.marksman.setup({ capabilities = capabilities }) + lspconfig.pyright.setup({ capabilities = capabilities }) + lspconfig.ruff.setup({ + capabilities = capabilities, + }) + lspconfig.yamlls.setup({ capabilities = capabilities }) + vim.keymap.set("n", "cs", vim.lsp.buf.hover, { desc = "Show Docstring" }) + vim.keymap.set("n", "gt", vim.lsp.buf.definition, { desc = "Go To Definition" }) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, { desc = "Show Code Actions" }) + end, + }, }