From c2de229dea7f0ad264d195f7aea338431403d5d3 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Thu, 17 Aug 2023 10:24:50 +0530 Subject: [PATCH] replace diff-so-fancy with delta --- home/programs/git.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/home/programs/git.nix b/home/programs/git.nix index ed56197..5c13f67 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -3,8 +3,12 @@ in { programs.git = { enable = true; - diff-so-fancy = { + delta = { enable = true; + options = { + side-by-side = true; + syntax-theme = "Dracula"; + }; }; userEmail = user.primary.emailAddress; userName = user.primary.realName; @@ -14,6 +18,7 @@ in { }; extraConfig = { init.defaultBranch = "main"; + merge.conflictstyle = "diff3"; push.autoSetupRemote = true; pull.rebase = true; };