From 50769680865a229f3072e3e072e89f7ef42949ea Mon Sep 17 00:00:00 2001
From: "Arthur K." <me@wzray.com>
Date: Fri, 30 Jan 2026 17:56:53 +0300
Subject: [PATCH] nvim: use ruff with pyright

---
 .config/nvim/lua/lsp/init.lua          | 11 +++++++----
 .config/nvim/lua/lsp/pyright.lua       |  7 +++++++
 .config/nvim/lua/plugins/lspconfig.lua |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 .config/nvim/lua/lsp/pyright.lua

diff --git a/.config/nvim/lua/lsp/init.lua b/.config/nvim/lua/lsp/init.lua
index e00352c..6162619 100644
--- a/.config/nvim/lua/lsp/init.lua
+++ b/.config/nvim/lua/lsp/init.lua
@@ -9,18 +9,18 @@ local servers = {
     hls = {},
     jdtls = {},
     jsonls = {},
+    pyright = require('lsp.pyright'),
     kotlin_language_server = {},
     lua_ls = require('lsp.lua_ls'),
-    pyright = {},
+    ruff = {},
     ruby_lsp = {},
     rust_analyzer = {},
     svls = {},
     ts_ls = {},
     yamlls = require('lsp.yamlls'),
-    -- codebook = {}
 }
 
-vim.lsp.set_log_level('DEBUG')
+vim.lsp.set_log_level('WARN')
 
 local on_attach = function(_, bufnr)
     local nmap = function(keys, func)
@@ -60,7 +60,9 @@ local on_attach = function(_, bufnr)
     nmap('<leader>F', vim.lsp.buf.format)
 end
 
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
+local capabilities = vim.tbl_deep_extend('keep', require('cmp_nvim_lsp').default_capabilities(),
+    vim.lsp.protocol.make_client_capabilities())
+
 capabilities.textDocument.foldingRange = {
     dynamicRegistration = false,
     lineFoldingOnly = true
@@ -71,5 +73,6 @@ for server_name, config in pairs(servers) do
         capabilities = capabilities,
         on_attach = on_attach,
     }, config))
+
     vim.lsp.enable(server_name)
 end
diff --git a/.config/nvim/lua/lsp/pyright.lua b/.config/nvim/lua/lsp/pyright.lua
new file mode 100644
index 0000000..ea7b35d
--- /dev/null
+++ b/.config/nvim/lua/lsp/pyright.lua
@@ -0,0 +1,7 @@
+return {
+    settings = {
+        pyright = {
+            disableOrganizeImports = true,
+        },
+    },
+}
diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua
index 2efbb98..ff548e0 100644
--- a/.config/nvim/lua/plugins/lspconfig.lua
+++ b/.config/nvim/lua/plugins/lspconfig.lua
@@ -2,7 +2,7 @@ return {
     'neovim/nvim-lspconfig',
     dependencies = {
         { 'williamboman/mason.nvim', opts = {} },
-        { 'folke/neodev.nvim', opts = {}},
+        { 'folke/lazydev.nvim', opts = {}},
         { 'j-hui/fidget.nvim', opts = {} },
     }
 }