erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

jujutsu: Disable ediff, fix difftastic config

Browse source
This commit is contained in:
Erwin Boskma 2024-11-14 09:40:41 +01:00
parent b3aa9a97d2
commit ba693ccad9
Signed by: erwin
SSH key fingerprint: SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
home-manager/modules/jujutsu/default.nix
View file

@ -40,6 +40,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.jujutsu = { programs.jujutsu = {
enable = true; enable = true;
ediff = false;
settings = { settings = {
user = { user = {
name = cfg.name; name = cfg.name;
@ -58,18 +60,19 @@ in
pager = lib.getExe pkgs.bat; pager = lib.getExe pkgs.bat;
}; };
diff.difftastic = { merge-tools = {
program = lib.getExe pkgs.difftastic; difftastic = {
diff-args = [ program = lib.getExe pkgs.difftastic;
"--color=auto" diff-args = [
"--background=dark" "--color=always"
"--display=side-by-side-show-both" "--background=dark"
"$left" "--display=side-by-side-show-both"
"$right" "$left"
]; "$right"
];
};
}; };
signing = { signing = {
sign-all = true; sign-all = true;
backend = cfg.signingBackend; backend = cfg.signingBackend;