home: vim: do not use 'ftplugin' for 'null-ls'

Unfortunately, this registers the sources many times...

I fear that I will have to settle for a centralised configuration for
LSP-related options.

home/vim/after/ftplugin/bash.vim

@@ -1,26 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Set-up LSP, linters, formatters
-lua << EOF
-local null_ls = require("null-ls")
-local utils = require("ambroisie.utils")
-
-null_ls.register({
-    null_ls.builtins.diagnostics.shellcheck.with({
-        -- Show error code in message
-        diagnostics_format = "[#{c}] #{m}",
-        -- Require explicit empty string test, use bash dialect
-        extra_args = { "-s", "bash", "-o", "avoid-nullary-conditions" },
-        -- Only used if available
-        condition = utils.is_executable_condition("shellcheck"),
-    }),
-    null_ls.builtins.formatting.shfmt.with({
-        -- Indent with 4 spaces, simplify the code, indent switch cases,
-        -- add space after redirection, use bash dialect
-        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "bash" },
-        -- Only used if available
-        condition = utils.is_executable_condition("shfmt"),
-    }),
-})
-EOF

home/vim/after/ftplugin/c.vim

@@ -1,10 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Set-up LSP, linters, formatters
-lua << EOF
-local null_ls = require("null-ls")
-null_ls.register({
-    null_ls.builtins.formatting.clang_format,
-})
-EOF

home/vim/after/ftplugin/cpp.vim

@@ -1,10 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Set-up LSP, linters, formatters
-lua << EOF
-local null_ls = require("null-ls")
-null_ls.register({
-    null_ls.builtins.formatting.clang_format,
-})
-EOF

home/vim/after/ftplugin/haskell.vim

@@ -1,19 +1,6 @@
 " Create the `b:undo_ftplugin` variable if it doesn't exist
 call ftplugined#check_undo_ft()
 
-" Set-up LSP, linters, formatters
-lua << EOF
-local null_ls = require("null-ls")
-local utils = require("ambroisie.utils")
-
-null_ls.register({
-    null_ls.builtins.formatting.brittany.with({
-        -- Only used if available
-        condition = utils.is_executable_condition("brittany"),
-    }),
-})
-EOF
-
 " Use a small indentation value on Haskell files
 setlocal shiftwidth=2
 let b:undo_ftplugin.='|setlocal shiftwidth<'

home/vim/after/ftplugin/nix.vim

@@ -1,15 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Set-up LSP, linters, formatters
-lua << EOF
-local null_ls = require("null-ls")
-local utils = require("ambroisie.utils")
-
-null_ls.register({
-    null_ls.builtins.formatting.nixpkgs_fmt.with({
-        -- Only used if available
-        condition = utils.is_executable_condition("nixpkgs-fmt"),
-    }),
-})
-EOF

home/vim/after/ftplugin/python.vim

@@ -1,36 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Set-up LSP, linters, formatters
-lua << EOF
-local null_ls = require("null-ls")
-local utils = require("ambroisie.utils")
-
-null_ls.register({
-    null_ls.builtins.diagnostics.flake8.with({
-        -- Only used if available
-        condition = utils.is_executable_condition("flake8"),
-    }),
-    null_ls.builtins.diagnostics.mypy.with({
-        -- Only used if available
-        condition = utils.is_executable_condition("mypy"),
-    }),
-    null_ls.builtins.diagnostics.pylint.with({
-        -- Only used if available
-        condition = utils.is_executable_condition("pylint"),
-    })
-    null_ls.builtins.formatting.black.with({
-        extra_args = { "--fast" },
-        -- Only used if available
-        condition = utils.is_executable_condition("black"),
-    }),
-    null_ls.builtins.formatting.isort.with({
-        -- Only used if available
-        condition = utils.is_executable_condition("isort"),
-    }),
-})
-EOF
-
-" Change max length of a line to 88 for this buffer to match black's settings
-setlocal colorcolumn=88
-let b:undo_ftplugin.='|setlocal colorcolumn<'

home/vim/after/ftplugin/sh.vim

