feat(home): use git-absorb

terlar · Oct 7, 2024 · d032c80 · d032c80
1 parent 446f9d2
commit d032c80
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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;