Replace null(none)-ls with conform and nvim-lint

3 files changed, 1 insertions, 50 deletions

diff --git a/fnl/plugins/lsp/init.fnl b/fnl/plugins/lsp/init.fnl
index bef4141..f04ba86 100644
--- a/fnl/plugins/lsp/init.fnl
+++ b/fnl/plugins/lsp/init.fnl
@@ -1,5 +1,3 @@
 ;; Lsp plugins.
 
-[(require :plugins.lsp.lspconfig)
- (require :plugins.lsp.mason)
- (require :plugins.lsp.null-ls)]
+[(require :plugins.lsp.lspconfig) (require :plugins.lsp.mason)]
diff --git a/fnl/plugins/lsp/keymaps.fnl b/fnl/plugins/lsp/keymaps.fnl
index 6a3544a..d87b32c 100644
--- a/fnl/plugins/lsp/keymaps.fnl
+++ b/fnl/plugins/lsp/keymaps.fnl
@@ -20,10 +20,6 @@
          :<leader>a
          "<cmd>lua vim.lsp.buf.code_action()<cr>"
          {:desc "Code Action"}]
-        [:n
-         :<leader>e
-         "<cmd>lua vim.lsp.buf.format { async = true }<cr>"
-         {:desc :Format}]
         [:v
          :<leader>e
          "<cmd>lua vim.lsp.buf.format { async = true }<cr>"
diff --git a/fnl/plugins/lsp/null-ls.fnl b/fnl/plugins/lsp/null-ls.fnl
deleted file mode 100644
index ff98aee..0000000
--- a/fnl/plugins/lsp/null-ls.fnl
+++ /dev/null
@@ -1,43 +0,0 @@
-;; Adds LSP diagnostics and formatting.
-
-(local mason-opts {:ensure_installed nil
-                   :automatic_installation true
-                   :automatic_setup false})
-
-(fn config []
-  (let [null-ls (require :null-ls)
-        mason-null-ls (require :mason-null-ls)]
-    (let [formatting null-ls.builtins.formatting
-          diagnostics null-ls.builtins.diagnostics]
-      (null-ls.setup {:debug false
-                      :sources [diagnostics.codespell
-                                diagnostics.cpplint
-                                diagnostics.gitlint
-                                diagnostics.hadolint
-                                diagnostics.jsonlint
-                                diagnostics.misspell
-                                diagnostics.ruff
-                                diagnostics.selene
-                                diagnostics.shellcheck
-                                diagnostics.sqlfluff
-                                diagnostics.write_good
-                                diagnostics.yamllint
-                                formatting.fnlfmt
-                                formatting.markdownlint
-                                formatting.ocamlformat
-                                formatting.prettierd
-                                formatting.ruff
-                                formatting.rustfmt
-                                formatting.shellharden
-                                formatting.shfmt
-                                formatting.sqlfluff
-                                formatting.stylua
-                                formatting.terraform_fmt]}))
-    (mason-null-ls.setup mason-opts)))
-
-{1 :nvimtools/none-ls.nvim
- :dependencies [:mason.nvim
-                :jayp0521/mason-null-ls.nvim
-                :nvim-lua/plenary.nvim]
- :event :BufReadPost
- : config}