X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/dc07e6c5c6245f67b1add9b5eb3596f01e41968b..119dd0d900e25e5d9c9c1474a4dae28f52939f5c:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 67ff7e7..1c38e38 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -92,11 +92,6 @@ Host madduck.net
 Host imap.madduck.net
   HostKeyAlias seamus.madduck.net
 
-Host diamond.madduck.net | diamond
-  ForwardAgent yes
-<<<<<<< HEAD
-  Hostname bell.madduck.net
-
 Host diamond.madduck.net | diamond
   ForwardAgent yes
   Hostname diamond.madduck.net
@@ -108,11 +103,13 @@ Host tunes.madduck.net | tunes
   ControlMaster no
   Hostname tunes.madduck.net
   HostKeyAlias diamond.madduck.net
+  IPQoS lowdelay af13
 Host flics.madduck.net | flics
   AddressFamily inet
   ControlMaster no
   Hostname flics.madduck.net
   HostKeyAlias diamond.madduck.net
+  IPQoS lowdelay af13
 
 Host shelter.madduck.net | shelter
   ForwardAgent yes
@@ -418,6 +415,7 @@ Host *
   HostKeyAlgorithms ssh-rsa
 # IdentityFile ~/.ssh/identity
   IdentityFile2 ~/.ssh/id_rsa
+  IPQoS lowdelay throughput
 # KbdInteractiveDevices pam
 # LocalCommand none
 # LocalForward none