SSH config cleanup

.ssh/config:
Remove hosts no longer in use.
Add alphabetically ordering of some entries.
Order hosts in groups.

1 files changed, 156 insertions, 350 deletions

diff --git a/.ssh/config b/.ssh/config
index b27b7b0..0e4169a 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,65 +1,77 @@
-# Family
-Host greblab
-  Hostname reblab
-  Port 22
-  user dave
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_ed25519
-  IdentitiesOnly yes
-  ServerAliveInterval 120	
+# hop hosts
+Host gchristina
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap -W %h:%p
-
-Host gchristina
+  ForwardAgent yes
   Hostname christina
+  IdentitiesOnly yes
+  IdentityFile ~/.ssh/id_ed25519
   Port 22
+  ProxyCommand ssh sleepmap -W %h:%p
+  ServerAliveInterval 120	
   User dave
+
+Host gdvzrv
+  Compression yes
+  ControlMaster auto
+  ControlPath ~/.ssh/socket-%r@%h:%p
   ForwardAgent yes
-  IdentityFile ~/.ssh/id_ed25519
+  Hostname dvzrv
   IdentitiesOnly yes
-  ServerAliveInterval 120	
+  IdentityFile ~/.ssh/id_ed25519
+  Port 22
+  ProxyCommand ssh dave@sleepmap.de -W %h:%p
+  User dave
+
+Host gtrvlr
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap -W %h:%p
+  ForwardAgent yes
+  Hostname trvlr
+  IdentitiesOnly yes
+  IdentityFile ~/.ssh/id_ed25519
+  Port 22
+  ProxyCommand ssh sleepmap.de -W %h:%p
+  User dave
 
 # home
 Host apu-access-unlock
+  Compression yes
+  ControlMaster auto
+  ControlPath ~/.ssh/socket-%r@%h:%p
   HostName apu-access-unlock
+  IdentitiesOnly yes
+  IdentityFile ~/.ssh/id_ed25519
   Port 22
-  User root
   ServerAliveInterval 120
+  StrictHostkeyChecking no
+  User root
+
+Host apu-access
   Compression yes
-  IdentityFile ~/.ssh/id_rsa
-  IdentitiesOnly yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-
-Host apu-access
   HostName apu-access
+  IdentitiesOnly yes
+  IdentityFile ~/.ssh/id_ed25519
   Port 22
-  User dave
   ServerAliveInterval 120
+  StrictHostkeyChecking no
+  User dave
+
+Host apu-serve-unlock
   Compression yes
-  IdentityFile ~/.ssh/id_ed25519
-  IdentitiesOnly yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-
-Host apu-serve-unlock
   HostName apu-serve-unlock
+  IdentitiesOnly yes
+  IdentityFile ~/.ssh/id_ed25519
   Port 22
-  User root
   ServerAliveInterval 120
-  Compression yes
-  IdentityFile ~/.ssh/id_rsa
-  IdentitiesOnly yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
+  StrictHostkeyChecking no
+  User root
 
 Host apu-serve
   HostName apu-serve
@@ -73,325 +85,169 @@ Host apu-serve
   ControlPath ~/.ssh/socket-%r@%h:%p
 
 Host dvzrv
-  HostName dvzrv
-  Port 22
-  User dave
-  ServerAliveInterval 120
   Compression yes
-  IdentityFile ~/.ssh/id_ed25519
-  IdentitiesOnly yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-
-Host pitheunlord
-  HostName pitheunlord
-  Port 22
-  User dave
-  ServerAliveInterval 120
-  Compression yes
-  IdentityFile ~/.ssh/id_rsa
+  HostName dvzrv
   IdentitiesOnly yes
-  ForwardX11Trusted yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-
-Host gpitheunlord
-  HostName pitheunlord
-  Port 22
-  User dave
-  ForwardAgent yes
   IdentityFile ~/.ssh/id_ed25519
-  IdentitiesOnly yes
-  ServerAliveInterval 120
-  Compression yes
-  ForwardX11Trusted yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap -W %h:%p
-
-Host gdvzrv
-  Hostname dvzrv
   Port 22
+  ServerAliveInterval 120
   User dave
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_ed25519
-  IdentitiesOnly yes
-  ServerAliveInterval 120 
-  Compression yes
-  ForwardX11Trusted yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh dave@sleepmap.de -W %h:%p
 
-Host gtrvlr
-  Hostname trvlr
-  Port 22
-  User dave
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_ed25519
-  IdentitiesOnly yes
-  ServerAliveInterval 120
+Host trvlr
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap.de -W %h:%p
-
-Host gpitheunlord
-  Hostname pitheunlord
-  Port 22
-  User dave
-  ForwardAgent yes
+  Hostname trvlr.localdomain
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  ServerAliveInterval 120 
-  Compression yes
-  ForwardX11Trusted yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap.de -W %h:%p
-
-Host bicrophone
-  HostName bicrophone
   Port 22
