From fa80351fdeb814700c9c0f6212684f781d7bfe93 Mon Sep 17 00:00:00 2001
From: Hau Nguyen <hauvipapro@gmail.com>
Date: Thu, 15 Aug 2024 01:22:19 +0700
Subject: [PATCH] config(nvim): bring back pyright

---
 data/nvim/init.lua  | 26 +++++++++++++++++++++++++-
 scripts/rye_init.sh |  1 +
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/data/nvim/init.lua b/data/nvim/init.lua
index 58f2522..8d7df65 100644
--- a/data/nvim/init.lua
+++ b/data/nvim/init.lua
@@ -563,12 +563,36 @@ require("lazy").setup({
 			})
 
 			-- Python
-			-- https://github.com/astral-sh/ruff/blob/main/crates/ruff_server/docs/setup/NEOVIM.md
+			-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#pyright
+			lspconfig.pyright.setup({
+				capabilities = capabilities,
+				on_init = function(client, initialization_result)
+					if client.server_capabilities then
+						client.server_capabilities.semanticTokensProvider = nil
+					end
+				end,
+				settings = {
+					pyright = {
+						-- Conflicts with Ruff
+						disableOrganizeImports = true,
+					},
+					python = {
+						analysis = {
+							-- Conflicts with Ruff
+							ignore = { "*" },
+						},
+					},
+				},
+			})
+
+			-- https://docs.astral.sh/ruff/editors/setup/#neovim
 			-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#ruff
 			lspconfig.ruff.setup({
 				on_init = function(client, initialization_result)
 					if client.server_capabilities then
 						client.server_capabilities.semanticTokensProvider = nil
+						-- Conflicts with pyright
+						client.server_capabilities.hoverProvider = false
 					end
 				end,
 			})
diff --git a/scripts/rye_init.sh b/scripts/rye_init.sh
index 83e38cc..5b3232a 100755
--- a/scripts/rye_init.sh
+++ b/scripts/rye_init.sh
@@ -4,4 +4,5 @@ rye
 
 rye install uv
 rye install ruff
+rye install pyright
 rye install keymap-drawer