diff options
| -rw-r--r-- | dot_config/git/config | 5 | ||||
| -rw-r--r-- | private_dot_gnupg/sshcontrol | 2 | ||||
| -rw-r--r-- | private_dot_ssh/config | 11 |
3 files changed, 12 insertions, 6 deletions
diff --git a/dot_config/git/config b/dot_config/git/config index a554e3b..4237892 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -10,6 +10,7 @@ whitespace = trailing-space,cr-at-eol pager = delta hooksPath = ~/.config/git/hooks + sshCommand = "ssh -i ~/.ssh/nym.pub" [branch] sort=-committerdate [diff] @@ -130,10 +131,10 @@ update=!git fetch && git merge --ff-only [includeIf "gitdir:~/doxfiles/.git"] path = config-personal -[includeIf "gitdir:~/dev/copilot/.git"] - path = config-personal [includeIf "gitdir:~/dev/personal/"] path = config-personal +[includeIf "gitdir:~/dev/canonical/"] + path = config-work [sendemail] smtpServer = 127.0.0.1 smtpServerPort = 1016 diff --git a/private_dot_gnupg/sshcontrol b/private_dot_gnupg/sshcontrol index aa79e08..7c545ce 100644 --- a/private_dot_gnupg/sshcontrol +++ b/private_dot_gnupg/sshcontrol @@ -17,3 +17,5 @@ E843F385FEEAE6CA2E1B9A67796241FDA5423CA3 9680C39B2AFDB203DBD32013C0B979E9A454F660 9170EC13FE6ED1D7C5F93894A71FEECE622D7ECB +E1A7E77265BA767676149F8A60C124A8CED25B80 +68910B8E74BC6B2F6EB9DA84579D1B3AB9255004 diff --git a/private_dot_ssh/config b/private_dot_ssh/config index 0045e68..8df3687 100644 --- a/private_dot_ssh/config +++ b/private_dot_ssh/config @@ -6,11 +6,14 @@ ControlMaster auto ControlPersist 10 AddressFamily inet ServerAliveInterval 120 - -Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" - -IdentityFile ~/.ssh/nym.pub IdentitiesOnly yes Host git.sommerfeld.dev Hostname mandibles.wg + +Include work.config + +Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" + +Match host *.wg,*.pulpo + IdentityFile ~/.ssh/nym.pub |