diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..5b4ba57
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,15 @@
+[init]
+	defaultBranch = master
+
+[core]
+	editor = helix
+
+[color]
+	status = always
+
+[log]
+	date = local
+
+[include]
+	path = config.user
+	path = config.local
diff --git a/.config/git/config.user##default b/.config/git/config.user##default
new file mode 100644
index 0000000..5baffaf
--- /dev/null
+++ b/.config/git/config.user##default
@@ -0,0 +1,3 @@
+[user]
+	name = Karsten Hachmeister
+	email = karsten@hachmeister.org
diff --git a/.config/git/config.user##u.hachmeisterk b/.config/git/config.user##u.hachmeisterk
new file mode 100644
index 0000000..d5e04a2
--- /dev/null
+++ b/.config/git/config.user##u.hachmeisterk
@@ -0,0 +1,3 @@
+[user]
+	name = Karsten Hachmeister
+	email = karsten.hachmeister@tib.eu
diff --git a/.gitconfig b/.gitconfig
deleted file mode 100644
index b34bff7..0000000
--- a/.gitconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-[init]
-	defaultBranch = master
-	
-[user]
-	name = Karsten Hachmeister
-	email = karsten@hachmeister.org
-
-[delta]
-	navigate = true
-	light = false
-	syntax-theme = Custom
-	line-numbers = true
-	diff-so-fancy = true
-	file-style = blue
-	file-decoration-style = blue ul
-	hunk-header-style = line-number syntax
-	hunk-header-decoration-style = blue box
-	
-[merge]
-	conflictstyle = diff3
-	
-[includeIf "gitdir:~/projects/hachmeister/"]
-	path = ~/projects/hachmeister/.gitconfig
-
-[includeIf "gitdir:~/projects/av-portal/"]
-	path = ~/projects/av-portal/.gitconfig
-
-[includeIf "gitdir:~/projects/kubernetes/"]
-	path = ~/projects/kubernetes/.gitconfig