From 582090d354f1ce8d37cd4d5bd87540227da5831f Mon Sep 17 00:00:00 2001
From: Josh Sherman <joshsherman@gmail.com>
Date: Thu, 17 Mar 2022 22:44:34 -0500
Subject: [PATCH] Bit more cleanup and reverting git color settings

---
 .blackbox/blackbox-files.txt     |   4 ----
 .gitignore                       |   6 +-----
 git/.gitconfig                   |   8 ++++----
 ssh/.ssh/config.d/holidayapi.gpg | Bin 1203 -> 0 bytes
 ssh/.ssh/config.d/mailshake.gpg  | Bin 743 -> 0 bytes
 ssh/.ssh/config.d/risksmith.gpg  | Bin 1094 -> 0 bytes
 ssh/.ssh/config.d/sherman.gpg    | Bin 769 -> 0 bytes
 ssh/.ssh/config.gpg              | Bin 589 -> 1718 bytes
 8 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 ssh/.ssh/config.d/holidayapi.gpg
 delete mode 100644 ssh/.ssh/config.d/mailshake.gpg
 delete mode 100644 ssh/.ssh/config.d/risksmith.gpg
 delete mode 100644 ssh/.ssh/config.d/sherman.gpg

diff --git a/.blackbox/blackbox-files.txt b/.blackbox/blackbox-files.txt
index afbc9d1..0ba6c67 100644
--- a/.blackbox/blackbox-files.txt
+++ b/.blackbox/blackbox-files.txt
@@ -1,6 +1,2 @@
 git/.gituser
 ssh/.ssh/config
-ssh/.ssh/config.d/holidayapi
-ssh/.ssh/config.d/mailshake
-ssh/.ssh/config.d/risksmith
-ssh/.ssh/config.d/sherman
diff --git a/.gitignore b/.gitignore
index 6368b9c..e20c52a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,5 @@ known_hosts
 /.blackbox/pubring.kbx~
 /.blackbox/secring.gpg
 
-/ssh/.ssh/config
-/ssh/.ssh/config.d/holidayapi
-/ssh/.ssh/config.d/mailshake
-/ssh/.ssh/config.d/risksmith
-/ssh/.ssh/config.d/sherman
 /git/.gituser
+/ssh/.ssh/config
diff --git a/git/.gitconfig b/git/.gitconfig
index cdb2c6c..a9f6c7e 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -5,10 +5,10 @@
   helper = cache --timeout=86400
 
 [color]
-  branch = always
-  diff = always
-  interactive = always
-  status = always
+  branch = auto
+  diff = auto
+  interactive = auto
+  status = auto
 
 [core]
   editor = nvim
