From a9b0af9f3ecab8d01d3dd69ac0924951f61c860b Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Mon, 23 Oct 2023 18:35:24 +0200
Subject: [PATCH] use difftastic instead of delta for diff replacement

---
 .config/fish/conf.d/abbr.fish       | 2 +-
 arch_wsl.sh                         | 2 +-
 archinstall/user_configuration.json | 2 +-
 dotfiles/.gitconfig                 | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish
index 388ef11..70675ef 100644
--- a/.config/fish/conf.d/abbr.fish
+++ b/.config/fish/conf.d/abbr.fish
@@ -11,7 +11,7 @@ abbr c command # Cancel abbreviation, alias of \
 abbr cd.. "cd .."
 abbr cl "cat src/**.* | sed '/^\s*\$/d' | wc -l" # Count lines of code without newlines
 abbr cp "cp -rv"
-abbr diff delta
+abbr diff difft
 abbr mgrep "grep -Iirnw 'text' ." # Find anything inside files of current directory
 abbr ls "eza --git --icons -gl"
 abbr mgcc "clear; gcc -Wall -Wextra -Wconversion -Wdouble-promotion -Wshadow -Wcast-align -Wstrict-prototypes -fanalyzer -fsanitize=undefined -fsanitize-undefined-trap-on-error -g3 main.c && ./*.out"
diff --git a/arch_wsl.sh b/arch_wsl.sh
index c4a0dd4..95a7615 100644
--- a/arch_wsl.sh
+++ b/arch_wsl.sh
@@ -34,7 +34,7 @@ main() {
     git wget zip openssh bat base-devel make python-pygments micro git-lfs npm \
     sdl2_image nodejs fish autoconf valgrind automake python-virtualenv gdb \
     tk sdl2_mixer eza fzf glu man-pages-fr uwufetch mdcat python-pip opam \
-    cpanminus unison timidity++ rebuild-detector git-delta sdl2_ttf rustup \
+    cpanminus unison timidity++ rebuild-detector difftastic sdl2_ttf rustup \
     libsamplerate rsync doxygen emacs-nox otf-fira-sans ttf-fira-code \
     otf-fira-mono mingw-w64-gcc otf-font-awesome soundfont-fluid fluidsynth \
     pulseaudio-alsa texlive-latexextra texlive-langfrench texlive-luatex \
diff --git a/archinstall/user_configuration.json b/archinstall/user_configuration.json
index 1ce29a9..a247ee2 100644
--- a/archinstall/user_configuration.json
+++ b/archinstall/user_configuration.json
@@ -109,7 +109,7 @@
     "cpanminus",
     "gnome-text-editor",
     "rebuild-detector",
-    "git-delta",
+    "difftastic",
     "sdl2_ttf",
     "rustup",
     "jq",
diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
index b99d16a..5c5ab13 100644
--- a/dotfiles/.gitconfig
+++ b/dotfiles/.gitconfig
@@ -5,11 +5,11 @@
 	email = kennel.anri@tutanota.com
 	name = Mylloon
 
-[core]
-	pager = delta
-
 [pull]
 	rebase = false
 
 [init]
 	defaultBranch = main
+
+[diff]
+	external = difft