From a06384c5d3e8a847bbc9e0e2a21cb838cea06d42 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sat, 25 Feb 2023 23:59:19 +0100 Subject: [PATCH] configured delta for git --- users/rouven/modules/git/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/users/rouven/modules/git/default.nix b/users/rouven/modules/git/default.nix index 0d42a43..9924dbb 100644 --- a/users/rouven/modules/git/default.nix +++ b/users/rouven/modules/git/default.nix @@ -1,10 +1,21 @@ { config, pkgs, ... }: { + home.packages = with pkgs; [ delta ]; programs.git = { enable = true; userName = "Rouven Seifert"; userEmail = "rouven@rfive.de"; extraConfig = { + core.pager = "delta"; + interactive.diffFilter = "delta --color-only"; + delta = { + navigate = true; + light = false; + side-by-side = true; + line-numbers = true; + }; + merge.conflictStyle = "diff3"; + diff.colorMoved = "default"; user.signingkey = "B95E8FE6B11C4D09"; pull.rebase = false; init.defaultBranch = "main";