From f42c0460a770eb80a0380f6bf864d754562ad1c0 Mon Sep 17 00:00:00 2001
From: Jonathan Leech-Pepin <jonathan@leechpepin.com>
Date: Sat, 17 May 2025 19:45:18 -0400
Subject: [PATCH] Add SSH settings

---
 .gitattributes           |  5 +++-
 git/.gitconfig           |  6 ++---
 ssh/.ssh/config          | 58 ++++++++++++++++++++++++++++++++++++++++
 ssh/.ssh/ed25519-gpg.pub |  1 +
 ssh/.ssh/gpg_rsa2048.pub |  1 +
 5 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 ssh/.ssh/config
 create mode 100644 ssh/.ssh/ed25519-gpg.pub
 create mode 100644 ssh/.ssh/gpg_rsa2048.pub

diff --git a/.gitattributes b/.gitattributes
index ff31d49..e85c9de 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,4 @@
-.wakatime.cfg    filter=ageEncrypt
+.wakatime.cfg                           filter=ageEncrypt
+**/.pulumi/credentials.json             filter=ageEncrypt
+**/.kube/config                         filter=ageEncrypt
+**/.tabby-client/agent/config.toml      filter=ageEncrypt
diff --git a/git/.gitconfig b/git/.gitconfig
index ae94500..05e3393 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -11,11 +11,11 @@
     user = jleechpe
 
 # Push instead of configuration
-[url "ssh://git@github.com/"]
+[url "ssh://github.com/"]
     pushInsteadOf= https://github.com/
-[url "git@codeberg.org:"]
+[url "codeberg.org:"]
     pushInsteadOf = https://codeberg.org/
-[url "git@forgejo.leechpepin.com:"]
+[url "forgejo.leechpepin.com:"]
     pushInsteadOf = https://forgejo.leechpepin.com
 
 # Defaults
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
new file mode 100644
index 0000000..e5ea8b2
--- /dev/null
+++ b/ssh/.ssh/config
@@ -0,0 +1,58 @@
+# Tailnet
+Host blackstaff
+     Hostname blackstaff.leechpepin.tailnet
+Host dresden
+     Hostname dresden.leechpepin.tailnet
+Host arthur
+     Hostname arthur.leechpepin.tailnet
+Host jlpks8888
+     Hostname jlpks8888.leechpepin.tailnet
+Host jlpgreencloud
+     Hostname jlpgreencloud.leechpepin.tailnet
+Host headscale
+     Hostname headscale.leechpepin.tailnet
+Host *.leechpepin.tailnet
+     Port 22
+     User jleechpe
+     IdentityFile ~/.ssh/ed25519-gpg
+     IdentitiesOnly yes
+
+## Backups
+Host ndbackups
+     Hostname ndbackups.leechpepin.com
+     Port 22
+     User jleechpe
+
+# VCS related
+Host forgejo.leechpepin.com
+     Port 22
+     User git
+     IdentityFile ~/.ssh/ed25519-gpg
+     IdentitiesOnly yes
+
+Host github.com
+     Port 22
+     User git
+
+Host codeberg.org
+     Port 22
+     User git
+
+Host ssh.pijul.com
+     HostName ssh.pijul.com
+     Port 22
+     User jleechpe
+     AddKeysToAgent yes
+
+Host ssh.dev.azure.com
+     IdentityFile ~/.ssh/gpg_rsa2048.pub
+     PubkeyAcceptedKeyTypes +ssh-rsa
+     HostkeyAlgorithms +ssh-rsa
+     Port 22
+     User git
+
+# Global Config
+Host *
+     ControlMaster auto
+     ControlPersist yes
+     ControlPath ~/.ssh/control/%C
diff --git a/ssh/.ssh/ed25519-gpg.pub b/ssh/.ssh/ed25519-gpg.pub
new file mode 100644
index 0000000..06d2017
--- /dev/null
+++ b/ssh/.ssh/ed25519-gpg.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALEjLKB3bs0k/VfF4+JVaXf3uyjwJ2ZToz0Xe33+iLX openpgp:0x1F3543A7
diff --git a/ssh/.ssh/gpg_rsa2048.pub b/ssh/.ssh/gpg_rsa2048.pub
new file mode 100644
index 0000000..36fd593
--- /dev/null
+++ b/ssh/.ssh/gpg_rsa2048.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo3yMrXOAMolItvBnD6i3fWnwuh5h+8PAsSE/SJ8p+hVZHTXNlGtUaxWCgAZILKSYtbom/M4VFdXXySHpriRs0cES7igVB+t88xgSWrJVHeZ2IO2mVtihWY8c+4uBkVln4GZ9MtPMMIB8H0RD+B2O2k/1veHneY+Qya7QhxfCfPl5Oy0mVdEZedtd9gH3/dOcQKoArbcfZuei/GzNORBhPRK4Wv9KhS+Rck8kdfvMHnN0crPYE9Y6V5cw+EK8Iy8qoldvNHW2/2GbkSuC0uNPsuwxsRMYk4KxoWamwWpVPL0VWZMdL8nqBFAOslNYoy6/fTjhDE6OkNuOk4ubIYQyB openpgp:0xAA41D4CD