1 files changed, 21 insertions, 28 deletions

diff --git a/.ssh/config b/.ssh/config
index 4c6428c..c786305 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,48 +1,41 @@
 # vim:ft=sshconfig:
 
-VerifyHostKeyDNS yes
 ServerAliveInterval 60
 ConnectTimeout 10
 ConnectionAttempts 10
 HashKnownHosts yes
 
-# Allow SSH-RSA keys for now
+# Don't offer all agent identities to each host. Requires a matching
+# Host with one or more IdentityFile options specified. These can be
+# a private key or a public key that the agent holds.
+IdentitiesOnly yes
+
+# Allow SSH-RSA keys for now since so many things (especially network
+# and datacenter gear) still want them and Fedora has disabled them by
+# default.
 PubkeyAcceptedKeyTypes +ssh-rsa
+HostKeyAlgorithms +ssh-rsa
+
+# Would be nice to one day publish public keys in DNS, but for now this
+# just slows down connections and most hosts aren't published.
+#VerifyHostKeyDNS yes
 
-Host *.crute.me, !code.crute.me, mcrute-virt
+Host !code.crute.me !code.crute.us *.crute.me mcrute-virt
     User mcrute
     ForwardAgent yes
     DynamicForward 9999
+    IdentityFile ~/.ssh/id_rsa.home.pub
     # Tab Opener
     RemoteForward *:1424 localhost:1424
     # Music Ports
     RemoteForward 1234 localhost:1234
     RemoteForward 1235 localhost:1235
 
-Host mcrute-virt.sea1.crute.me
-    User mcrute
-    ForwardAgent yes
-    DynamicForward 9999
-    # Tab Opener
-    RemoteForward *:1424 localhost:1424
-
-Host mcrute-virt.eu-west-2.crute.me
-    User mcrute
-    ForwardAgent yes
-    DynamicForward 9999
-    # Tab Opener
-    RemoteForward *:1424 localhost:1424
-
-Host mcrute-virt.ext.eu-west-2.crute.me
-    Hostname 172.16.75r28
-    User mcrute
-    ForwardAgent yes
-    ProxyCommand ssh -p 4321 -W %h:%p vpn-1.ext.eu-west-2.crute.me
+Host code.crute.me code.crute.us
+    IdentityFile ~/.ssh/id_rsa.home.pub
 
-Host git-codecommit.*.amazonaws.com
-    User APKAJUVKIAJDACBHNR2Q
-    IdentityFile ~/.ssh/id_rsa.home
+Host github.com
+    IdentityFile ~/.ssh/id_rsa.home.pub
 
-Host ext.code.crute.me
-    Hostname code.crute.me
-    ProxyCommand ssh -F ~/.ssh/home -p 4321 -W %h:%p gateway-1.us-west-2.crute.me
+Host gitlab.alpinelinux.org
+    IdentityFile ~/.ssh/id_rsa.home.pub