vim: move null-ls config to default config

2 files changed, 31 insertions, 28 deletions

diff --git a/dotfiles/vim/lua/myConfig.lua b/dotfiles/vim/lua/myConfig.lua
index 92073b4..fd4fe0b 100644
--- a/dotfiles/vim/lua/myConfig.lua
+++ b/dotfiles/vim/lua/myConfig.lua
@@ -510,6 +510,37 @@ vim.api.nvim_create_user_command("Browse", function(opts)
         }):start()
 end, { nargs = 1 })
 
+-- Null LSP
+
+local on_attach = require('myConfig.exports').on_attach
+
+local null_ls = require("null-ls")
+
+null_ls.setup({
+        sources = {
+                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" },
+                },
+                null_ls.builtins.code_actions.shellcheck,
+                null_ls.builtins.code_actions.statix,
+
+                null_ls.builtins.diagnostics.deadnix,
+                null_ls.builtins.diagnostics.shellcheck,
+                null_ls.builtins.diagnostics.statix,
+                null_ls.builtins.diagnostics.typos,
+                null_ls.builtins.diagnostics.vale.with {
+                        filetypes = { "markdown", "pandoc", "rst", "tex", "asciidoc" },
+                },
+
+                null_ls.builtins.formatting.alejandra,
+                null_ls.builtins.formatting.shfmt,
+                null_ls.builtins.formatting.taplo,
+        },
+        on_attach = on_attach,
+})
+
 -- Local config
 
 local function isModuleAvailable(name)
diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua
index 98db662..bae20d2 100644
--- a/dotfiles/vim/lua/vim-dev.lua
+++ b/dotfiles/vim/lua/vim-dev.lua
@@ -29,34 +29,6 @@ require("neodev").setup({})
 -- Refactoring
 require("refactoring").setup {}
 
--- Null LSP
-
-local null_ls = require("null-ls")
-
-null_ls.setup({
-        sources = {
-                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" },
-                },
-                null_ls.builtins.code_actions.shellcheck,
-                null_ls.builtins.code_actions.statix,
-
-                null_ls.builtins.diagnostics.deadnix,
-                null_ls.builtins.diagnostics.shellcheck,
-                null_ls.builtins.diagnostics.statix,
-                null_ls.builtins.diagnostics.vale.with {
-                        filetypes = { "markdown", "pandoc", "rst", "tex", "asciidoc" },
-                },
-
-                null_ls.builtins.formatting.alejandra,
-                null_ls.builtins.formatting.shfmt,
-                null_ls.builtins.formatting.taplo,
-        },
-        on_attach = on_attach,
-})
-
 -- Vim Pandoc
 vim.g["pandoc#formatting#equalprg"] = "pandoc -t markdown --wrap=preserve"
 vim.g["pandoc#formatting#extra_equalprg"] = "--reference-links --reference-location=section"