@@ -1,26 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Set-up LSP, linters, formatters
-lua << EOF
-local null_ls = require("null-ls")
-local utils = require("ambroisie.utils")
-
-null_ls.register({
-    null_ls.builtins.diagnostics.shellcheck.with({
-        -- Show error code in message
-        diagnostics_format = "[#{c}] #{m}",
-        -- Require explicit empty string test
-        extra_args = { "-o", "avoid-nullary-conditions" },
-        -- Only used if available
-        condition = utils.is_executable_condition("shellcheck"),
-    }),
-    null_ls.builtins.formatting.shfmt.with({
-        -- Indent with 4 spaces, simplify the code, indent switch cases,
-        -- add space after redirection, use POSIX
-        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "posix" },
-        -- Only used if available
-        condition = utils.is_executable_condition("shfmt"),
-    }),
-})
-EOF

home/vim/after/ftplugin/zsh.vim

@@ -1,26 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Set-up LSP, linters, formatters
-lua << EOF
-local null_ls = require("null-ls")
-local utils = require("ambroisie.utils")
-
-null_ls.register({
-    null_ls.builtins.diagnostics.shellcheck.with({
-        -- Show error code in message
-        diagnostics_format = "[#{c}] #{m}",
-        -- Require explicit empty string test, use bash dialect
-        extra_args = { "-s", "bash", "-o", "avoid-nullary-conditions" },
-        -- Only used if available
-        condition = utils.is_executable_condition("shellcheck"),
-    }),
-    null_ls.builtins.formatting.shfmt.with({
-        -- Indent with 4 spaces, simplify the code, indent switch cases,
-        -- add space after redirection, use bash dialect
-        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "bash" },
-        -- Only used if available
-        condition = utils.is_executable_condition("shfmt"),
-    }),
-})
-EOF

home/vim/plugin/settings/null-ls.vim

@@ -1,5 +1,7 @@
 lua << EOF
 local null_ls = require("null-ls")
+local utils = require("ambroisie.utils")
+
 null_ls.setup({
     on_attach = function(client)
         -- Format on save
@@ -13,4 +15,98 @@ null_ls.setup({
         end
     end,
 })
+
+-- C, C++
+null_ls.register({
+    null_ls.builtins.formatting.clang_format.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("clang-format"),
+    }),
+})
+
+-- Haskell
+null_ls.register({
+    null_ls.builtins.formatting.brittany.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("brittany"),
+    }),
+})
+
+-- Nix
+null_ls.register({
+    null_ls.builtins.formatting.nixpkgs_fmt.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("nixpkgs-fmt"),
+    }),
+})
+
+-- Python
+null_ls.register({
+    null_ls.builtins.diagnostics.flake8.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("flake8"),
+    }),
+    null_ls.builtins.diagnostics.mypy.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("mypy"),
+    }),
+    null_ls.builtins.diagnostics.pylint.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("pylint"),
+    }),
+    null_ls.builtins.formatting.black.with({
+        extra_args = { "--fast" },
+        -- Only used if available
+        condition = utils.is_executable_condition("black"),
+    }),
+    null_ls.builtins.formatting.isort.with({
+        -- Only used if available
+        condition = utils.is_executable_condition("isort"),
+    }),
+})
+
+
+-- Shell (non-POSIX)
+null_ls.register({
+    null_ls.builtins.diagnostics.shellcheck.with({
+        -- Show error code in message
+        diagnostics_format = "[#{c}] #{m}",
+        -- Require explicit empty string test, use bash dialect
+        extra_args = { "-s", "bash", "-o", "avoid-nullary-conditions" },
+        -- Restrict to bash and zsh
+        filetypes = { "bash", "zsh" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shellcheck"),
+    }),
+    null_ls.builtins.formatting.shfmt.with({
+        -- Indent with 4 spaces, simplify the code, indent switch cases,
+        -- add space after redirection, use bash dialect
+        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "bash" },
+        -- Restrict to bash and zsh
+        filetypes = { "bash", "zsh" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shfmt"),
+    }),
+})
+
+-- Shell (POSIX)
+null_ls.register({
+    null_ls.builtins.diagnostics.shellcheck.with({
+        -- Show error code in message
+        diagnostics_format = "[#{c}] #{m}",
+        -- Require explicit empty string test
+        extra_args = { "-o", "avoid-nullary-conditions" },
+        -- Restrict to POSIX sh
+        filetypes = { "sh" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shellcheck"),
+    }),
+    null_ls.builtins.formatting.shfmt.with({
+        -- Indent with 4 spaces, simplify the code, indent switch cases,
+        -- add space after redirection, use POSIX
+        extra_args = { "-i", "4", "-s", "-ci", "-sr", "-ln", "posix" },
+        -- Only used if available
+        condition = utils.is_executable_condition("shfmt"),
+    }),
+})
 EOF