From 68a6af07a0b7cc862204fa3bddd60e0894ea73e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 17 Oct 2020 13:37:33 +0100
Subject: [PATCH] use delta for git diff

---
 .gitconfig.linux.private              | 19 +++++++++---
 nixos/git/home.nix                    |  8 ++---
 nixos/home-manager/programs/kitty.nix | 43 ++++++++++++++-------------
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/.gitconfig.linux.private b/.gitconfig.linux.private
index 71a7878a..31b9d2ae 100644
--- a/.gitconfig.linux.private
+++ b/.gitconfig.linux.private
@@ -1,9 +1,20 @@
 [include]
-	path = dev/dotfiles/.gitconfig_includes.common
-	path = dev/dotfiles/.gitconfig_includes.linux
+path = dev/dotfiles/.gitconfig_includes.common
+path = dev/dotfiles/.gitconfig_includes.linux
 
 [alias]
-	signedcommit = !git commit -S
+signedcommit = !git commit -S
 
 [gpg]
-	program = gpg2
+program = gpg2
+
+[diff]
+tool = kitty
+guitool = kitty.gui
+[difftool]
+prompt = false
+trustExitCode = true
+[difftool "kitty"]
+cmd = kitty +kitten diff $LOCAL $REMOTE
+[difftool "kitty.gui"]
+cmd = kitty kitty +kitten diff $LOCAL $REMOTE
diff --git a/nixos/git/home.nix b/nixos/git/home.nix
index e602f8e2..05c90d53 100644
--- a/nixos/git/home.nix
+++ b/nixos/git/home.nix
@@ -5,17 +5,15 @@
     lfs.enable = true;
     userName = "Cyryl Płotnicki";
     userEmail = "cyplo@cyplo.net";
+    delta = {
+      enable = true;
+    };
     extraConfig = {
       credential = { helper ="cache"; };
-      core = { pager = "cat"; };
       colour.ui = true;
       help.autocorrect = 1;
       push.default = "simple";
       mergetool.keepBackup = false;
-      pager = {
-        diff = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
-        show = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
-      };
     };
     aliases =
       {
diff --git a/nixos/home-manager/programs/kitty.nix b/nixos/home-manager/programs/kitty.nix
index cfabc631..0b57639b 100644
--- a/nixos/home-manager/programs/kitty.nix
+++ b/nixos/home-manager/programs/kitty.nix
@@ -12,27 +12,28 @@
       bold_font        = "auto";
       italic_font      = "auto";
       bold_italic_font = "auto";
-      background            = "#001e26";
-      foreground            = "#708183";
-      cursor                = "#708183";
-      selection_background  = "#002731";
-      color0                = "#002731";
-      color8                = "#465a61";
-      color1                = "#d01b24";
-      color9                = "#bd3612";
-      color2                = "#728905";
-      color10               = "#465a61";
-      color3                = "#a57705";
-      color11               = "#52676f";
-      color4                = "#2075c7";
-      color12               = "#708183";
-      color5                = "#c61b6e";
-      color13               = "#5856b9";
-      color6                = "#259185";
-      color14               = "#81908f";
-      color7                = "#e9e2cb";
-      color15               = "#fcf4dc";
-      selection_foreground  = "#001e26";
+      background = "#001e26";
+      foreground = "#708183";
+      selection_foreground ="#001e26";
+      selection_background = "#002731";
+      cursor = "#708183";
+
+      color0  = "#002731";
+      color1  = "#d01b24";
+      color2  = "#728905";
+      color3  = "#a57705";
+      color4  = "#2075c7";
+      color5  = "#c61b6e";
+      color6  = "#259185";
+      color7  = "#e9e2cb";
+      color8  = "#001e26";
+      color9  = "#bd3612";
+      color10 = "#465a61";
+      color11 = "#52676f";
+      color12 = "#708183";
+      color13 = "#5856b9";
+      color14 = "#81908f";
+      color15 = "#fcf4dc";
 
     };
   };