diff --git a/ssh/.ssh/config.d/holidayapi.gpg b/ssh/.ssh/config.d/holidayapi.gpg
deleted file mode 100644
index da3b7ed843c705755964e26a3126a1d12372cb7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1203
zcmV;k1Wfyd0t^EZ4j~z!4zC0O5CD{|O^B4~{=yaIH{f@6(~9HE=!mx(u>&D~NpI@D
z%=JOL9tP6z`&NtnJ9!0g$_b>3UP`;kJKp5w)5}|unLutvR2HB^E}sKmt2wRauI%|6
z!s}5o=$|Z-Eqx=F3Xl`2M)SOSEAX0eY{VpM4C}A|B|b_Sic78_m<_Z6o~>GeHsg>P
zdb@Vn?WTk`pMi4}3Qs^6raZ<v*ybY_<?B>V+nb=p;*N@zk+xS&fWb&s%kS5)YIuKB
zL^u1y@>lFR7%ecgTDh#G1<7{*aFFo>l?%M`#FIeHt9IgP$io`QhEUqnBp%k|=A0-A
z2vS2ZU)|wOd4m68qI>M!;iT}tmegTrpLi&U<R5}*8GG!d3%LCkJ}4cCG4?frjS?Bj
zL2u*3xgu7S_d;*j&bDXTq)1GIY<H>TQ@@|d-d?fZDd(W9-^Ni`r6mI}&&txCg&q0~
zA`+;qkZ}>gLWOQ%=2F+qjLnIkIYcX5EIx^TC5pNpufoknQWAQu#3?V#amE^D+HlyJ
z2HruwRMu!Gi_bv!AB_E2YFdgC{dKnVu0Q&QkwrEdHUO^j15hISm=N4I7EFU9wHWk|
z4#Bk*t|t6NdL#ME5n~{$#abG;m_N{7`+7Ai9<$*00k*rQG?=n1>ko**><Gcrv>tno
zIg*1F=so%9-4pb<O?}eo0rl-<Nq4R{OcT)1{iG?7ok2=2uQ(rhudRHWS>=`mMdEVC
zn>rh}_P_Ndq?C=ST!*|>)grJ){uj~QH8{K|DqW)2?;8EY+@@V?US%xUY=C8n)%zQ4
z-E+#i_&rd%7Ll9dePEAVy#*@H6o{3h6`~dB@>ZU+#+UGAUwg!yh#nH|b0T~B8`~;;
zX+-hqpym5~aiVkrJ1v`!%BEL}E6oLONK&g9k*Q<s%#q^B6E>r6;9wvc99`~QeZ#ZP
zyW@KajjLh!6T|h~oB*fenb&o8c=5g?hYEukTBQ_9x8MoW3rjL-uQc+OEFw~@UB0sk
z5_N2UFt%Kj9yeCijy#fb0?u!=+j@K^O??ynS%Lz!=&~|(?t`JMEzGQ@cprYbTZ8y)
zstkeEL$DQA@WV6x69E>Ua#lJzSO@=j(ly!hJqo7HN^(d*Fpw{wTfj&Uhg?P&2A}fj
z`DF{I@*t_=fsUIO_KYqxC<c2DZj<Ag=Ve{R-A9nq{{1}^bo_3aJBR7Yt4+2#(03>C
zvYFoE<*41{(sG<R$E<JgEnUgt)391TB-)U+9jsrB=8}>ZwDMS1yE6#)SSHrwfrsa<
zU>$HsOBbvUEuB1)fqN;)DG#mxxEh2l595FrGHWzlNisZUN>!PgZ;1CWP~q2Cj8v=|
z^Nz!omXQh*q255awbxbi$HD=a89n#VUQ`H5)zrhIB0W3OuTheVdv6-}kmBFQiU!~<
zlg?NWeZ^u?g(5-qb}|rBqQpbLIz~pvNgGib@Py3L{|F_I=;v(4FTn{o3PffauOJ2H
z@JmWNgy{$W{;_V$*$vG*pf9VyAY;1r+8%OsD|csN9NgUpyXyyQxi&=5!O1V}K6DwV
RP|wPWKGp%|T5)O<k3JFoTkHS;

diff --git a/ssh/.ssh/config.d/mailshake.gpg b/ssh/.ssh/config.d/mailshake.gpg
deleted file mode 100644
index b6140a418baf2d3f41d9281c46935e5364e16bc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 743
zcmV<D0vP>;0t^EZ4j~z!4zC0O5CFb-HN^>VdP4$3cJ0_o1P^KMw|I5-k4aKrzbUH+
zQ;t2gLoSyJQaa5487y~Cgf}UOvKkTRleY2=PFR>h^R>>t6<3|v!T(pJ7a^%+=9iwZ
z*P*JzO-={iF2J!lyC`*{+(g=ldOqP+ze$NrkG}v`x@b@%6=!EE)2MGpXJc-ooLcZ}
zG1k`}Q=~^{6d;3#b7-;djUSz(m&<2P8euG@wr6d=e9M(X&A1A_;#{|DY&U!!?F${k
zm?CdL->t`$hOOUz<+Q;V%gXbsXjOd+g@E_KbG<Aa1ouj7X*D53tn3hWARg9NCfu!#
ziaXKIh7G551(R0970x-9{4OUmI`wjMKZE@eqLsF;&f7_;7Kh1vcR-*WW*iPYnwB8s
zyy*_u+Ecy}PlRQdR?78#pdJI%kXnv}iI0~E|5@f>n?sG!bG5r|lds~0kqesd8?HwJ
z9klC2zsl!jWxw`Up$z!|_>_CNtw5|3RK}@P3VIc$1%o?@Xo~D_I#<1!QB}C+m~1~7
zzt%ejb5CuNh3+DNz$$0UmzTbgbIYSji>1;fAql1m?#rmkf0n4S#<WHU;8a$erquRM
z=w*I$RQ&d>w<fLItoBAJ-hiO_p$_O<V4xqv+w~jA43Fc=^mk?wJK@!rrx^OjSzF48
z2hSUJiRD6u>W+IRR43BF6#)Sz)juB45>#}M_@=w1y@M7UYD2i|ClXA(Bu>hdN^!n|
zMnPHcD(N^<_pdQ}@irq|#K~a%HL7#0^yrNbgTC&cF~r&Ly*?MDp1F1!3c4wCwMD^O
zOnid7oY*Df+@Y^dH){ct<x4m2O$#u`(oLjTXaU^?d~^&)bfK;vpYN@b#I52wn;xQR
zg`q&M*lbTZz+>!vX3=avGs9{()~R?#Y}NP_aNp{^pj0*Kh|%)W-x?Qb{tOW<KB!7r
Z(tG(Eq7=tUYm}>6?)~E`wMGn$wtB;AZ@B;f

diff --git a/ssh/.ssh/config.d/risksmith.gpg b/ssh/.ssh/config.d/risksmith.gpg
deleted file mode 100644
index 2fbe53f6b54b7262f815de8ba1384f9825b50379..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1094
zcmV-M1iAZ#0t^EZ4j~z!4zC0O5C3k7W?P-KIQ-yjfl1A{eC;gcWu$Y`E$S(-IP!Xi
zO1G}`^sV)1(dhqo)N4p@$p2%$(PzjAv7Edv4T7wn?O`%hFK8eLi0^!-f%>k~dqROl
z-CQ%%EG>6a@;4jrug|)Jo6&qFgpBN`^HWjFXLowm^G^dGHDt+F94xjV$|*<oO;Mc<
z=<5z;41Gt7wa4Oh{ip+BE3H~l$2u)j7xiV*Rt)FKK#fuiCQjGrVfeaXQ3$_dTA->W
zCJq=4e0wJmzjcg@BZCO9n%rv1{Wx;VcrU;ea|Kz$J)?t>00=6hJF7~Fd1T|$%iok%
zd%TU)X;qEvAF-^yyha4IH6h{(CWNLuw2#)?Ni%Es`u-lhBH@XuVK<9<G9iGJ@4*^)
zIK2@eVq_)1%SpHb$6@+!paVcuCDcEI3Eq;<fC>m{#7^7HPyy(9l)NCxeFB{m3s0P6
z2A$Iw*JC_EmUbPuAknZ|8u8``XyQ-9zs9nF`Cx<^X2YAYlu`h8m)x~7lf13AXi6g+
z=<Rd<!P-->v*(JxI2C{h1NJnd@;>^VBt$+`<6jO?=MXRXjT$#vy_Olvo)ECU7!N`I
z_4~-n5S2p^mgWdnIGOmm+SY0>-b)mA5^uDXiM~ci>Jas(_MT7_j#7aT_J(Jwz=d+r
zn_6u#fHvd3OCFZQ77o(s0h)I<-{;s4lF%;R7gtd_Vh|Hf(9wMQ+5J#KV<!|4E{EXR
zp4x1fd{F4mY&P{CPWoH;#xlo~x@<F`B(}j3g@^WGwoPvF;<S7~gKCx+hhUg9ViwSW
zse*?giWmrpvt&ktAP?zyG#05H1nT|W)X#i>75|`A%@{Z8&ku|I!7)lYU)7+->zFwF
z&4AxHvrF_bM}${KEM>!3#M3-B)3)35cqN4^DED#_vMi)(rA7o7u;v^QG8g@V(%r}p
z-c)cwZ!Gbngad*ylY&$P*nT4=qJHt)yd9}0m8ij-Bm;`xoXmR+ql3bQGkS|VSzF}t
z_ET<Z<kfh5QvT=2&2`J_Zu-A_l060w3A^Zw!b6Fb00HHol>`GFwfaz3v=B^$MTmQk
zLm6z37Qx`;sFZ6`p#gs1Q1e5@j%krRV~SWbnpc?qzs;rB)n;qi*SWQn0-lVUiSn{B
zWt2*X!8>Jw>2KY}!vry%8kmRg@H5H`vV8u9pmcEqF`B5`?jSWLzWU_XF7^W8XwLb^
zaA7?lRkv}U2aD6-A=@mJ5d|#Vy)YrZhn}zj+%2{#aG2h10J_*%oJd~fd#c~;c>#BZ
z41=I*&&$$A?ES<f`Zk(-Gj$lfW<Gf+L<Jj8LslHcMTTn6=7Eqt{_lLhGXARyfxC;0
zer&r$kkjTfG?<A%yns{BRyQ_Ol1=QS`$ja@JOe?uIzeMBN%ZAOKt_q~e7q9VSg)KN
M=sb)EUvGbgxK~;qGynhq

