erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

jujutsu: Disable ediff, fix difftastic config

Browse source
This commit is contained in:
Erwin Boskma 2024-11-14 09:40:41 +01:00
parent b3aa9a97d2
commit ba693ccad9
Signed by: erwin
SSH key fingerprint: SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
home-manager/modules/jujutsu/default.nix
View file

@ -40,6 +40,8 @@ in
config = mkIf cfg.enable {
programs.jujutsu = {
enable = true;
ediff = false;
settings = {
user = {
name = cfg.name;
@ -58,10 +60,11 @@ in
pager = lib.getExe pkgs.bat;
};
diff.difftastic = {
merge-tools = {
difftastic = {
program = lib.getExe pkgs.difftastic;
diff-args = [
"--color=auto"
"--color=always"
"--background=dark"
"--display=side-by-side-show-both"
"$left"
@ -69,7 +72,7 @@ in
];
};
};
signing = {
sign-all = true;
backend = cfg.signingBackend;