mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-01-31 04:58:01 +00:00
users/foo-dogsquared: update Jujutsu and Thunderbird config
This commit is contained in:
parent
d92bcaf4a3
commit
b493c2c71e
@ -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 = {
|
||||||
|
@ -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";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user