From e07c55d902a768a22443b1e9daa13f97b31b5a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 17 Feb 2024 09:43:02 +0100 Subject: [PATCH] feat(git): add extra config and switch to delta --- modules/programs/git.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/programs/git.nix b/modules/programs/git.nix index 6216899..0dbd586 100644 --- a/modules/programs/git.nix +++ b/modules/programs/git.nix @@ -1,6 +1,5 @@ { config , lib -, pkgs , ... }: @@ -50,21 +49,23 @@ in userName = cfg.identity.name; userEmail = cfg.identity.email; extraConfig = { + commit.verbose = true; + diff.algorithm = "histogram"; + fetch.fsckobjects = true; init.defaultBranch = "main"; merge.conflictstyle = "zdiff3"; - diff.external = getExe pkgs.difftastic; push.autoSetupRemote = true; + receive.fsckObjects = true; + transfer.fsckobjects = true; }; signing = mkIf cfg.signing { key = "0x970C6E89EB0547A9"; signByDefault = true; }; lfs.enable = true; + delta.enable = true; }; }; - programs.git = { - enable = true; - config.safe.directory = "/home/moritz/.dotfiles"; - }; + programs.git.enable = true; }; }