diff --git a/.gitignore b/.gitignore
index 7bdbb21..10ffff2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ tmux/*
 !git
 git/*
 !git/config
-!git/gitignore
+!git/ignore
 !git/aflabs
 
 # ghostty
diff --git a/git/aflabs b/git/aflabs
deleted file mode 100644
index 2a7985e..0000000
--- a/git/aflabs
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
-	name = Matej Janežič
-	email = matej.janezic@aflabs.si
diff --git a/git/config b/git/config
index 4cbbfbc..a68215c 100644
--- a/git/config
+++ b/git/config
@@ -1,18 +1,56 @@
+[includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
+	path = ~/.config/git/config.d/aflabs.conf
+
+[includeIf "gitdir:~/Desktop/git/gitlab.com/flarenetwork"]
+	path = ~/.config/git/config.d/aflabs.conf
+
+[includeIf "gitdir:~/Desktop/git/gitlab.com/flare-foundation"]
+	path = ~/.config/git/flare
+
 [user]
 	name = Matej Janežič
 	email = janezic.mj@gmail.com
+
 [core]
 	autocrlf = input
-	excludesfile = ~/.config/git/gitignore
 	editor = nvim
-[include]
-	path = ~/.config/git/alias
-[include]
-	path = ~/.config/git/commitsign
-[includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
-	path = ~/.config/git/aflabs
+
+[user]
+        signingkey = AF349EECC849D87B790E88FF6318FFB7DB374B7D
+
+[commit]
+        gpgsign = true
+
+; NOTE:(@janezicmatej) github/gitlab don't support these
+; [push]
+;         gpgsign = true
 
 [init]
 	defaultBranch = main
+
 [alias]
 	blame = "!f() { [ -f .git-blame-ignore-revs ] && git blame --ignore-revs-file .git-blame-ignore-revs \"$@\" || git blame \"$@\"; }; f"
+
+[diff]
+        tool = "nvimdiff"
+
+[difftool]
+        prompt = true
+
+[difftool "nvimdiff"]
+        cmd = nvim -d "$LOCAL" "$REMOTE"
+
+[maintenance]
+        auto = true
+	strategy = incremental
+
+[merge]
+	tool = "nvimdiff"
+
+[mergetool]
+	prompt = true
+	keepBackup = false
+	writeToTemp = true
+
+[mergetool "nvimdiff"]
+	layout = "LOCAL,BASE,REMOTE / MERGED"
diff --git a/git/gitignore b/git/ignore
similarity index 75%
rename from git/gitignore
rename to git/ignore
index f775240..745ade4 100644
--- a/git/gitignore
+++ b/git/ignore
@@ -1,10 +1,6 @@
 # mac files
 .DS_Store
 
-# i usually make test.* files for local testing
-# test.*
-# test
-
 # i don't like pushing .vscode and .idea folders, i will force add if needed
 .vscode
 .idea
@@ -12,6 +8,10 @@
 # pyenv
 .python-version
 
+# nix venv hook
+.nix-venv
+.dev
+
 # i use .ignore for nvim
 .ignore