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

20
modules/programs/mergiraf.nix
View file

@ -27,17 +27,21 @@ in
config = mkIf cfg.enable {
home.packages = [ cfg.package ];
programs.git = {
attributes = [ "* merge=mergiraf" ];
settings = {
merge = {
mergiraf = {
name = "mergiraf";
driver = "${mergiraf} merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
programs = {
git = {
attributes = [ "* merge=mergiraf" ];
settings = {
merge = {
mergiraf = {
name = "mergiraf";
driver = "${mergiraf} merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
};
conflictStyle = "diff3";
};
conflictStyle = "diff3";
};
};
jujutsu.settings.ui.merge-editor = "mergiraf";
};
};
}