use ruff, eliminate null-ls for python

emattiza · Nov 17, 2023 · 478ee6c · 478ee6c
1 parent 27d04a8
commit 478ee6c
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/modules/lsp/lsp.nix b/modules/lsp/lsp.nix
@@ -184,12 +184,6 @@ in {
                 command = "${pkgs.shellcheck}/bin/shellcheck",
               }),
             ''}
-            ${writeIf cfg.python
-            ''
-              null_ls.builtins.formatting.black.with({
-                command = "${pkgs.black}/bin/black",
-              }),
-            ''}
             -- Commented out for now
             --${writeIf (config.vim.git.enable && config.vim.git.gitsigns.enable) ''
             --  null_ls.builtins.code_actions.gitsigns,
@@ -364,6 +358,15 @@ in {
               on_attach= default_nofmt_on_attach;
               cmd = {"${pkgs.nodePackages.pyright}/bin/pyright-langserver", "--stdio"}
             }
+            -- Ruff config
+            lspconfig.ruff_lsp.setup {
+              capabilities = capabilities;
+              on_attach = function(client, bufnr)
+                attach_keymaps(client, bufnr)
+                simple_format_callback(client, bufnr)
+              end;
+              cmd = {"${pkgs.python3Packages.ruff-lsp}/bin/ruff-lsp"}
+            }
           ''}
 
           ${writeIf cfg.nix ''