diff --git a/ssh/.ssh/config.d/sherman.gpg b/ssh/.ssh/config.d/sherman.gpg
deleted file mode 100644
index c17121c9ed8e552c6852b2f09c7164ef59080a89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 769
zcmV+c1OEJl0t^EZ4j~z!4zC0O5B@y}Nt@~5qTo!$BT78e<4szH4}bFEjS9b}PMN!M
ziwy4_!8ZQ`OMkxqk@6vu-NW5mJOv`U|NIJ6u+WzgcaW}~QJ4m@C$81G7yI`+%Cr_e
zT^H3r`ZvQhzbVA2z5>UQI>gdvbNa++P1bJUer`>DKZ74#Bkj`2{Y;g%Gbb74du_qF
zVw2DWota->6pp<jD&fs;^?j<Cnf#KqlE+Hxp(+6A(WK7+J>o**$S4Wz3X7}N87FLB
z;UeOyAv#frsROZEdD#l#hz3IsdBC1pe95kI+q=Kc@76B`_hhhD*wTV3cO$ja?Ys*^
z3P<8-cW>gZ!4c6?^g4VV0A%Ew-ak(mjFJyin*qy9<X1^~if&)})P>ChT;k8Jm$hh_
z%fv!`hlD$#RNsd=P{~JCVJCqNs46|FXSXZ3yFbU<tV{{*zP<Qr#t5(`$E|bM>?KTQ
z*A_K`X<|Vdp3Dks0R47)EA-)6w$8P<o8|cPCsVzcsL&=@)6oQkvoGh#a>`4I{k680
zB>H=4ULyP$gi1Gp5|P7w$x=yrnNJ0_NdqZQT`IZAZ->k(${VnPX(9H4gbIEe?4ktQ
zUT8G6trPW<6sJ{y+*OIu3lk6WVj93=gasj=9Qp=?;^~3~X$hH`ay>lSElUQ+B<eGU
zD%6ARp6&>&r4zz8#huc?F98#kw<~(UxUt9hBqvi?1Dtt<k!)%%=0>36Z|tZg{kysY
zA1{GdLagT3vf}tg)G}h>>`fZL$rBMd`${58R~<o#+Rn4G#+%y`t$)T@aOo`*7Y|4Y
zI7iZy#2mM!L?`UjDWE_hmtTCVqvr{#a!*iOMz)~aPoSDkK?`AkcU@yfY~KzY`HK)%
zlJ+~ux5`>|wZ06N*jvc|f3w+5k?;2^z4Wm@)T<6-io$02<bYmj^~O$7Eq%_AGr0WC
zhtwb8(7al;BrR{;VR6^wsrrMo96h^t!x8TcHcq@FoL&c@1aV-_qO3j5TV8(!RjPmb

diff --git a/ssh/.ssh/config.gpg b/ssh/.ssh/config.gpg
index c27d0a5aa3e3e986c121aad7cfea1647f6329450..c71ead5d3fe5682cc375b1ac61b8086438bb016d 100644
GIT binary patch
literal 1718
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
M_&_|<rGwdspIeqxx&QzG

literal 589
zcmV-T0<!&u0t^EZ4j~z!4zC0O5CDuoOZMx47lZX!gH^o85?(Et48W?BW-uMUXTJm6
zSkXNxD%@pvPdE9eYPEUak?XB$h&v^`R;ph9Q?`9THC;{u&T5V1QPi`DVF>kby5+?g
zoa@397{Wp<3>&^Y8Y;Z)@1r>NAoZj@!dLpOu|F5O{d4;klMUlKEjf8%u0B4$)+bdv
z>8)<;$I?qi=TM@X_C%q+So7S`beu}+4WB=X2G25*IgwgfQTf{z-2z{smwUrHARPSk
zCBbcHY7PFclm{xzsM@lfQRk|s*l>!UmUw4bUpAkBlmaP)7i?<^)<2w9HC@5hy9zyD
zMdKknuudmiDYcB7uJo$!I%$?{lg(!SESp(~_b@OZo%Q)BVg6Y?TNRA;?Vg+(O((js
zh^v7HAs-5pv~Rc?K`H|D{2pxL-p263VhzJJaL?_eM3{+&Qkvxma8BN!q*8I5uw!G*
zoPK*n65e3;0GL6NZXj#J$TcpFS8etL1R{rsQ471;Ezn1MyS$0ZZYh#3kZ4Xyl*h-o
zA}@)&cHWi4Kkic;tN8JC3=$%;8!AvrmDIQSoRZ3uU|u|Vq3QxKXKVBFc5YRlVlCTr
zmL_qKnz?~`ApkJ*7mAg1o#~{d5@N{Yko*^!FfLj2e;w!iX`@b8XjZJ!bcm*9NGgHb
zY7!u-yDhG0qpfb%RQA$50c|XclLDM=ZaK8~m7NmH>T26^?v|A6oX=KuwH8Q3BHXeH
b_8{}!(YChQBg6dfIj5yccyx9ZO}ELe$R;A!