nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

delta: add jujutsu integration option

Browse source
This commit is contained in:
Thierry Delafontaine 2025-10-27 11:13:17 +01:00 • committed by Austin Horstman
parent a12a837d99
commit 0a3fb53ee2
4 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/programs/delta.nix
View file

@ -64,6 +64,16 @@ in
'';
};
enableJujutsuIntegration = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable jujutsu integration for delta.
When enabled, delta will be configured as jujutsus's pager, diff filter, and merge tool.
'';
};
finalPackage = mkOption {
type = types.package;
readOnly = true;
@ -123,5 +133,18 @@ in
delta = cfg.options;
};
})
(lib.mkIf (cfg.enable && cfg.enableJujutsuIntegration) {
programs.jujutsu.settings = {
merge-tools.delta.diff-expected-exit-codes = [
0
1
];
ui = {
diff-formatter = ":git";
pager = "${lib.getExe cfg.package}";
};
};
})
];
}

2
tests/modules/programs/delta/default.nix
View file

@ -3,5 +3,7 @@
delta-final-package = ./delta-final-package.nix;
delta-with-git-integration = ./delta-with-git-integration.nix;
delta-without-git-integration = ./delta-without-git-integration.nix;
delta-with-jujutsu-integration = ./delta-with-jujutsu-integration.nix;
delta-without-jujutsu-integration = ./delta-without-jujutsu-integration.nix;
delta-migration = ./delta-migration.nix;
}

21
tests/modules/programs/delta/delta-with-jujutsu-integration.nix Normal file
View file

@ -0,0 +1,21 @@
{ config, lib, ... }:
{
programs.delta = {
enable = true;
enableJujutsuIntegration = true;
};
programs.jujutsu.enable = true;
nmt.script = ''
assertFileExists home-files/.config/jj/config.toml
assertFileContent home-files/.config/jj/config.toml ${builtins.toFile "expected" ''
[merge-tools.delta]
diff-expected-exit-codes = [0, 1]
[ui]
diff-formatter = ":git"
pager = "${lib.getExe config.programs.delta.package}"
''}
'';
}

10
tests/modules/programs/delta/delta-without-jujutsu-integration.nix Normal file
View file

@ -0,0 +1,10 @@
{
programs.delta = {
enable = true;
enableJujutsuIntegration = false;
};
nmt.script = ''
assertPathNotExists home-files/.config/jj/config.toml
'';
}