From 800bee29df672de8437ef16c00baa20798371328 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 7 Apr 2025 23:09:51 +0200 Subject: [PATCH] modules/dependencies: add lazygit --- modules/dependencies.nix | 1 + plugins/by-name/lazygit/default.nix | 19 ++++++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/modules/dependencies.nix b/modules/dependencies.nix index 9ca4e42d..6d4538bd 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -26,6 +26,7 @@ let example = [ "gitMinimal" ]; }; go.default = "go"; + lazygit.default = "lazygit"; lean.default = "lean4"; ledger.default = "ledger"; manix.default = "manix"; diff --git a/plugins/by-name/lazygit/default.nix b/plugins/by-name/lazygit/default.nix index 4c41ad5c..f100b244 100644 --- a/plugins/by-name/lazygit/default.nix +++ b/plugins/by-name/lazygit/default.nix @@ -1,6 +1,5 @@ { lib, - pkgs, ... }: let @@ -21,6 +20,10 @@ lib.nixvim.plugins.mkVimPlugin { plugin = "lazygit"; packageName = "git"; }) + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "lazygit"; + packageName = "lazygit"; + }) ]; settingsOptions = { @@ -78,17 +81,11 @@ lib.nixvim.plugins.mkVimPlugin { config_file_path = [ ]; }; - extraOptions = { - lazygitPackage = lib.mkPackageOption pkgs "lazygit" { - nullable = true; - }; - }; - extraConfig = cfg: { - dependencies.git.enable = lib.mkDefault true; + dependencies = { + git.enable = lib.mkDefault true; + lazygit.enable = lib.mkDefault true; + }; - extraPackages = [ - cfg.lazygitPackage - ]; }; }