2 files changed, 12 insertions, 32 deletions

diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua
index 2b91d8c..98db662 100644
--- a/dotfiles/vim/lua/vim-dev.lua
+++ b/dotfiles/vim/lua/vim-dev.lua
@@ -44,7 +44,6 @@ null_ls.setup({
                 null_ls.builtins.code_actions.statix,
 
                 null_ls.builtins.diagnostics.deadnix,
-                null_ls.builtins.diagnostics.ruff,
                 null_ls.builtins.diagnostics.shellcheck,
                 null_ls.builtins.diagnostics.statix,
                 null_ls.builtins.diagnostics.vale.with {
@@ -52,8 +51,6 @@ null_ls.setup({
                 },
 
                 null_ls.builtins.formatting.alejandra,
-                null_ls.builtins.formatting.black,
-                null_ls.builtins.formatting.ruff,
                 null_ls.builtins.formatting.shfmt,
                 null_ls.builtins.formatting.taplo,
         },
@@ -66,4 +63,3 @@ vim.g["pandoc#formatting#extra_equalprg"] = "--reference-links --reference-locat
 
 -- Actions preview
 require("actions-preview").setup()
-
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index a347df8..28cb7f2 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -17,12 +17,13 @@ inputs: {
     vimPlugins
     ;
 
-  pylsp = with pkgs.unstable.python3Packages;
-    python-lsp-server.overrideAttrs (old: {
-      propagatedBuildInputs =
-        old.propagatedBuildInputs
-        ++ python-lsp-server.passthru.optional-dependencies.all;
-    });
+  pylsp-env = pkgs.unstable.python3.withPackages (p:
+    with p; [
+      python-lsp-server
+      python-lsp-server.passthru.optional-dependencies.rope
+      python-lsp-ruff
+      pylsp-rope
+    ]);
 
   luaFormat = inputs.self.lib.generators.lua {};
 in {
@@ -82,15 +83,7 @@ in {
       taplo
 
       # Python
-      black
-      python3Packages.isort
-      python3Packages.mypy
       python3Packages.tox
-      # TODO: how to install into pylsp's python env?
-      # python-lsp-black
-      # pyls-isort
-      # pylsp-mypy
-
       ruff
 
       neovide
@@ -131,20 +124,11 @@ in {
           };
         };
         marksman.cmd = ["${marksman}/bin/marksman"];
+        # TODO: replace with nixd?
         nil_ls.cmd = ["${nil}/bin/nil"];
         pylsp = {
-          cmd = ["${pylsp}/bin/pylsp"];
-          settings.pylsp.plugins = {
-            autopep8.enabled = false;
-            flake8.ignore = ["E501"];
-            pycodestyle.ignore = ["E501"];
-            yapf.enabled = false;
-
-            # See TODO above
-            #black.enabled = true;
-            #isort.enabled = true;
-            #mypy.enabled = true;
-          };
+          cmd = ["${pylsp-env}/bin/pylsp"];
+          settings.pylsp.plugins.ruff.enabled = true;
         };
       };
 
@@ -218,9 +202,9 @@ in {
         RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
         CARGO_HOME = "${config.xdg.dataHome}/cargo";
 
-        RUFF_CACHE_DIR= "${config.xdg.cacheHome}/ruff";
+        RUFF_CACHE_DIR = "${config.xdg.cacheHome}/ruff";
 
-        PYTHONPYCACHEPREFIX= "${config.xdg.cacheHome}/python";
+        PYTHONPYCACHEPREFIX = "${config.xdg.cacheHome}/python";
         PYTHONUSERBASE = "${config.xdg.dataHome}/python";
 
         _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";