mirror of
https://github.com/nix-community/home-manager.git
synced 2025-11-08 11:36:05 +01:00
delta: add jujutsu integration option
This commit is contained in:
parent
a12a837d99
commit
0a3fb53ee2
4 changed files with 56 additions and 0 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
''}
|
||||
'';
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
programs.delta = {
|
||||
enable = true;
|
||||
enableJujutsuIntegration = false;
|
||||
};
|
||||
|
||||
nmt.script = ''
|
||||
assertPathNotExists home-files/.config/jj/config.toml
|
||||
'';
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue