users/foo-dogsquared: update Jujutsu and Thunderbird config

This commit is contained in:
Gabriel Arazas 2024-08-26 16:00:38 +08:00
parent d92bcaf4a3
commit b493c2c71e
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
2 changed files with 8 additions and 0 deletions

View File

@ -68,6 +68,7 @@ in
(lib.mkIf cfg.thunderbird.enable { (lib.mkIf cfg.thunderbird.enable {
programs.thunderbird = { programs.thunderbird = {
enable = true; enable = true;
package = pkgs.thunderbird-foodogsquared;
profiles.personal = { profiles.personal = {
isDefault = true; isDefault = true;
settings = { settings = {

View File

@ -15,10 +15,17 @@ in
user.name = config.accounts.email.accounts.personal.realName; user.name = config.accounts.email.accounts.personal.realName;
user.email = config.accounts.email.accounts.personal.address; user.email = config.accounts.email.accounts.personal.address;
ui.diff-editor = "diffedit3";
"merge-tools.diffoscope" = { "merge-tools.diffoscope" = {
merge-args = [ "$left" "$right" ]; merge-args = [ "$left" "$right" ];
program = lib.getExe' pkgs.diffoscope "diffoscope"; program = lib.getExe' pkgs.diffoscope "diffoscope";
}; };
"merge-tools.diffedit3" = {
merge-args = [ "$left" "$right" "$output" ];
program = lib.getExe' config.services.diffedit3.package "diffedit3";
};
}; };
}; };
}; };