From 82b899ab6de60d40c80aec05837bf1568b17e50c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 29 Aug 2024 14:56:01 -0500
Subject: [PATCH] plugins/committia: use gitPackage

---
 plugins/git/committia.nix                    | 12 +++++++++++-
 tests/test-sources/plugins/git/committia.nix |  7 +++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/plugins/git/committia.nix b/plugins/git/committia.nix
index e73287c8..211d1609 100644
--- a/plugins/git/committia.nix
+++ b/plugins/git/committia.nix
@@ -9,7 +9,6 @@ helpers.vim-plugin.mkVimPlugin config {
   originalName = "committia.vim";
   defaultPackage = pkgs.vimPlugins.committia-vim;
   globalPrefix = "committia_";
-  extraPackages = [ pkgs.git ];
 
   maintainers = [ helpers.maintainers.alisonjenkins ];
 
@@ -47,4 +46,15 @@ helpers.vim-plugin.mkVimPlugin config {
       Minimum height of a status window.
     '';
   };
+
+  extraOptions = {
+    gitPackage = helpers.mkPackageOption {
+      name = "git";
+      default = pkgs.git;
+    };
+  };
+
+  extraConfig = cfg: {
+    extraPackages = [ cfg.gitPackage ];
+  };
 }
diff --git a/tests/test-sources/plugins/git/committia.nix b/tests/test-sources/plugins/git/committia.nix
index aecf8764..59f9eda8 100644
--- a/tests/test-sources/plugins/git/committia.nix
+++ b/tests/test-sources/plugins/git/committia.nix
@@ -19,4 +19,11 @@
       };
     };
   };
+
+  no-packages = {
+    plugins.committia = {
+      enable = true;
+      gitPackage = null;
+    };
+  };
 }