feat(git): refactor config and add some qol

.gitignore

@@ -41,7 +41,7 @@ tmux/*
 !git
 git/*
 !git/config
-!git/gitignore
+!git/ignore
 !git/aflabs
 
 # ghostty

git/aflabs

@@ -1,3 +0,0 @@
-[user]
-	name = Matej Janežič
-	email = matej.janezic@aflabs.si

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
+[user]
-[include]
+        signingkey = AF349EECC849D87B790E88FF6318FFB7DB374B7D
-	path = ~/.config/git/commitsign
+
-[includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
+[commit]
-	path = ~/.config/git/aflabs
+        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"

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