3 files changed, 21 insertions, 19 deletions
diff --git a/nvim/.config/nvim/lua/plugins/cmp.lua b/nvim/.config/nvim/lua/plugins/cmp.lua
index 4a7e016..c441c38 100644
--- a/nvim/.config/nvim/lua/plugins/cmp.lua
+++ b/nvim/.config/nvim/lua/plugins/cmp.lua
@@ -87,14 +87,6 @@ local cmp_nvim_lsp = {
 	},
 }
 
-function cmp_nvim_lsp:init()
-	local defaults = vim.lsp.protocol.make_client_capabilities()
-	---@diagnostic disable-next-line: duplicate-set-field
-	vim.lsp.protocol.make_client_capabilities = function()
-		return require("cmp_nvim_lsp").default_capabilities(defaults)
-	end
-end
-
 local M = {
 	cmp,
 	cmp_nvim_lsp,
diff --git a/nvim/.config/nvim/lua/plugins/lspconfig.lua b/nvim/.config/nvim/lua/plugins/lspconfig.lua
index 3a8d3ec..ad06d72 100644
--- a/nvim/.config/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/.config/nvim/lua/plugins/lspconfig.lua
@@ -3,9 +3,18 @@ local M = {
 	"neovim/nvim-lspconfig",
 	version = false,
 	event = "BufReadPre",
+	dependencies = { "hrsh7th/cmp-nvim-lsp" },
 }
 
 function M:config()
+	-- local capabilities = require("lspconfig").util.default_config.capabilities
+	-- capabilities = vim.tbl_deep_extend(
+	-- 	"force",
+	-- 	capabilities,
+	-- 	require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
+	-- )
+	-- require("lspconfig").util.default_config.capabilities = capabilities
+
 	require("lspconfig.ui.windows").default_options.border = "single"
 
 	local available_servers = require("lspconfig").util.available_servers()
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
index 4db6608..a7c494f 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
@@ -93,17 +93,14 @@ local M = {
 		},
 	},
 	powershell_es = {},
-	pylsp = {
+	pyright = {
 		settings = {
-			pylsp = {
-				plugins = {
-					black = { enabled = false },
-					autopep8 = { enabled = false },
-					yapf = { enabled = false },
-					pycodestyle = {
-						maxLineLength = 88,
-					},
-					pyflakes = { enabled = false },
+			pyright = {
+				disableOrganizeImports = true,
+			},
+			python = {
+				analysis = {
+					ignore = { "*" },
 				},
 			},
 		},
@@ -181,7 +178,11 @@ local M = {
 			})
 		end,
 	},
-	ruff = {},
+	ruff = {
+		on_attach = function(client, _)
+			client.server_capabilities.hoverProvider = false
+		end,
+	},
 	taplo = {},
 	texlab = {
 		settings = {