diff options
| -rw-r--r-- | fnl/config/lsp/init.fnl | 2 | ||||
| -rw-r--r-- | fnl/config/lsp/mason-null-ls.fnl | 26 | ||||
| -rw-r--r-- | fnl/config/lsp/mason-null-lsp.fnl | 17 | ||||
| -rw-r--r-- | fnl/config/lsp/null-ls.fnl | 6 |
4 files changed, 32 insertions, 19 deletions
diff --git a/fnl/config/lsp/init.fnl b/fnl/config/lsp/init.fnl index 68d6e1d..378473e 100644 --- a/fnl/config/lsp/init.fnl +++ b/fnl/config/lsp/init.fnl @@ -3,8 +3,8 @@ (require :config.lsp.mason) (require :config.lsp.mason-lspconfig) -(require :config.lsp.mason-null-lsp) (let [handlers (require :config.lsp.handlers)] (handlers.setup)) (require :config.lsp.null-ls) +(require :config.lsp.mason-null-ls) diff --git a/fnl/config/lsp/mason-null-ls.fnl b/fnl/config/lsp/mason-null-ls.fnl new file mode 100644 index 0000000..42b3715 --- /dev/null +++ b/fnl/config/lsp/mason-null-ls.fnl @@ -0,0 +1,26 @@ +;; Ensure that tools needed for null-ls are installed. +(module config.mason-null-ls {autoload {: util}}) + +(def- opts {:ensure_installed [:flake8 + :golangci-lint + :cpplint + :gitlint + :jsonlint + :yamllint + :black + :fnlfmt + :fourmolu + :gofmt + :goimports + :prettier + :rustfmt + :stylua + :shellcheck + :sqlfluff + :hadolint + :terraform-fmt + :shfmt] + :auto_update true + :automatic_installation true}) + +(util.use-config :mason-null-ls opts) diff --git a/fnl/config/lsp/mason-null-lsp.fnl b/fnl/config/lsp/mason-null-lsp.fnl deleted file mode 100644 index e35f0d7..0000000 --- a/fnl/config/lsp/mason-null-lsp.fnl +++ /dev/null @@ -1,17 +0,0 @@ -;; Ensure that tools needed for null-ls are installed. -(module config.mason-null-ls {autoload {: util}}) - -(def- opts {:ensure_installed {:flake8 :golangci-lint - :jsonlint :yamllint - :black :fnlfmt - :fourmolu :gofmt - :goimports :prettier - :rustfmt :stylua - :shellcheck :sqlformat - :terraform-fmt :shfmt} - :auto_update true - :automatic_installation true}) - -(util.use-config :mason-null-ls opts) -(let [mason-null-ls (require :mason-null-ls)] - (mason-null-ls.check_install true)) diff --git a/fnl/config/lsp/null-ls.fnl b/fnl/config/lsp/null-ls.fnl index 1d013db..9ad1fed 100644 --- a/fnl/config/lsp/null-ls.fnl +++ b/fnl/config/lsp/null-ls.fnl @@ -9,6 +9,10 @@ diagnostics.golangci_lint diagnostics.jsonlint diagnostics.shellcheck + diagnostics.sqlfluff + diagnostics.gitlint + diagnostics.hadolint + diagnostics.cpplint diagnostics.yamllint (formatting.black.with {:extra_args [:--fast]}) formatting.fnlfmt @@ -20,6 +24,6 @@ :--jsx-single-quote]}) formatting.rustfmt formatting.shfmt - formatting.sqlformat + formatting.sqlfluff formatting.stylua formatting.terraform_fmt]}))) |