From 7778a89a53704512276c917d47e011600195ed76 Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Tue, 15 Nov 2022 11:32:23 +0100
Subject: [PATCH] * use delta instead of diff * add .gitconfig instead of
 modifying it by commands

---
 arch.sh                             |  6 ++----
 archinstall/user_configuration.json |  3 ++-
 dotfiles/.gitconfig                 | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 dotfiles/.gitconfig

diff --git a/arch.sh b/arch.sh
index 2711745..b8ed41d 100644
--- a/arch.sh
+++ b/arch.sh
@@ -130,6 +130,7 @@ main() {
     fish -c "abbr opamupdate 'opam update && opam upgrade -y'"
     fish -c "abbr yay-rebuild 'checkrebuild | awk \'{print \$2}\' | xargs -r yay -S --rebuildtree --noconfirm'"
     fish -c "abbr pacman-clean 'sudo pacman -Rsn \$(pacman -Qqtd) --noconfirm'"
+    fish -c "abbr diff 'delta'"
     # Fish by default in terminal app
     local profil
     profil=$(gsettings get org.gnome.Terminal.ProfilesList list)
@@ -395,10 +396,7 @@ main() {
     wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/.config/VSCodium/product.json -P "$HOME"/.config/VSCodium/
 
     # === Git ==
-    git config --global user.email "kennel.anri@tutanota.com"
-    git config --global user.name "Mylloon"
-    git config --global pull.rebase true
-    git config --global init.defaultBranch main
+    wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/dotfiles/.gitconfig -O "$HOME"/.gitconfig
 
     # === Python ==
     # Add PIP packages from Python to the path
diff --git a/archinstall/user_configuration.json b/archinstall/user_configuration.json
index 0d2cf36..eb0e349 100644
--- a/archinstall/user_configuration.json
+++ b/archinstall/user_configuration.json
@@ -111,7 +111,8 @@
         "pacman-contrib",
         "cpanminus",
         "gnome-text-editor",
-        "rebuild-detector"
+        "rebuild-detector",
+        "git-delta"
     ],
     "plugin": null,
     "profile": {
diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
new file mode 100644
index 0000000..b720d1d
--- /dev/null
+++ b/dotfiles/.gitconfig
@@ -0,0 +1,16 @@
+[commit]
+	gpgsign = true
+
+[user]
+	email = kennel.anri@tutanota.com
+	name = Mylloon
+
+[core]
+	editor = micro
+	pager = delta
+
+[pull]
+	rebase = true
+
+[init]
+	defaultBranch = main