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

mergiraf: add 'enable{Git,Jujutsus}Integration'

Browse source
This commit is contained in:
Bruno BELANYI 2026-03-12 03:52:41 +01:00 • committed by GitHub
parent 32f78141a9
commit d7ef0034e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 142 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

107
modules/programs/mergiraf.nix
View file

@ -2,6 +2,7 @@
pkgs,
config,
lib,
options,
...
}:
let
@ -12,7 +13,6 @@ let
maintainers
;
cfg = config.programs.mergiraf;
mergiraf = "${cfg.package}/bin/mergiraf";
in
{
meta.maintainers = [ maintainers.bobvanderlinden ];
@ -20,28 +20,105 @@ in
options = {
programs.mergiraf = {
enable = mkEnableOption "mergiraf";
package = mkPackageOption pkgs "mergiraf" { };
enableGitIntegration = lib.mkOption {
type = lib.types.bool;
default = lib.versionOlder config.home.stateVersion "26.05";
defaultText = ''lib.versionOlder config.home.stateVersion "26.05"'';
description = ''
Whether to enable git integration for mergiraf.
When enabled, mergiraf will be configured as git's merge driver.
'';
};
enableJujutsuIntegration = lib.mkOption {
type = lib.types.bool;
default = lib.versionOlder config.home.stateVersion "26.05";
defaultText = ''lib.versionOlder config.home.stateVersion "26.05"'';
description = ''
Whether to enable jujutsu integration for mergiraf.
When enabled, mergiraf will be configured as jujutsus's merge tool.
'';
};
};
};
config = mkIf cfg.enable {
home.packages = [ cfg.package ];
config = lib.mkMerge [
{
warnings =
lib.optionals
(
cfg.enable
&& !lib.versionAtLeast config.home.stateVersion "26.05"
&& options.programs.mergiraf.enableGitIntegration.highestPrio >= 1500
)
[
''
The default value of `programs.mergiraf.enableGitIntegration` will change in future versions.
You are currently using the legacy default (true) because `home.stateVersion` is less than "26.05".
To silence this warning set:
programs.mergiraf.enableGitIntegration = true;
''
]
++
lib.optionals
(
cfg.enable
&& !lib.versionAtLeast config.home.stateVersion "26.05"
&& options.programs.mergiraf.enableJujutsuIntegration.highestPrio >= 1500
)
[
''
The default value of `programs.mergiraf.enableJujutsuIntegration` will change in future versions.
You are currently using the legacy default (true) because `home.stateVersion` is less than "26.05".
To silence this warning set:
programs.mergiraf.enableJujutsuIntegration = true;
''
];
}
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";
(mkIf cfg.enable {
home.packages = [ cfg.package ];
})
(mkIf (cfg.enable && cfg.enableGitIntegration) {
programs = {
git = {
attributes = [ "* merge=mergiraf" ];
settings = {
merge = {
mergiraf = {
name = "mergiraf";
driver = "${lib.getExe cfg.package} 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";
};
};
(mkIf (cfg.enable && cfg.enableJujutsuIntegration) {
programs = {
jujutsu = {
settings = {
ui = {
# Rely on the built-in configuration
merge-editor = "mergiraf";
};
# Explicitly set the path to the package
merge-tools = {
mergiraf = {
program = lib.getExe cfg.package;
};
};
};
};
};
})
];
}