diff --git a/modules/home/profiles/git/default.nix b/modules/home/profiles/git/default.nix index 37c39564..e0273820 100644 --- a/modules/home/profiles/git/default.nix +++ b/modules/home/profiles/git/default.nix @@ -93,8 +93,6 @@ in }; } - (mkIf cfg.imerge.enable { home.packages = [ pkgs.git-imerge ]; }) - (mkIf cfg.github.enable { programs = { gh.enable = true; @@ -111,5 +109,12 @@ in }; }; }) + + { + home.packages = mkMerge [ + (mkIf cfg.absorb.enable [ pkgs.git-absorb ]) + (mkIf cfg.imerge.enable [ pkgs.git-imerge ]) + ]; + } ]); } diff --git a/modules/home/profiles/git/interface.nix b/modules/home/profiles/git/interface.nix index 2f6879b9..623be512 100644 --- a/modules/home/profiles/git/interface.nix +++ b/modules/home/profiles/git/interface.nix @@ -11,6 +11,7 @@ in default = true; }; + absorb.enable = mkEnableOption "install git-absorb package"; imerge.enable = mkEnableOption "install git-imerge package"; github = { diff --git a/modules/home/profiles/user/terje/default.nix b/modules/home/profiles/user/terje/default.nix index 89b8471e..db366468 100644 --- a/modules/home/profiles/user/terje/default.nix +++ b/modules/home/profiles/user/terje/default.nix @@ -25,6 +25,8 @@ in shell.enable = mkDefault true; }; + git.absorb.enable = mkDefault true; + user.terje = { shell.enable = mkDefault true; editor.emacs.enable = mkDefault true;