diff --git a/.gitconfig b/.gitconfig
index 9082eac..a44fd91 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,25 +1,34 @@
 [user]
- email = afonso@francof.net
- name = afonso
- signingkey = ~/.ssh/simple_sk
+    email = afonso@francof.net
+    name = afonso
+    signingkey = ~/.ssh/simple_sk
 [includeIf "hasconfig:remote.*.url:https://github.com/**"]
- path = ~/.gitconfig-gh
+    path = ~/.gitconfig-gh
 [includeIf "hasconfig:remote.*.url:ssh://git@github.com/**"]
- path = ~/.gitconfig-gh
+    path = ~/.gitconfig-gh
 [filter "lfs"]
- process = git-lfs filter-process
- required = true
- clean = git-lfs clean -- %f
- smudge = git-lfs smudge -- %f
+    process = git-lfs filter-process
+    required = true
+    clean = git-lfs clean -- %f
+    smudge = git-lfs smudge -- %f
 [core]
- autocrlf = input
+    autocrlf = input
+    pager = delta
+[interactive]
+    diffFilter = delta --color-only
+[delta]
+    navigate = true
+[merge]
+    conflictstyle = diff3
+[diff]
+    colorMoved = default
 [commit]
- gpgsign = true
+    gpgsign = true
 [gpg]
- format = ssh
+    format = ssh
 [tag]
- gpgsign = true
+    gpgsign = true
 [pull]
-	rebase = false
+    rebase = false
 [init]
-	defaultBranch = main
+    defaultBranch = main