Merge branch 'home' of gitlabrador.amigadns.com:truck/mahbinstuff into home

NF_pick.sh

@@ -1,4 +1,4 @@
 #!/bin/zsh
-F=`dmenu -l 18 -fn 'Px437_ATI_SmallW_6x8 NF:style=Book:pixelsize=16:antialias=true' < ~/bin/nflist`
+F=`dmenu -i -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}"

amigaterm2.sh

@@ -4,7 +4,7 @@ if [[ $1 == '-h' ]]; then
     echo Help: $0 fontsize tintcolor fadepercent fadecolor cursorcolor extrashit
 else
 #TP="TopazPlus a600a1200a4000 for Powerline-$1"
-    TP="xft:TopazPlus a500a1000a2000 for Powerline-${1}:antialias=false,xft:Symbola-${1}:antialias=false"
+    TP="xft:Topaza500a1000a2000 NF-${1}:antialias=false,xft:Symbola-${1}:antialias=false"
     PN="xft:P0T\-NOoDLE for Powerline-${1}"
     MS="xft:mOsOul for Powerline-${1}"
     MK="xft:MicroKnightPlus for Powerline-${1}"

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

nflist

@@ -1,16 +1,15 @@
  MicroKnight NF:pixelsize=16:antialias=true
  mOsOulForPowerline NF:pixelsize=16:antialias=true
+ Topaza500a1000a2000 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
+ FantasqueSansMono Nerd Font-16:antialias=true:autohint=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
+ MonofurForPowerline Nerd Font-16:antialias=true:autohint=true
+ Px437_TandyNew_225 NF:style=2y:pixelsize=24: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
@@ -22,7 +21,6 @@
  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
@@ -30,6 +28,11 @@
  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
+ Px437_CompaqThin_8x14 NF:style=Thin\_8x14NerdFontCo:pixelsize=16:antialias=true
+ Px437_CompaqThin_8x8 NF:style=Thin\_8x8NerdFontCom:pixelsize=16:antialias=true
+ FantasqueSansMono Nerd Font:pixelsize=16:antialias=true:autohint=true
+ MonofurForPowerline Nerd Font:pixelsize=16:antialias=true:autohint=true
+ GohuFontMedium Nerd Font-16:antialias=true:autohint=false
  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
@@ -82,6 +85,7 @@
  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
+ P0T NF:style=NOoDLE: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

shellfonts.list

@@ -8,6 +8,7 @@ Monofur for Powerline
 Aurulent Sans Mono
 Dina ttf 10px-14
 Envy Code R
+FantasqueSansMono Nerd Font
 Fantasque Sans Mono
 Hermit
 Luculent