From 4c6be292811a5d32d4cf5e698f198f043ce87e45 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Tue, 18 Oct 2022 14:52:02 +0200
Subject: [PATCH] Revert "Use delta as git diff pager"

This reverts commit b37187f79e46d6462f70e6c87f6d0c485c16360f.
---
 git/.config/git/config                    | 7 ++-----
 kitty/.config/kitty/kitty.conf            | 5 +++++
 scripts/.local/share/scripts/switch-theme | 9 ---------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/git/.config/git/config b/git/.config/git/config
index 5a96055..20e4af0 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -4,7 +4,6 @@
 	signingkey = 9893DA236405AF57
 [core]
 	excludesfile = /home/coolneng/.config/git/global_gitignore
-    pager = delta
 [credential]
 	helper = !pass-git-helper $@
 [commit]
@@ -18,13 +17,11 @@
 [filter "git-ignore-line.sh"]
 	clean = /home/coolneng/.dotfiles/scripts/.local/share/scripts/git-ignore-line.sh
 	smudge = cat
-[interactive]
-    diffFilter = delta --color-only
 [add.interactive]
     useBuiltin = false # required for git 2.37.0
-[delta]
-    navigate = true    # use n and N to move between diff sections
 [merge]
     conflictstyle = diff3
 [diff]
     colorMoved = default
+[add.interactive]
+    useBuiltin = false # required for git 2.37.0
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 2cb8988..dd14ba0 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -992,6 +992,11 @@ map kitty_mod+delete clear_terminal reset active
 
 confirm_os_window_close 0
 
+<<<<<<< HEAD
 
 
 
+||||||| b37187f (Use delta as git diff pager)
+
+=======
+>>>>>>> parent of b37187f (Use delta as git diff pager)
diff --git a/scripts/.local/share/scripts/switch-theme b/scripts/.local/share/scripts/switch-theme
index dd17e35..4b2616e 100755
--- a/scripts/.local/share/scripts/switch-theme
+++ b/scripts/.local/share/scripts/switch-theme
@@ -5,20 +5,11 @@ capitalize() {
 	printf '%s' "$1" | tail -c '+2'
 }
 
-modify_delta() {
-	if [ "$1" = "light" ]; then
-		sed -e "s/light = false/light = true/" -e "s/OneHalfDark/OneHalfLight/" -i ~/.config/git/config
-	else
-		sed -e "s/light = true/light = false/" -e "s/OneHalfLight/OneHalfDark/" -i ~/.config/git/config
-	fi
-}
-
 change_theme() {
 	sed -i "s/iceberg_$1/iceberg_$2/" ~/.config/kitty/kitty.conf
 	sed -i "s/bg=$1/bg=$2/" ~/.config/nvim/init.vim
 	sed -i "s/iceberg_$1/iceberg_$2/" ~/.dotfiles/tmux/.tmux.conf
 	sed -i "s/iceberg_$1/iceberg_$2/" ~/.config/zathura/zathurarc
-	modify_delta "$2"
 	kitty +kitten themes --reload-in=all "Iceberg $(capitalize "$2")"
 	tmux source-file ~/.tmux.conf
 	nvr --remote-send ":source ~/.config/nvim/init.vim <CR> :set nonumber <CR> :set norelativenumber <CR>"