From 82c328e6cd15f80c3641d59a4dd552ee21c5cb90 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 21 May 2023 17:19:38 +0200
Subject: [PATCH] plugins/null-ls: fix gitsigns, add test for sources

---
 plugins/null-ls/servers.nix            |  4 +++-
 tests/test-sources/plugins/null-ls.nix | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/plugins/null-ls/servers.nix b/plugins/null-ls/servers.nix
index 99836f63..df41038e 100644
--- a/plugins/null-ls/servers.nix
+++ b/plugins/null-ls/servers.nix
@@ -82,8 +82,10 @@ in {
 
   config = let
     cfg = config.plugins.null-ls;
+    gitsignsEnabled = cfg.sources.code_actions.gitsigns.enable;
   in
     lib.mkIf cfg.enable {
-      plugins.gitsigns.enable = lib.mkIf (cfg.sources.code_actions.gitsigns.enable) true;
+      plugins.gitsigns.enable = lib.mkIf gitsignsEnabled true;
+      extraPackages = lib.optional gitsignsEnabled pkgs.git;
     };
 }
diff --git a/tests/test-sources/plugins/null-ls.nix b/tests/test-sources/plugins/null-ls.nix
index cb38a2bd..0c5efb3c 100644
--- a/tests/test-sources/plugins/null-ls.nix
+++ b/tests/test-sources/plugins/null-ls.nix
@@ -34,6 +34,31 @@
       shouldAttach = null;
       tempDir = null;
       updateInInsert = false;
+      sources = {
+        code_actions = {
+          gitsigns.enable = true;
+          shellcheck.enable = true;
+        };
+        diagnostics = {
+          cppcheck.enable = true;
+          flake8.enable = true;
+          gitlint.enable = true;
+          shellcheck.enable = true;
+        };
+        formatting = {
+          alejandra.enable = true;
+          black.enable = true;
+          cbfmt.enable = true;
+          fnlfmt.enable = true;
+          fourmolu.enable = true;
+          nixfmt.enable = true;
+          phpcbf.enable = true;
+          prettier.enable = true;
+          shfmt.enable = true;
+          stylua.enable = true;
+          taplo.enable = true;
+        };
+      };
     };
   };
 }