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; }; }