From 102dc4cc7651790208bfd9cf11fc5153a0a19fed Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 9 May 2023 20:22:12 +0100 Subject: [PATCH 1/3] home: vim: null-ls: restrict POSIX to bare 'sh' --- home/vim/plugin/settings/null-ls.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/vim/plugin/settings/null-ls.lua b/home/vim/plugin/settings/null-ls.lua index 84466838..af6d629c 100644 --- a/home/vim/plugin/settings/null-ls.lua +++ b/home/vim/plugin/settings/null-ls.lua @@ -116,6 +116,8 @@ null_ls.register({ -- 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" }, + -- Restrict to POSIX sh + filetypes = { "sh" }, -- Only used if available condition = utils.is_executable_condition("shfmt"), }), From 8a78ce85203a7a1c325c06e372e00f857e9175f2 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 9 May 2023 20:22:29 +0100 Subject: [PATCH 2/3] home: vim: null-ls: add 'buildifier' configuration --- home/vim/plugin/settings/null-ls.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/home/vim/plugin/settings/null-ls.lua b/home/vim/plugin/settings/null-ls.lua index af6d629c..f3cb9cec 100644 --- a/home/vim/plugin/settings/null-ls.lua +++ b/home/vim/plugin/settings/null-ls.lua @@ -6,6 +6,18 @@ null_ls.setup({ on_attach = lsp.on_attach, }) +-- Bazel +null_ls.register({ + null_ls.builtins.diagnostics.buildifier.with({ + -- Only used if available + condition = utils.is_executable_condition("buildifier"), + }), + null_ls.builtins.formatting.buildifier.with({ + -- Only used if available + condition = utils.is_executable_condition("buildifier"), + }), +}) + -- C, C++ null_ls.register({ null_ls.builtins.formatting.clang_format.with({ From 01059616bf876db7a8f25900a1032386047eb04b Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 9 May 2023 20:24:49 +0100 Subject: [PATCH 3/3] home: vim: don't use 'nixpkgs-fmt' with 'nil' --- home/vim/plugin/settings/null-ls.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/vim/plugin/settings/null-ls.lua b/home/vim/plugin/settings/null-ls.lua index f3cb9cec..0eaa55cc 100644 --- a/home/vim/plugin/settings/null-ls.lua +++ b/home/vim/plugin/settings/null-ls.lua @@ -41,7 +41,9 @@ null_ls.register({ null_ls.builtins.formatting.nixpkgs_fmt.with({ -- Only used if available, but prefer rnix if available condition = function() - return utils.is_executable("nixpkgs-fmt") and not utils.is_executable("rnix-lsp") + return utils.is_executable("nixpkgs-fmt") + and not utils.is_executable("rnix-lsp") + and not utils.is_executable("nil") end, }), })