From 649834c839d93e8e4db49cb87c7464962e0ff2cc Mon Sep 17 00:00:00 2001
From: Compey <hi@devcomp.xyz>
Date: Sun, 25 Dec 2022 18:39:50 +0530
Subject: [PATCH] feat: sane git diff & other aliases

---
 .bashrc    |  2 ++
 .gitconfig | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/.bashrc b/.bashrc
index c8a888f..5756d36 100644
--- a/.bashrc
+++ b/.bashrc
@@ -21,6 +21,8 @@ alias ls='ls --color=auto'
 alias neofetch="neofetch | lolcat"
 alias pokete="pokete.py"
 alias cat="bat"
+alias ls="lsd"
+
 
 # Path & Binaries
 export GOPATH=~/sdk/go1.19.4/
diff --git a/.gitconfig b/.gitconfig
index a57c2e4..d1fcfe4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -12,14 +12,32 @@
         signingkey = 23CD97ABBBCC5ED2
         email = hi@devcomp.xyz
         name = CompeyDev
+
 [commit]
         gpgsign = true
+
 [filter "lfs"]
         clean = git-lfs clean -- %f
         smudge = git-lfs smudge -- %f
         process = git-lfs filter-process
         required = true
+
 [gpg]
         program = gpg
+
 [core]
         autocrlf = false
+        pager = delta
+
+[interactive]
+        diffFilter = delta --color-only
+
+[delta]
+        navigate = true    # use n and N to move between diff sections
+        light = false      # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
+
+[merge]
+        conflictstyle = diff3
+
+[diff]
+        colorMoved = default