diff --git a/.gitmodules b/.gitmodules index cfcbd12..d6bf699 100644 --- a/.gitmodules +++ b/.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 diff --git a/NF_pick.sh b/NF_pick.sh new file mode 100755 index 0000000..35ce709 --- /dev/null +++ b/NF_pick.sh @@ -0,0 +1,4 @@ +#!/bin/zsh +F=`dmenu -l 18 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true' < ~/bin/nflist` +C=`ls ~/bin/st* |dmenu -l 8 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true'` +${C} -f "${F}" diff --git a/aliases b/aliases index a7181c2..5ec1ab6 100644 --- a/aliases +++ b/aliases @@ -12,3 +12,19 @@ mktruckdir() { sudo mkdir ${1} sudo chown truck:truck ${1} } + +shitwin() { + xfreerdp2 /u:"Andrew Holland" +clipboard /jpeg /size:1918x1044 /v:192.168.1.92 /bpp:32 +} + +firewall-ssh() { + badssh -oKexAlgorithms=+diffie-hellman-group1-sha1 ntcadmin@77.86.234.126 +} + +randmac() { + dd if=/dev/urandom bs=4096 count=1 2>/dev/null | sha1sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/' +} + +randmacxen() { + dd if=/dev/urandom bs=4096 count=1 2>/dev/null | sha1sum| sed 's/^\(..\)\(..\)\(..\).*$/00:16:3E:\1:\2:\3'/ +} diff --git a/dotmg b/dotmg new file mode 100644 index 0000000..15fb129 --- /dev/null +++ b/dotmg @@ -0,0 +1,3 @@ +global-set-key "\^?" delete-backward-char +global-set-key "\^h\^h" bsmap-mode +global-set-key "\^hh" help-help diff --git a/fonts/Envy Code R PR7/Envy Code R Bold.ttf b/fonts/Envy Code R PR7/Envy Code R Bold.ttf new file mode 100644 index 0000000..5e04b16 Binary files /dev/null and b/fonts/Envy Code R PR7/Envy Code R Bold.ttf differ diff --git a/fonts/Envy Code R PR7/Envy Code R Command Prompt.reg b/fonts/Envy Code R PR7/Envy Code R Command Prompt.reg new file mode 100644 index 0000000..453c58b Binary files /dev/null and b/fonts/Envy Code R PR7/Envy Code R Command Prompt.reg differ diff --git a/fonts/Envy Code R PR7/Envy Code R Italic.ttf b/fonts/Envy Code R PR7/Envy Code R Italic.ttf new file mode 100644 index 0000000..cf67fe0 Binary files /dev/null and b/fonts/Envy Code R PR7/Envy Code R Italic.ttf differ diff --git a/fonts/Envy Code R PR7/Envy Code R.ttf b/fonts/Envy Code R PR7/Envy Code R.ttf new file mode 100644 index 0000000..e8e4a60 Binary files /dev/null and b/fonts/Envy Code R PR7/Envy Code R.ttf differ diff --git a/fonts/Envy Code R PR7/Read Me.txt b/fonts/Envy Code R PR7/Read Me.txt new file mode 100644 index 0000000..fcee4c4 --- /dev/null +++ b/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. \ No newline at end of file diff --git a/fonts/Envy Code R PR7/Visual Studio italics-as-bold/Envy Code R VS Italic-as-bold.ttf b/fonts/Envy Code R PR7/Visual Studio italics-as-bold/Envy Code R VS Italic-as-bold.ttf new file mode 100644 index 0000000..19f2b50 Binary files /dev/null and b/fonts/Envy Code R PR7/Visual Studio italics-as-bold/Envy Code R VS Italic-as-bold.ttf differ diff --git a/fonts/Envy Code R PR7/Visual Studio italics-as-bold/Envy Code R VS.ttf b/fonts/Envy Code R PR7/Visual Studio italics-as-bold/Envy Code R VS.ttf new file mode 100644 index 0000000..f0b2c50 Binary files /dev/null and b/fonts/Envy Code R PR7/Visual Studio italics-as-bold/Envy Code R VS.ttf differ diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..a81309c --- /dev/null +++ b/gitconfig @@ -0,0 +1,16 @@ +[alias] + tree = !"git lg1" + lg = !"git lg1" + lg1 = !"git lg1-specific --all" + lg2 = !"git lg2-specific --all" + lg3 = !"git lg3-specific --all" + + lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' + lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' + lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)' + +[user] + name = HELLO I REQUIRE CHANGING + email = THIS EMAIL IS ALL WHACKED +[merge] + tool = emerge diff --git a/nflist b/nflist new file mode 100755 index 0000000..7c2f9bd --- /dev/null +++ b/nflist @@ -0,0 +1,136 @@ + MicroKnight NF:pixelsize=16:antialias=true + mOsOulForPowerline NF:pixelsize=16:antialias=true + mOsOul NF:pixelsize=16:antialias=true + P0TForPowerline NF:style=NOoDLE:pixelsize=16:antialias=true + P0T NF:style=NOoDLE:pixelsize=16:antialias=true + Px437_IBM_CGAthin NF:style=Medium:pixelsize=16:antialias=true + Px437_Kaypro2k NF:style=Regular:pixelsize=16:antialias=true + Topaza500a1000a2000 NF:pixelsize=16:antialias=true + Topaza600a1200a400 NF:pixelsize=16:antialias=true + Topaza600a1200a400 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_AMI_BIOS NF:style=2y:pixelsize=16:antialias=true + Px437_AmstradPC1512 NF:style=2y:pixelsize=16:antialias=true + Px437_ATI_8x8 NF:style=2y:pixelsize=16:antialias=true + Px437_DTK_BIOS NF:style=2y:pixelsize=16:antialias=true + Px437_IBM_BIOS NF:style=2y:pixelsize=16:antialias=true + Px437_IBM_CGA NF:style=2y:pixelsize=16:antialias=true + Px437_IBM_CGAthin NF:style=2y:pixelsize=16:antialias=true + Px437_IBM_Conv NF:style=2y:pixelsize=16:antialias=true + Px437_ITT_BIOS NF:style=2y:pixelsize=16:antialias=true + Px437_Phoenix_BIOS NF:style=2y:pixelsize=16:antialias=true + Px437_PhoenixEGA_8x8 NF:style=2y:pixelsize=16:antialias=true + Px437_TandyNew_225 NF:style=2y:pixelsize=24:antialias=true + Px437_TandyNew_TV NF:style=2y:pixelsize=16:antialias=true + Px437_TandyOld_225 NF:style=2y:pixelsize=24:antialias=true + Px437_TandyOld_TV NF:style=2y:pixelsize=16:antialias=true + Px437_Verite_8x8 NF:style=2y:pixelsize=16:antialias=true + Px437_VTech_BIOS NF:style=2y:pixelsize=16:antialias=true + Px437_Wyse700a NF:style=2y:pixelsize=16:antialias=true + Px437_Wyse700b NF:style=2y:pixelsize=16:antialias=true + MicroKnight NF:style=Book:pixelsize=16:antialias=true + mOsOulForPowerline NF:style=Book:pixelsize=16:antialias=true + Px437_AMI_BIOS NF:style=Book:pixelsize=16:antialias=true + Px437_AmstradPC1512 NF:style=Book:pixelsize=16:antialias=true + Px437_ATI_8x14 NF:style=Book:pixelsize=16:antialias=true + Px437_ATI_8x16 NF:style=Book:pixelsize=16:antialias=true + Px437_ATI_8x8 NF:style=Book:pixelsize=16:antialias=true + Px437_ATI_9x14 NF:style=Book:pixelsize=16:antialias=true + Px437_ATI_9x16 NF:style=Book:pixelsize=16:antialias=true + Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true + Px437_ATT_PC6300 NF:style=Book:pixelsize=16:antialias=true + Px437_DTK_BIOS NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_3270pc NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_BIOS NF:style=2y:pixelsize=16:antialias=true + Px437_IBM_BIOS NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_CGA NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_CGAthin NF:style=2y:pixelsize=16:antialias=true + Px437_IBM_CGAthin NF:style=Medium:pixelsize=16:antialias=true + Px437_IBM_Conv NF:style=2y:pixelsize=16:antialias=true + Px437_IBM_Conv NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_EGA8 NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_EGA9 NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_ISO8 NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_ISO9 NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_MDA NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_PGC NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_VGA8 NF:style=Book:pixelsize=16:antialias=true + Px437_IBM_VGA9 NF:style=Book:pixelsize=16:antialias=true + Px437_ITT_BIOS NF:style=Book:pixelsize=16:antialias=true + Px437_Kaypro2K NF:style=Book:pixelsize=16:antialias=true + Px437_Phoenix_BIOS NF:style=Book:pixelsize=16:antialias=true + Px437_PhoenixEGA_8x14 NF:style=Book:pixelsize=16:antialias=true + Px437_PhoenixEGA_8x16 NF:style=Book:pixelsize=16:antialias=true + Px437_PhoenixEGA_8x8 NF:style=Book:pixelsize=16:antialias=true + Px437_PhoenixEGA_9x14 NF:style=Book:pixelsize=16:antialias=true + Px437_TandyNew_225 NF:style=Book:pixelsize=16:antialias=true + Px437_TandyNew_Mono NF:style=Book:pixelsize=16:antialias=true + Px437_TandyNew_TV NF:style=Book:pixelsize=16:antialias=true + Px437_TandyOld_225 NF:style=Book:pixelsize=16:antialias=true + Px437_TandyOld_TV NF:style=Book:pixelsize=16:antialias=true + Px437_ToshibaLCD_8x16 NF:style=Book:pixelsize=16:antialias=true + Px437_ToshibaLCD_8x8 NF:style=Book:pixelsize=16:antialias=true + Px437_Verite_8x14 NF:style=Book:pixelsize=16:antialias=true + Px437_Verite_8x16 NF:style=Book:pixelsize=16:antialias=true + Px437_Verite_8x8 NF:style=Book:pixelsize=16:antialias=true + Px437_Verite_9x14 NF:style=Book:pixelsize=16:antialias=true + Px437_Verite_9x16 NF:style=Book:pixelsize=16:antialias=true + Px437_VGA_SquarePx NF:style=Book:pixelsize=16:antialias=true + Px437_VTech_BIOS NF:style=Book:pixelsize=16:antialias=true + Px437_Wyse700a NF:style=Book:pixelsize=16:antialias=true + Px437_Wyse700b NF:style=Book:pixelsize=16:antialias=true + Topaza500a1000a2000 NF:style=Book:pixelsize=16:antialias=true + MicroKnight NF:pixelsize=16:antialias=true + MicroKnight NF:style=Book:pixelsize=16:antialias=true + MicroKnight NF:style=PlusFontAwesomeMon:pixelsize=16:antialias=true + MicroKnight NF:style=PlusFontAwesomePlu:pixelsize=16:antialias=true + MicroKnight NF:style=PlusFontLinuxMono:pixelsize=16:antialias=true + MicroKnight NF:style=PlusOcticonsPlusFo:pixelsize=16:antialias=true + MicroKnight NF:style=PlusOcticonsPlusPo:pixelsize=16:antialias=true + MicroKnight NF:style=PlusPomiconsPlusFo:pixelsize=16:antialias=true + MicroKnightPlusForPowerline NF:style=Regular,Book:pixelsize=16:antialias=true + MicroKnightPlusForPowerline NF:style=Regular,Mo:pixelsize=16:antialias=true + MicroKnightPlusForPowerline NF:style=Regular,Pl:pixelsize=16:antialias=true + MicroKnightPlus NF:style=Regular,PlusFontLinux:pixelsize=16:antialias=true + MicroKnightPlus NF:style=Regular,PlusFontLinuxM:pixelsize=16:antialias=true + MicroKnightPlus NF:style=Regular,PlusOcticonsMo:pixelsize=16:antialias=true + MicroKnightPlus NF:style=Regular,PlusOcticonsPl:pixelsize=16:antialias=true + MicroKnightPlus NF:style=Regular,PlusPomiconsMo:pixelsize=16:antialias=true + MicroKnightPlus NF:style=Regular,PlusPomiconsPl:pixelsize=16:antialias=true + TopazPlusa500a1000a2000 NF:style=PlusFo:pixelsize=16:antialias=true + TopazPlusa500a1000a2000 NF:style=PlusOc:pixelsize=16:antialias=true + TopazPlusa500a1000a2000 NF:style=PlusPo:pixelsize=16:antialias=true + TopazPlusa600a1200a4000 NF:pixelsize=16:antialias=true + TopazPlusa600a1200a4000 NF:style=Book:pixelsize=16:antialias=true + TopazPlusa600a1200a4000 NF:style=PlusFo:pixelsize=16:antialias=true + TopazPlusa600a1200a4000 NF:style=PlusOc:pixelsize=16:antialias=true + TopazPlusa600a1200a4000 NF:style=PlusPo:pixelsize=16:antialias=true + mOsOulForPowerline NF:style=PlusFontLin:pixelsize=16:antialias=true + mOsOulForPowerline NF:style=PlusOcticon:pixelsize=16:antialias=true + mOsOulForPowerline NF:style=PlusPomicon:pixelsize=16:antialias=true + mOsOul NF:style=PlusFontAwesomePlusPomi:pixelsize=16:antialias=true + mOsOul NF:style=PlusOcticonsPlusFontLin:pixelsize=16:antialias=true + mOsOul NF:style=PlusOcticonsPlusPomicon:pixelsize=16:antialias=true + mOsOul NF:style=PlusPomiconsPlusFontLin:pixelsize=16:antialias=true + mOsOulForPowerline NF:pixelsize=16:antialias=true + mOsOulForPowerline NF:style=Book:pixelsize=16:antialias=true + mOsOulForPowerline NF:style=PlusFontAwe:pixelsize=16:antialias=true + Topaza500a1000a2000 NF:style=PlusFontAw:pixelsize=16:antialias=true + Topaza500a1000a2000 NF:style=PlusFontLi:pixelsize=16:antialias=true + Topaza500a1000a2000 NF:style=PlusOctico:pixelsize=16:antialias=true + Topaza500a1000a2000 NF:style=PlusPomico:pixelsize=16:antialias=true + Topaza600a1200a400 NF:style=PlusFontAwe:pixelsize=16:antialias=true + Topaza600a1200a400 NF:style=PlusFontLin:pixelsize=16:antialias=true + Topaza600a1200a400 NF:style=PlusOcticon:pixelsize=16:antialias=true + Topaza600a1200a400 NF:style=PlusPomicon:pixelsize=16:antialias=true + Px437_ATT_PC6300 NF:style=2x:pixelsize=16:antialias=true + Px437_IBM_BIOS NF:style=2x:pixelsize=16:antialias=true + Px437_IBM_Conv NF:style=2x:pixelsize=16:antialias=true + Px437_IBM_EGA8 NF:style=2x:pixelsize=16:antialias=true + Px437_IBM_EGA9 NF:style=2x:pixelsize=16:antialias=true + Px437_IBM_PGC NF:style=2x:pixelsize=16:antialias=true + Px437_IBM_VGA8 NF:style=2x:pixelsize=16:antialias=true + Px437_IBM_VGA9 NF:style=2x:pixelsize=16:antialias=true + Topaza600a1200a400 NF:style=Book:pixelsize=16:antialias=true diff --git a/pickfontrand2.sh b/pickfontrand2.sh index 46eaca2..a7985b4 100755 --- a/pickfontrand2.sh +++ b/pickfontrand2.sh @@ -2,4 +2,4 @@ font=`fc-list | cut -d: -f2 | sort | uniq | shuf | dmenu -i -l 10` size=`echo what size|dmenu` -/usr/local/bin/st -f "$font-$size" $@ +st -f "$font-$size" $@ diff --git a/powerline-shell b/powerline-shell new file mode 160000 index 0000000..d48f383 --- /dev/null +++ b/powerline-shell @@ -0,0 +1 @@ +Subproject commit d48f383112f5520c4c33d69dca0806e127f495d7 diff --git a/powerline-shell-init b/powerline-shell-init old mode 100644 new mode 100755 index c740ea5..1214740 --- a/powerline-shell-init +++ b/powerline-shell-init @@ -1,5 +1,5 @@ function powerline_precmd() { - PS1="$(/home/truck/sturf/banga-powerline/powerline-shell.py $? --shell zsh 2> /dev/null)" + PS1="$(~/bin/powerline-shell/powerline-shell.py $? --colorize-hostname --cwd-max-depth 3 --cwd-max-dir-size 6 --shell zsh 2> /dev/null)" } function install_powerline_precmd() { diff --git a/randterm.sh b/randterm.sh index 422f9e3..58579f1 100755 --- a/randterm.sh +++ b/randterm.sh @@ -13,4 +13,4 @@ DASHP=$(( $DASHP + 10 )) #DAFADE=$(( $DAFADE + 50 )) #Help: /home/andrew/bin//amigaterm2.sh fontsize tintcolor fadepercent fadecolor cursorcolor extrashit -~/bin/amigaterm2.sh 10 "$DACOL" "$DAFADE" "$DAFCOL" green -sh "$DASHP" -pe selection-to-clipboard "$@" +~/bin/amigaterm2.sh 12 "$DACOL" "$DAFADE" "$DAFCOL" green -sh "$DASHP" -pe selection-to-clipboard "$@" diff --git a/shellfonts.list b/shellfonts.list index abab3d7..05f7085 100644 --- a/shellfonts.list +++ b/shellfonts.list @@ -4,6 +4,7 @@ TopazPlus a600a1200a4000 for Powerline mOsOul for Powerline Code New Roman Monofur +Monofur for Powerline Aurulent Sans Mono Dina ttf 10px-14 Envy Code R @@ -18,6 +19,10 @@ Px437 ToshibaLCD 8x16 Px437 Verite 8x14 Px437 IBM PS/2thin4 Px437 AmstradPC1512\-2y +Px437 VGA SquarePx-24 +3270Medium Nerd Font +FantasqueSansMono Nerd Font +MonofurForPowerline Nerd Font CodingFontTobi Clean @@ -33,6 +38,7 @@ ProggyTinySZ ProggyTinyTT ProggyTinyTTSZ progsole +mplus Nerd Font P0T\-NOoDLE for Powerline CPMono_v07,CPMono_v07 Bold @@ -44,6 +50,8 @@ PixelCarnageMonoTT:autohint=true:antialias=true:pixelsize=16 Share\-TechMonoTrue Ubuntu Mono Verily Serif Mono +Lekton Nerd Font +HeavyData Nerd Font AverageMono BPmono diff --git a/worssh b/worssh old mode 100755 new mode 100644 index 2c2a1f0..57f9cc0 --- a/worssh +++ b/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" "${@}"; +}