Merge remote-tracking branch 'refs/remotes/origin/home' into home

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "fonts/codeface"]
 	path = fonts/codeface
 	url = https://github.com/chrissimpkins/codeface
+[submodule "powerline-shell"]
+	path = powerline-shell
+	url = https://github.com/banga/powerline-shell.git

fonts/Envy Code R PR7/Read Me.txt

@@ -0,0 +1,16 @@
+Envy Code R (coding font) preview #7.2
+======================================
+Envy Code R is a fully-scalable monospaced font designed for programming and command prompts.
+
+There are three variants including in the archive - Regular, Bold and Italic.  A large number of additional symbols outside the ASCII range and provided which covers most of the Windows/ISO 1252 codepage, MacOS Roman and a number of other Central European pages.
+
+This archive also contains a folder named 'Visual Studio Italics-as-bold' which contains the Regular and Italic fonts again with an alternate name of 'Envy Code R VS' and with the Italic variant set to identify itself as bold.  This allows you to utilise italics within Visual Studio's syntax highlighter by choosing bold everywhere you want italics - great for comments or strings!
+
+If you wish to use Envy Code R as a font for your Windows Command Prompt run the included .reg registry file and reboot, then choose Properties from the Command Prompt to set it.
+
+Please send feedback to damien@envytech.co.uk and be sure to visit http://damieng.com/fonts/envy-code-r for updates and more information.
+
+[)amien
+Damien Guard, May 2008.
+
+Copyright © 2006-2008 Envy Technologies Ltd.  Free to use but redistribution prohibited.

nflist

@@ -23,6 +23,9 @@
  Px437_ATT_PC6300 NF:style=Book:pixelsize=16:antialias=true
  Px437_AmstradPC1512 NF:style=2y:pixelsize=16:antialias=true
  Px437_AmstradPC1512 NF:style=Book:pixelsize=16:antialias=true
+ Px437_CompaqThin_8x14 NF:style=Thin\_8x14NerdFontCo:pixelsize=16:antialias=true
+ Px437_CompaqThin_8x16 NF:style=Thin\_8x16NerdFontCo:pixelsize=16:antialias=true
+ Px437_CompaqThin_8x8 NF:style=Thin\_8x8NerdFontCom:pixelsize=16:antialias=true
  Px437_DTK_BIOS NF:style=2y:pixelsize=16:antialias=true
  Px437_DTK_BIOS NF:style=Book:pixelsize=16:antialias=true
  Px437_IBM_3270pc NF:style=Book:pixelsize=16:antialias=true

powerline-shell

@@ -0,0 +1 @@
+Subproject commit d48f383112f5520c4c33d69dca0806e127f495d7

worssh

@@ -1,3 +1,13 @@
-#!/bin/zsh
-ssh -D 9944 -o "ProxyCommand /usr/bin/nc -X 5 -x 127.0.0.1:9000 %h %p" -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${@}"
+# changed to aliases to allow rsync, scp, and ssh to have 'wor' versions.
 
+worssh() {
+	ssh -D 9944 -o "ProxyCommand /usr/bin/nc -X 5 -x 127.0.0.1:9000 %h %p" -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${@}";
+}
+
+worscp() {
+	scp -o "ProxyCommand /usr/bin/nc -X 5 -x 127.0.0.1:9000 %h %p" -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${@}";
+}
+
+worrsync() {
+	rsync -e "ssh -o 'ProxyCommand /usr/bin/nc -X 5 -x 127.0.0.1:9000 %h %p' -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" "${@}";
+}