From b493c2c71ef27538e0ef5e00640fca0a49e8be4b Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Mon, 26 Aug 2024 16:00:38 +0800
Subject: [PATCH] users/foo-dogsquared: update Jujutsu and Thunderbird config

---
 .../home-manager/foo-dogsquared/modules/programs/email.nix | 1 +
 .../foo-dogsquared/modules/programs/jujutsu.nix            | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/configs/home-manager/foo-dogsquared/modules/programs/email.nix b/configs/home-manager/foo-dogsquared/modules/programs/email.nix
index 9d0a6f0e..e2ef9121 100644
--- a/configs/home-manager/foo-dogsquared/modules/programs/email.nix
+++ b/configs/home-manager/foo-dogsquared/modules/programs/email.nix
@@ -68,6 +68,7 @@ in
     (lib.mkIf cfg.thunderbird.enable {
       programs.thunderbird = {
         enable = true;
+        package = pkgs.thunderbird-foodogsquared;
         profiles.personal = {
           isDefault = true;
           settings = {
diff --git a/configs/home-manager/foo-dogsquared/modules/programs/jujutsu.nix b/configs/home-manager/foo-dogsquared/modules/programs/jujutsu.nix
index fc3b8e4f..039f8cd8 100644
--- a/configs/home-manager/foo-dogsquared/modules/programs/jujutsu.nix
+++ b/configs/home-manager/foo-dogsquared/modules/programs/jujutsu.nix
@@ -15,10 +15,17 @@ in
         user.name = config.accounts.email.accounts.personal.realName;
         user.email = config.accounts.email.accounts.personal.address;
 
+        ui.diff-editor = "diffedit3";
+
         "merge-tools.diffoscope" = {
           merge-args = [ "$left" "$right" ];
           program = lib.getExe' pkgs.diffoscope "diffoscope";
         };
+
+        "merge-tools.diffedit3" = {
+          merge-args = [ "$left" "$right" "$output" ];
+          program = lib.getExe' config.services.diffedit3.package "diffedit3";
+        };
       };
     };
   };