Merge 55cdd6db48 into eb037b7bff

docs/release-notes/rl-0.7.md

@@ -95,6 +95,7 @@ configuration formats.
   plugin's options can now be found under `indentBlankline.setupOpts`, the
   previous iteration of the module also included out of place/broken options,
   which have been removed for the time being. These are:
+
   - `listChar` - this was already unused
   - `fillChar` - this had nothing to do with the plugin, please configure it
     yourself by adding `vim.opt.listchars:append({ space = '<char>' })` to your
@@ -156,7 +157,6 @@ configuration formats.
 - Add `vim.ui.breadcrumbs.lualine` to allow fine-tuning breadcrumbs behaviour on
   Lualine. Only `vim.ui.breadcrumbs.lualine.winbar` is supported for the time
   being.
-
   - [](#opt-vim.ui.breadcrumbs.lualine.winbar.enable) has been added to allow
     controlling the default behaviour of the `nvim-navic` component on Lualine,
     which used to occupy `winbar.lualine_c` as long as breadcrumbs are enabled.
@@ -164,12 +164,6 @@ configuration formats.
     [](#opt-vim.ui.breadcrumbs.lualine.winbar.alwaysRender) to be conform to the
     new format.
 
-- Add [basedpyright](https://github.com/detachhead/basedpyright) as a Python LSP
-  server and make it default.
-
-- Add [python-lsp-server](https://github.com/python-lsp/python-lsp-server) as an
-  additional Python LSP server.
-
 [ppenguin](https://github.com/ppenguin):
 
 - Telescope:

modules/plugins/languages/python.nix

@@ -14,7 +14,7 @@
 
   cfg = config.vim.languages.python;
 
-  defaultServer = "basedpyright";
+  defaultServer = "pyright";
   servers = {
     pyright = {
       package = pkgs.pyright;
@@ -30,36 +30,6 @@
         }
       '';
     };
-
-    basedpyright = {
-      package = pkgs.basedpyright;
-      lspConfig = ''
-        lspconfig.basedpyright.setup{
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/basedpyright-langserver", "--stdio"}''
-        }
-        }
-      '';
-    };
-
-    python-lsp-server = {
-      package = pkgs.python-lsp-server;
-      lspConfig = ''
-        lspconfig.pylsp.setup{
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/pylsp"}''
-        }
-        }
-      '';
-    };
   };
 
   defaultFormat = "black";
@@ -91,12 +61,11 @@
     black-and-isort = {
       package = pkgs.writeShellApplication {
         name = "black";
-        runtimeInputs = [pkgs.black pkgs.isort];
         text = ''
           black --quiet - "$@" | isort --profile black -
         '';
+        runtimeInputs = [pkgs.black pkgs.isort];
       };
-
       nullConfig = ''
         table.insert(
           ls_sources,