diff --git a/plugins/by-name/gitgutter/default.nix b/plugins/by-name/gitgutter/default.nix index 425bf7a6..55d227fc 100644 --- a/plugins/by-name/gitgutter/default.nix +++ b/plugins/by-name/gitgutter/default.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: +{ lib, ... }: lib.nixvim.plugins.mkVimPlugin { name = "gitgutter"; package = "vim-gitgutter"; @@ -11,7 +7,17 @@ lib.nixvim.plugins.mkVimPlugin { maintainers = [ lib.maintainers.GaetanLepage ]; - dependencies = [ "git" ]; + dependencies = [ + "git" + "grep" + ]; + + imports = [ + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "gitgutter"; + packageName = "grep"; + }) + ]; extraOptions = { recommendedSettings = lib.mkOption { @@ -21,10 +27,6 @@ lib.nixvim.plugins.mkVimPlugin { Set recommended neovim option. ''; }; - - grepPackage = lib.mkPackageOption pkgs "gnugrep" { - nullable = true; - }; }; extraConfig = cfg: { @@ -32,10 +34,6 @@ lib.nixvim.plugins.mkVimPlugin { updatetime = 100; foldtext = "gitgutter#fold#foldtext"; }; - - extraPackages = [ - cfg.grepPackage - ]; }; settingsExample = { diff --git a/tests/test-sources/plugins/by-name/gitgutter/default.nix b/tests/test-sources/plugins/by-name/gitgutter/default.nix index 7c3ac282..cea12ffa 100644 --- a/tests/test-sources/plugins/by-name/gitgutter/default.nix +++ b/tests/test-sources/plugins/by-name/gitgutter/default.nix @@ -68,7 +68,6 @@ { plugins.gitgutter = { enable = true; - grepPackage = pkgs.gnugrep; }; assertions = [ { @@ -84,14 +83,16 @@ { plugins.gitgutter = { enable = true; - grepPackage = null; settings = { git_executable = lib.getExe pkgs.git; grep = lib.getExe pkgs.gnugrep; }; }; - dependencies.git.enable = false; + dependencies = { + git.enable = false; + grep.enable = false; + }; assertions = [ {