From 831c814bb3af1d78f90ef1175b94622df2874f8d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 29 Aug 2024 11:19:30 -0500 Subject: [PATCH] plugins/git-worktree: use gitPackage --- plugins/git/git-worktree.nix | 7 ++++++- tests/test-sources/plugins/git/git-worktree.nix | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/plugins/git/git-worktree.nix b/plugins/git/git-worktree.nix index ec4c9b54..a43dd8c7 100644 --- a/plugins/git/git-worktree.nix +++ b/plugins/git/git-worktree.nix @@ -16,6 +16,11 @@ in package = helpers.mkPluginPackageOption "git-worktree" pkgs.vimPlugins.git-worktree-nvim; + gitPackage = helpers.mkPackageOption { + name = "git"; + default = pkgs.git; + }; + enableTelescope = mkEnableOption "telescope integration"; changeDirectoryCommand = helpers.defaultNullOpts.mkStr "cd" '' @@ -69,7 +74,7 @@ in plenary-nvim ]; - extraPackages = [ pkgs.git ]; + extraPackages = [ cfg.gitPackage ]; extraConfigLua = let diff --git a/tests/test-sources/plugins/git/git-worktree.nix b/tests/test-sources/plugins/git/git-worktree.nix index d9624a46..ec14c879 100644 --- a/tests/test-sources/plugins/git/git-worktree.nix +++ b/tests/test-sources/plugins/git/git-worktree.nix @@ -26,4 +26,11 @@ enableTelescope = false; }; }; + + no-packages = { + plugins.neogit = { + enable = true; + gitPackage = null; + }; + }; }