-  User dave
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_ed25519
-  IdentitiesOnly yes
-  ServerAliveInterval 120
-  Compression yes
-  ForwardX11Trusted yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap -W %h:%p
 
-# ak
-Host marx
-  Hostname marx
-  Port 22
-  User dave
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_ed25519
-  IdentitiesOnly yes
-  ServerAliveInterval 120	
+Host trvlr-unlock
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap -W %h:%p
-
-Host aktpi
-  Hostname aktpi
-  Port 22
-  User dave
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_ed25519
+  Hostname trvlr
   IdentitiesOnly yes
-  ServerAliveInterval 120	
-  Compression yes
-  ForwardX11Trusted yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap -W %h:%p
+  IdentityFile ~/.ssh/id_ed25519
+  StrictHostkeyChecking no
+  Port 22
+  User root
 
-# EN324
-Host trevor
-  Hostname trevor.ak.tu-berlin.de
+# arch linux
+Host aur.archlinux.org
   Port 22
-  user studio-user
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
+  User aur
   IdentitiesOnly yes
-  ServerAliveInterval 120	
+  IdentityFile ~/.ssh/id_ed25519_aur
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-Host atrevor
-  Hostname trevor.ak.tu-berlin.de
+Host orion.archlinux.org
+  Hostname orion.archlinux.org
   Port 22
-  user admin
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
+  user dvzrv
   IdentitiesOnly yes
-  ServerAliveInterval 120	
+  IdentityFile ~/.ssh/id_ed25519_aur
+  ServerAliveInterval 120
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-Host matrix324
-  Hostname matrix324.ak.tu-berlin.de
+Host soyuz.archlinux.org
+  Hostname soyuz.archlinux.org
   Port 22
-  user matrix
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
+  user dvzrv
   IdentitiesOnly yes
-  ServerAliveInterval 120	
+  IdentityFile ~/.ssh/id_ed25519_aur
+  ServerAliveInterval 120
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-Host amatrix324
-  Hostname matrix324.ak.tu-berlin.de
+Host pkgbuild.com
+  Hostname pkgbuild.com
   Port 22
-  user admin
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
+  user dvzrv
   IdentitiesOnly yes
-  ServerAliveInterval 120	
+  IdentityFile ~/.ssh/id_ed25519_aur
+  ServerAliveInterval 120
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-# EN325
-Host taunus
-  Hostname taunus.ak.tu-berlin.de
-  Port 22
-  user studio-user
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
+host repos.archlinux.org
+  hostname repos.archlinux.org
+  port 22
+  user dvzrv
+  IdentityFile ~/.ssh/id_ed25519_aur
   IdentitiesOnly yes
-  ServerAliveInterval 120	
-  Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-Host ataunus
-  Hostname taunus.ak.tu-berlin.de
-  Port 22
-  user admin
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
+host git.archlinux.org
+  hostname git.archlinux.org
+  port 22
+  user dvzrv
+  IdentityFile ~/.ssh/id_ed25519_aur
   IdentitiesOnly yes
-  ServerAliveInterval 120	
-  Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-# EN326
-Host wfs
-  Hostname 130.149.23.38
-  Port 22
-  user wfs
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
+host luna.archlinux.org
+  hostname luna.archlinux.org
+  port 22
+  user dvzrv
+  IdentityFile ~/.ssh/id_ed25519_aur
   IdentitiesOnly yes
-  ServerAliveInterval 120
-  Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-# EN327
-Host miller
-  Hostname miller.ak.tu-berlin.de
+# c-base
+Host shell.c-base.org
+  Hostname shell.c-base.org
   Port 22
-  user studio
+  user dave
   ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
   IdentitiesOnly yes
   ServerAliveInterval 120
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-# EN327
-Host aktpi
-  Hostname aktpi
+# github
+Host github
+  Hostname github.com
   Port 22
-  user dave
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_ed25519
+  User git
   IdentitiesOnly yes
-  ServerAliveInterval 120 
+  IdentityFile ~/.ssh/id_ed25519_github
   Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap.de -W %h:%p
 
-# H0104
-Host wfs-h0104
-  Hostname 192.168.3.254
-  Port 22
-  user wfs
-  ForwardAgent yes
-  IdentityFile ~/.ssh/id_rsa
+# hosting
+host caduceus.rescue
+  Hostname caduceus
+  port 22
+  user root
+  IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  ServerAliveInterval 120
-  Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
+  StrictHostKeyChecking no
 
-Host fouraudio
-  Hostname fouraudio
-  Port 22
-  user dave
-  ForwardAgent yes
+host caduceus.unlock
+  Hostname caduceus
+  port 22
+  user root
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  ServerAliveInterval 120	
-  Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh sleepmap -W %h:%p
 
