New hostname convention

.ssh/config

@@ -1,47 +1,47 @@
 # ~/.ssh/config
-# vim:set ft=sshconfig:
 
-Host R renly renly.tpope.us router
-	HostName renly.tpope.us
+Host R renly renly.tpope router
+	HostName renly.tpope
 	#Color cyan
 
-Host N balon balon.tpope.us nas
-	HostName balon.tpope.us
+Host N balon balon.tpope nas
+	HostName balon.tpope
 	#Color brown
 
-Host A aegon aegon.tpope.us macbook
-	HostName aegon.tpope.us
+Host A aegon aegon.tpope macbook
+	HostName aegon.tpope
 	#Color purple
 	ForwardX11 yes
 
-Host L walder walder.tpope.us laptop
-	HostName walder.tpope.us
+Host D walder walder.tpope desktop
+	HostName walder.tpope
 	#Color red
 	ForwardX11 yes
 
-Host G rhaegar rhaegar.tpope.us gideon
-	HostName rhaegar.tpope.us
-	#Color navy
+Host L loras loras.tpope laptop
+	HostName loras.tpope
+	#Color orange
+	ForwardX11 yes
 
-Host T tyrion tyrion.tpope.us htpc
-	HostName tyrion.tpope.us
+Host T tyrion tyrion.tpope htpc
+	HostName tyrion.tpope
 	#Color magenta
 	ForwardX11 yes
 
-Host tywin tywin.tpope.us
-	HostName tywin.tpope.us
+Host tywin
+	HostName tywin.tpope
 	#Color magenta
 
 Host V varys varys.tpope.net roxy tpope.net tpo.pe
 	HostName varys.tpope.net
 	#Color green
 
-Host home.tpope.org
+Host home.tpope.info
 	CheckHostIP no
-	HostKeyAlias renly.tpope.us
+	HostKeyAlias renly.tpope
 
-Host *.tpope.us
-	ProxyCommand ssh -qax home.tpope.org nc `echo %h|cut -d. -f1` %p
+Host *.tpope.us *.tpope
+	ProxyCommand ssh -qax home.tpope.info nc `echo %h|cut -d. -f1` %p
 
 Host *.* localhost
 	ProxyCommand none