fnl/plugin.fnl

@@ -189,7 +189,27 @@
   (use! :jose-elias-alvarez/null-ls.nvim
         :after :nvim-lspconfig
         :config
-        (module-call! :plugin.lsp :setup-null-ls))
+        (let [builtins (. (require :null-ls) :builtins)]
+          (setup! :null-ls
+                  :sources [
+                    builtins.formatting.astyle
+                    builtins.formatting.prettier
+                    builtins.formatting.yapf
+                    builtins.formatting.fnlfmt
+                    builtins.formatting.shfmt
+                    builtins.formatting.cmake_format
+                    builtins.formatting.latexindent
+                    builtins.formatting.stylua
+                    builtins.code_actions.shellcheck
+                    (builtins.completion.spell.with { :filetypes [ :text
+                                                                   :markdown
+                                                                   :tex ]})
+                    builtins.diagnostics.cmake_lint
+                    builtins.diagnostics.codespell
+                    builtins.diagnostics.shellcheck
+                    (builtins.diagnostics.glslc.with
+                      { :extra_args [ "--target-env=opengl" ]})
+                  ])))
 
   (use! :j-hui/fidget.nvim
         :after :nvim-lspconfig

fnl/plugin/lsp.fnl

@@ -1,6 +1,6 @@
 ;;; lsp.fnl - lsp configurations
 
-(import-macros {: bind! : setup!} :macros)
+(import-macros {: bind!} :macros)
 
 (fn on-attach [client buf]
   ((. (. (require :cmp) :setup) :buffer) {
@@ -109,26 +109,4 @@
                          :diagnostics {
                            :globals [ "vim" ] }}})))
 
-(fn setup-null-ls []
-  (let [builtins (. (require :null-ls) :builtins)]
-    (setup! :null-ls
-            :sources [
-                      builtins.formatting.astyle
-                      builtins.formatting.prettier
-                      builtins.formatting.yapf
-                      builtins.formatting.fnlfmt
-                      builtins.formatting.shfmt
-                      builtins.formatting.cmake_format
-                      builtins.formatting.latexindent
-                      builtins.formatting.stylua
-                      builtins.code_actions.shellcheck
-                      (builtins.completion.spell.with { :filetypes [ :text
-                                                                     :markdown
-                                                                     :tex ]})
-                      builtins.diagnostics.cmake_lint
-                      builtins.diagnostics.codespell
-                      builtins.diagnostics.shellcheck
-                      (builtins.diagnostics.glslc.with
-                        { :extra_args [ "--target-env=opengl" ]})])))
-
-{ : configure : on-attach : get-data-dir : setup-null-ls }
+{ : configure : on-attach : get-data-dir }

init.fnl

@@ -81,7 +81,7 @@
                                     "Enabled Spellcheck"
                                     "Disabled Spellcheck")))))
 
-;; Enable spell in certain buffers
+;; Enable spell in certian buffers
 (hook! :FileType [ :text :markdown :tex :bib ]
        #(if (= (vim.fn.buflisted (vim.api.nvim_get_current_buf)) 1)
           (set vim.opt_local.spell true)))