nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

mergiraf: add jujutsu integration

Browse source
This commit is contained in:
Vinicius Deolindo 2026-01-31 03:21:37 -03:00 • committed by Robert Helgesson
parent ddf76d1618
commit 1742b5cb6a
3 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/modules/programs/mergiraf/default.nix
View file

@ -1 +1,4 @@
{ mergiraf-basic-configuration = ./basic-configuration.nix; }
{
mergiraf-basic-configuration = ./basic-configuration.nix;
mergiraf-jujutsu-integration = ./jujutsu-integration.nix;
}

33
tests/modules/programs/mergiraf/jujutsu-integration.nix Normal file
View file

@ -0,0 +1,33 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.programs.jujutsu;
packageVersion = lib.getVersion cfg.package;
# jj v0.29+ deprecated support for "~/Library/Application Support" on Darwin.
configDir =
if pkgs.stdenv.isDarwin && !(lib.versionAtLeast packageVersion "0.29.0") then
"Library/Application Support"
else
".config";
in
{
programs.jujutsu = {
enable = true;
package = config.lib.test.mkStubPackage { };
};
programs.mergiraf.enable = true;
nmt.script = ''
assertFileExists 'home-files/${configDir}/jj/config.toml'
assertFileContent 'home-files/${configDir}/jj/config.toml' \
${builtins.toFile "expected.toml" ''
[ui]
merge-editor = "mergiraf"
''}
'';
}