fix(nvim): improve python lsp and fix autocmds

3 files changed, 25 insertions, 15 deletions

diff --git a/nvim/.config/nvim/lua/tobyvin/autocmds.lua b/nvim/.config/nvim/lua/tobyvin/autocmds.lua
index b458baf..cddaa93 100644
--- a/nvim/.config/nvim/lua/tobyvin/autocmds.lua
+++ b/nvim/.config/nvim/lua/tobyvin/autocmds.lua
@@ -3,7 +3,9 @@ local augroup = vim.api.nvim_create_augroup("tobyvin", { clear = true })
 vim.api.nvim_create_autocmd("TextYankPost", {
 	group = augroup,
 	pattern = "*",
-	callback = vim.highlight.on_yank,
+	callback = function()
+		vim.highlight.on_yank()
+	end,
 	desc = "vim.highlight.on_yank()",
 })
 
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
index e36213a..a292ce5 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
@@ -90,16 +90,19 @@ local M = {
 		},
 	},
 	powershell_es = {},
-	pyright = {
+	pylsp = {
 		settings = {
-			pyright = {
-				disableOrganizeImports = true,
-			},
-			python = {
-				analysis = {
-					autoSearchPaths = true,
-					diagnosticMode = "workspace",
-					useLibraryCodeForTypes = true,
+			pylsp = {
+				plugins = {
+					black = { enabled = false },
+					autopep8 = { enabled = false },
+					yapf = { enabled = false },
+					pycodestyle = {
+						maxLineLength = 88,
+					},
+					pyflakes = { enabled = false },
+					rope_completion = { enabled = true },
+					rope_autoimport = { enabled = true },
 				},
 			},
 		},
diff --git a/nvim/.config/nvim/lua/tobyvin/utils/lsp.lua b/nvim/.config/nvim/lua/tobyvin/utils/lsp.lua
index e0fc17b..7e5e351 100644
--- a/nvim/.config/nvim/lua/tobyvin/utils/lsp.lua
+++ b/nvim/.config/nvim/lua/tobyvin/utils/lsp.lua
@@ -8,6 +8,12 @@ local M = {
 ---@param on_attach fun(client: vim.lsp.Client, bufnr: integer): boolean|nil
 ---@param opts vim.api.keyset.create_autocmd?
 function M.on_attach(filter, on_attach, opts)
+	if type(filter) == "string" then
+		filter = {
+			name = filter,
+		}
+	end
+
 	opts = opts or {}
 	opts.callback = function(args)
 		local bufnr = args.buf ---@type number
@@ -16,11 +22,10 @@ function M.on_attach(filter, on_attach, opts)
 		if
 			client
 			and vim.iter({ filter }):all(function(f)
-				return (type(f) == "string" and f == client.name)
-					or (f.id == nil or client.id == f.id)
-						and (f.name == nil or client.name == f.name)
-						and (f.bufnr == nil or bufnr == f.bufnr)
-						and (f.method == nil or client.supports_method(f.method, { bufnr = bufnr }))
+				return (f.id == nil or client.id == f.id)
+					and (f.name == nil or client.name == f.name)
+					and (f.bufnr == nil or bufnr == f.bufnr)
+					and (f.method == nil or client.supports_method(f.method, { bufnr = bufnr }))
 			end)
 		then
 			on_attach(client, bufnr)