diff --git a/.config/git/config b/.config/git/config
index 318dc91..52901e1 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,7 +1,10 @@
 [user]
-    name = Histalek
-    email = 16392835+Histalek@users.noreply.github.com
-    signingkey = 19EC07547ED0CE82
+    name = histalek
+    email = histalek@posteo.de
+    signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOx25L97J5rCI/qUmvFDNbRaHTDRMxoWOGl/jHC3wv4e histalek@posteo.de"
+
+[gpg]
+    format = ssh
 
 [alias]
     force-push = push --force-with-lease
@@ -16,6 +19,9 @@
 [branch]
     sort = -committerdate
 
+[tag]
+    sort = taggerdate
+
 [color]
     diff = auto
     status = auto
@@ -38,19 +44,24 @@
 [core]
     editor = nvim
     excludesfile = ~/.config/git/gitignore
+    pager = delta
 
 [credential]
     helper = /usr/lib/git-core/git-credential-libsecret
 
 [diff]
     submodule = log
-    algorithm = patience
+    ; algorithm = patience
+    algorithm = histogram
     compationHeuristic = true
     tool = nvimdiff
 
 [difftool "nvimdiff"]
     cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"
 
+[gpg]
+    format = ssh
+
 [gpg "ssh"]
     allowedSignersFile = ~/.config/git/allowed_signers
 
@@ -60,11 +71,10 @@
 
 [merge]
     stat = true
-    conflictStyle = diff3
+    conflictStyle = zdiff3
 
 [push]
     default = simple
-  # needs git version > 2.37.0
     autoSetupRemote = true
 
 [pull]
@@ -79,18 +89,12 @@
 [includeIf "gitdir:~/Repositories/uni/"]
     path = ~/.config/git/subconfigs/uni
 
+[includeIf "gitdir:~/Repositories/github/"]
+    path = ~/.config/git/subconfigs/github
+
 [includeIf "gitdir:~/Repositories/gitlab_com/"]
     path = ~/.config/git/subconfigs/gitlab_com
 
-[includeIf "gitdir:~/Repositories/saibotk_de/"]
-    path = ~/.config/git/subconfigs/histalek_de
-
-[includeIf "gitdir:~/Repositories/histalek_de/"]
-    path = ~/.config/git/subconfigs/histalek_de
-
-[includeIf "gitdir:~/.dotfiles/"]
-    path = ~/.config/git/subconfigs/histalek_de
-
 [init]
     defaultBranch = main