From 5226a3cc3af7637989b02740c8d6fac34d5de4e8 Mon Sep 17 00:00:00 2001
From: Holger Just <git@holgerjust.de>
Date: Sat, 1 Feb 2025 14:41:22 +0100
Subject: [PATCH] Update gitconfig, dir specific config, custom agent script
 for signing

---
 .gitconfig               | 35 ++++++++++++++++++-----------------
 .gitignore               |  3 ++-
 Rakefile                 |  6 +++++-
 bin/strongbox-ssh-keygen |  3 +++
 4 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100755 bin/strongbox-ssh-keygen

diff --git a/.gitconfig b/.gitconfig
index 00346ff..323cdb7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -12,33 +12,34 @@
 	su = submodule update --recursive --init
 	# https://stackoverflow.com/a/7149602/421705
 	addnw = !sh -c 'git diff -U0 -w --no-color "$@" | git apply --cached --ignore-whitespace --unidiff-zero' -
-[user]
-	name = Holger Just
-	email = hello@holgerjust.de
+[branch]
+	autosetupmerge = true
+	autosetuprebase = always
+[core]
+	autocrlf = false
+	excludesfile = ~/.gitignore_global
 [color]
 	branch = auto
 	diff = auto
 	grep = auto
 	interactive = auto
 	ui = auto
-[push]
-	default = tracking
-	recurseSubmodules = check
-[core]
-	autocrlf = false
-	excludesfile = ~/.gitignore_global
 [github]
 	user = meineerde
-[credential]
-	helper=osxkeychain
-[branch]
-	autosetupmerge = true
-	autosetuprebase = always
+[fetch]
+	fsckobjects = true
 [http]
 	postBuffer = 524288000
-[fetch]
+[push]
+  autoSetupRemote = true
+	default = upstream
+	recurseSubmodules = check
+[receive]
 	fsckobjects = true
 [transfer]
 	fsckobjects = true
-[receive]
-	fsckobjects = true
+
+[include]
+  path = ~/.gitconfig_holgerjust.de
+[includeIf "gitdir:~/workspace/planio/"]
+  path = ~/.gitconfig_plan.io
diff --git a/.gitignore b/.gitignore
index ebb882d..20ed827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/.vim/sessions
\ No newline at end of file
+/.vim/sessions
+/.gitconfig_*
diff --git a/Rakefile b/Rakefile
index a1a25ed..69238e6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -28,7 +28,11 @@ namespace :install do
   end
 
   files :irb, ".irbrc", ".config/irb/*.rb"
-  files :dot, *%w[.bash_profile .bashrc .gemrc .gitignore_global .gitconfig .ackrc .rvmrc.dotfile]
+
+  dot_files = %w[bin]
+  dot_files += %w[.bash_profile .bashrc .gemrc .gitignore_global .ackrc .rvmrc.dotfile]
+  dot_files += %w[.gitconfig .gitconfig_holgerjust.de .gitconfig_plan.io]
+  files :dot, *dot_files
 
   files :vim, *%w[.vim .vimrc]
 end
diff --git a/bin/strongbox-ssh-keygen b/bin/strongbox-ssh-keygen
new file mode 100755
index 0000000..e228edf
--- /dev/null
+++ b/bin/strongbox-ssh-keygen
@@ -0,0 +1,3 @@
+#!/bin/sh
+export SSH_AUTH_SOCK="${HOME}/.ssh/strongbox/agent.sock"
+exec ssh-keygen "$@"