nvim: move settings from lsp to lang/python

diff --git a/nvim/lua/plugins/lang/python.lua b/nvim/lua/plugins/lang/python.lua
index 537d0325a69a260600cdfec5abb7a353ecf400ab..aee447408359e0c64712599ec45084f3d911d635 100644 (file)
--- a/nvim/lua/plugins/lang/python.lua
+++ b/nvim/lua/plugins/lang/python.lua
@@ -14,6 +14,9 @@ return {
       servers = {
         pyright = {},
         ruff_lsp = {
       servers = {
         pyright = {},
         ruff_lsp = {

+          root_dir = function(fname)
+            return require("lspconfig.util").root_pattern("pyproject.toml", "setup.cfg", "ruff.toml")(fname)
+          end,

           keys = {
             {
               "<leader>co",
           keys = {
             {
               "<leader>co",


@@ -30,6 +33,20 @@ return {
             },
           },
         },
             },
           },
         },

+        pylsp = {
+          settings = {
+            pylsp = {
+              plugins = {
+                autopep8 = { enabled = false },
+                flake8 = { enabled = false },
+                mccabe = { enabled = false },
+                pycodestyle = { enabled = false },
+                pydocstyle = { enabled = false },
+                pyflakes = { enabled = false },  -- covered by flake8
+              }
+            }
+          }
+        }

       },
       setup = {
         ruff_lsp = function()
       },
       setup = {
         ruff_lsp = function()

diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index 3354f7d22a3f0005fa5a3e1b6d73cdf585794a46..509841c6a3d2b3c892f95a0a42b01b1843551b8d 100644 (file)
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -28,25 +28,6 @@ return {
         },
         -- Add clangd extensions
         -- https://github.com/p00f/clangd_extensions.nvim
         },
         -- Add clangd extensions
         -- https://github.com/p00f/clangd_extensions.nvim

-        ruff_lsp = {
-          root_dir = function(fname)
-            return require("lspconfig.util").root_pattern("pyproject.toml", "setup.cfg", "ruff.toml")(fname)
-          end,
-        },
-        pylsp = {
-          settings = {
-            pylsp = {
-              plugins = {
-                autopep8 = { enabled = false },
-                flake8 = { enabled = false },
-                mccabe = { enabled = false },
-                pycodestyle = { enabled = false },
-                pydocstyle = { enabled = false },
-                pyflakes = { enabled = false },  -- covered by flake8
-              }
-            }
-          }
-        }

       },
       -- you can do any additional lsp server setup here
       -- return true if you don't want this server to be setup with lspconfig
       },
       -- you can do any additional lsp server setup here
       -- return true if you don't want this server to be setup with lspconfig