development: additional tools

1 files changed, 21 insertions, 11 deletions

diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua
index e1c38db..c8bcba7 100644
--- a/dotfiles/vim/lua/vim-dev.lua
+++ b/dotfiles/vim/lua/vim-dev.lua
@@ -31,7 +31,7 @@ local function on_attach(client, bufnr)
         -- Capability specific
 
         if client.server_capabilities.documentFormattingProvider then
-                vim.keymap.set("n", "<leader>sf", vim.lsp.buf.formatting, desc(opts, "Format buffer"))
+                vim.keymap.set("n", "<leader>sf", vim.lsp.buf.format, desc(opts, "Format buffer"))
         end
 
         -- Rust specific
@@ -75,21 +75,31 @@ require("refactoring").setup {}
 
 -- Null LSP
 
-require("null-ls").setup({
+local null_ls = require("null-ls")
+
+null_ls.setup({
         sources = {
-                require("null-ls").builtins.code_actions.gitrebase,
-                require("null-ls").builtins.code_actions.gitsigns,
-                require("null-ls").builtins.code_actions.refactoring.with {
+                null_ls.builtins.code_actions.gitrebase,
+                null_ls.builtins.code_actions.gitsigns,
+                null_ls.builtins.code_actions.refactoring.with {
                         filetypes = { "typescript", "javascript", "lua", "c", "cpp", "go", "python", "java", "php", "ruby" },
                 },
-                require("null-ls").builtins.code_actions.shellcheck,
-                require("null-ls").builtins.code_actions.statix,
-                require("null-ls").builtins.diagnostics.deadnix,
-                require("null-ls").builtins.diagnostics.shellcheck,
-                require("null-ls").builtins.diagnostics.statix,
-                require("null-ls").builtins.diagnostics.vale.with {
+                null_ls.builtins.code_actions.shellcheck,
+                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 {
                         filetypes = { "markdown", "pandoc", "tex", "asciidoc" },
                 },
+
+                null_ls.builtins.formatting.alejandra,
+                null_ls.builtins.formatting.black,
+                null_ls.builtins.formatting.isort,
+                null_ls.builtins.formatting.shfmt,
+                null_ls.builtins.formatting.taplo,
         },
         on_attach = on_attach,
 })