moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(git): add extra config and switch to delta

nixos
Moritz Böhme 2024-02-17 09:43:02 +01:00
parent 8dab093deb
commit e07c55d902
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/programs/git.nix
View File

@ -1,6 +1,5 @@
{ config { config
, lib , lib
, pkgs
, ... , ...
}: }:
@ -50,21 +49,23 @@ in
userName = cfg.identity.name; userName = cfg.identity.name;
userEmail = cfg.identity.email; userEmail = cfg.identity.email;
extraConfig = { extraConfig = {
commit.verbose = true;
diff.algorithm = "histogram";
fetch.fsckobjects = true;
init.defaultBranch = "main"; init.defaultBranch = "main";
merge.conflictstyle = "zdiff3"; merge.conflictstyle = "zdiff3";
diff.external = getExe pkgs.difftastic;
push.autoSetupRemote = true; push.autoSetupRemote = true;
receive.fsckObjects = true;
transfer.fsckobjects = true;
}; };
signing = mkIf cfg.signing { signing = mkIf cfg.signing {
key = "0x970C6E89EB0547A9"; key = "0x970C6E89EB0547A9";
signByDefault = true; signByDefault = true;
}; };
lfs.enable = true; lfs.enable = true;
delta.enable = true;
}; };
}; };
programs.git = { programs.git.enable = true;
enable = true;
config.safe.directory = "/home/moritz/.dotfiles";
};
}; };
} }