Add shellharden and options for shfmt (null-ls)

1 files changed, 12 insertions, 4 deletions

diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 3574392..60d78c8 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -236,8 +236,18 @@ null_ls.setup {
     -- null_ls.builtins.diagnostics.cppcheck,
     -- null_ls.builtins.diagnostics.proselint,
     -- null_ls.builtins.diagnostics.pylint,
-    builtins.diagnostics.selene,
-    builtins.diagnostics.shellcheck,
+    --builtins.diagnostics.selene,
+    builtins.formatting.shfmt.with({
+      filetypes = { "bash", "zsh", "sh" },
+      extra_args = { "-i", "2", "-ci" },
+    }),
+    --builtins.diagnostics.shellcheck,
+    builtins.formatting.shellharden,
+    builtins.formatting.trim_whitespace.with { filetypes = { "tmux", "teal", "zsh" } },
+    builtins.formatting.clang_format,
+    builtins.formatting.rustfmt,
+    builtins.formatting.sql_formatter,
+
     builtins.diagnostics.teal,
     -- null_ls.builtins.diagnostics.vale,
     builtins.diagnostics.vint,
@@ -245,7 +255,6 @@ null_ls.setup {
     builtins.diagnostics.php,
     builtins.diagnostics.phpcs,
     -- null_ls.builtins.diagnostics.write_good.with { filetypes = { 'markdown', 'tex' } },
-    builtins.formatting.clang_format,
     -- null_ls.builtins.formatting.cmake_format,
     builtins.formatting.isort,
     builtins.formatting.htmlbeautifier,
@@ -257,7 +266,6 @@ null_ls.setup {
     }),
     --null_ls.builtins.formatting.prettierd,
     builtins.formatting.rustfmt,
-    builtins.formatting.shfmt,
     builtins.formatting.stylua,
     builtins.formatting.trim_whitespace,
     builtins.formatting.yapf,