-# unix-pool
-Host pool
-  HostName pool.math.tu-berlin.de 
-  Port 22
-  User runge
-  ForwardAgent yes
+host caduceus
+  Hostname caduceus
+  port 22
+  user dave
   IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  ServerAliveInterval 120	
-  Compression yes
-  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-# nwsec
 Host nws4
   Hostname 85.10.206.200
   Port 22
   User dave
   IdentitiesOnly yes
   IdentityFile ~/.ssh/id_ed25519
-  ServerAliveInterval 120
-  Compression yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-
-Host sleepmap2frqrec
-  Hostname nws4
-  ProxyCommand ssh dave@192.168.123.1 -W 192.168.124.2:%p
-  ForwardAgent yes
-  User root
-  ServerAliveInterval 120
-  Compression yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-
-Host sleepmap2tibetmoto
-  ProxyCommand ssh dave@192.168.123.1 -W 192.168.125.2:%p
-  ForwardAgent yes
-  User root
-  ServerAliveInterval 120
   Compression yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
 Host sleepmap
-#  Hostname 85.10.206.218
   Hostname sleepmap.de
   Port 22
   User dave
@@ -400,49 +256,7 @@ Host sleepmap
   ServerAliveInterval 120
   Compression yes
 
-Host frqrec
-#  Hostname 85.10.206.216
-  Hostname frqrec.de
-  Port 22
-  IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_ed25519
-  ServerAliveInterval 120
-  Compression yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-
-# gitlab tu-berlin
-Host gitlab.tubit.tu-berlin.de
-  Hostname gitlab.tubit.tu-berlin.de
-  Port 22
-  User git
-  IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_rsa_tu
-  Compression yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-
-# github
-Host github
-  Hostname github.com
-  Port 22
-  User git
-  IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_ed25519_github
-  Compression yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-
-# archlinux
-Host aur.archlinux.org
-  Port 22
-  User aur
-  IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_ed25519_aur
-  Compression yes
-  ControlMaster auto
-  ControlPath ~/.ssh/socket-%r@%h:%p
-
+# linuxaudio
 Host linuxaudio.org
   Hostname linuxaudio.org
   Port 22
@@ -463,87 +277,79 @@ Host mail.linuxaudio.org
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-Host linuxaudio.berlin
+# unix-pool
+Host pool
+  HostName pool.math.tu-berlin.de
   Port 22
-  User davidrunge
+  User runge
+  ForwardAgent yes
+  IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_rsa
+  ServerAliveInterval 120
   Compression yes
+  ForwardX11Trusted yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-# c-base
-Host soundserv.c-base.org
-  Hostname soundserv.cbrp3.c-base.org
-  Port 22
-  user dave
-  ForwardAgent yes
+# work
+host ploto
+  hostname ploto
+  port 22
+  IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  ServerAliveInterval 120
-  Compression yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
-  ProxyCommand ssh tunnel.c-base.org -W 10.0.0.150:%p
 
-Host shell.c-base.org
-  Hostname shell.c-base.org
-  Port 22
-  user dave
-  ForwardAgent yes
+host ploto-unlock
+  hostname ploto
+  port 22
+  user root
+  IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  ServerAliveInterval 120
-  Compression yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-# arch linux
-Host orion.archlinux.org
-  Hostname orion.archlinux.org
-  Port 22
-  user dvzrv
+host rpi3-1
+  hostname rpi3-1
+  port 22
+  IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_ed25519_aur
-  ServerAliveInterval 120
-  Compression yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-Host soyuz.archlinux.org
-  Hostname soyuz.archlinux.org
-  Port 22
-  user dvzrv
+host rpi3-2
+  hostname rpi3-2
+  port 22
+  IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_ed25519_aur
-  ServerAliveInterval 120
-  Compression yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-Host pkgbuild.com
-  Hostname pkgbuild.com
-  Port 22
-  user dvzrv
+host redis_alboin
+  hostname 10.150.0.2
+  port 22
+  user holoplot
+  IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_ed25519_aur
-  ServerAliveInterval 120
-  Compression yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
+  ProxyJump linux-builder-1
 
-host repos.archlinux.org
-  hostname repos.archlinux.org
+host linux-builder-1
+  hostname linux-builder-1
   port 22
-  user dvzrv
-  IdentityFile ~/.ssh/id_ed25519_aur
+  user holoplot
+  IdentityFile ~/.ssh/id_ed25519
   IdentitiesOnly yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p
 
-host git.archlinux.org
-  hostname git.archlinux.org
-  port 22
-  user dvzrv
-  IdentityFile ~/.ssh/id_ed25519_aur
+Host holoplot-github
+  Hostname github.com
+  Port 22
+  User git
   IdentitiesOnly yes
+  IdentityFile ~/.ssh/id_ed25519_holoplot
+  Compression yes
   ControlMaster auto
   ControlPath ~/.ssh/socket-%r@%h:%p