From 589d745ee7c4fbf2d246880572c785ebe4b0cde8 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 11 Jun 2018 10:44:14 +0200
Subject: [PATCH 01/32] Regenerate font cache *after* deleting links

---
 bin/font_update | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/font_update b/bin/font_update
index 8bbedb1..6282507 100755
--- a/bin/font_update
+++ b/bin/font_update
@@ -135,15 +135,12 @@ else
         while read -r FONT; do
             install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
         done <<< "$FONTS_VARIOUS"
-        # Just to be sure, clear your font cache and restart Firefox
         if [ ! -e "${HOME}/.config/fontconfig" ]; then
             mkdir -p "${HOME}/.config/fontconfig"
         fi
         if [ ! -e "${HOME}/.config/fontconfig/fonts.conf" ]; then
             ln -s "${SOURCE_DIR}/fonts.conf" "${HOME}/.config/fontconfig/"
         fi
-        fc-cache -f -v
-        echo 'You might want to restart your browser'
         # Delete obsolete fonts
         while read -r FONT; do
             if [ -L "$DEST_DIR/$FONT" ]; then
@@ -151,6 +148,9 @@ else
                 rm "$DEST_DIR/$FONT"
             fi
         done <<< "$FONTS_DELETE"
+        # Just to be sure, clear and refresh your font cache and restart Firefox
+        fc-cache -f -v
+        echo 'You might want to restart your browser'
     else
         echo "$SOURCE_DIR not found, aborting"
     fi

From a806167020361ad48625dfa87f4ad2013d4b051b Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Tue, 12 Jun 2018 11:55:51 +0200
Subject: [PATCH 02/32] Summary of contributors

---
 .config/fish/config.fish | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 586f154..0b0749c 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -62,6 +62,7 @@ alias gd "git diff"
 alias gst "git status"
 alias ga "git add -A"
 alias gl "git log"
+alias gls "git shortlog --summary"
 alias gt 'git tag|less'
 #alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c'
 

From 43f92d98b500a1ffa777d117980773decdd483ed Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sun, 1 Jul 2018 21:46:39 +0200
Subject: [PATCH 03/32] Words

---
 .vim/spell/nl.utf-8.add     |   3 +++
 .vim/spell/nl.utf-8.add.spl | Bin 1246 -> 1291 bytes
 2 files changed, 3 insertions(+)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index bf63481..c7690ea 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -71,3 +71,6 @@ varkenshaassaté
 sajoerboontjes
 zonneluifel
 stellingkast
+Hoenderloo
+Garmin
+Termux
diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl
index 887ed30a6e0c8e282a38eb554e6985743611f8f7..f4777e767d1049a358b5977e640889bbb7f5c04b 100644
GIT binary patch
literal 1291
zcmZuxJ#Q015WQI&<sX1VM-?GtAyP+*#3=;@t}Kw~)^}^)_n!97pCH8VNI_3Sm5wrX
z{s{j8!F#iIM^5M4oqh9W=FMzAyn8?Nu4%6RCduU2Q@hM^w^|ovRkxk*!!T}l`{Tqm
z8|h>%PI?Klkx>S`iEPD8VczJr1cWPNo>)ne*M$$G$$F__?FE+EAXdCduv}b9BOb0D
zI0rp+*gJrGd>hHJ1}+V<lNsEs#xG@sxK7NssRcc7N1%Z#JA5<swCY>HgZVOSgH;JX
zkKC=aY9nKRO6xEw!v@$+%b?u@UBD9kYhb~~TD*cb2uwHwla@hxS>kaxu}G5VTf6~*
z6*ohv#vNf`E)hmJTo;WJcvF(S<|cK<k6J0I141nEQXTBeYGPdgQwt`7yHmvnd|4qC
zVrcs2z%;1E>aJCmh^Km*dg`Tuj`WEBRInm`K_1QS(4vXC+Whp=x>z$uf(>LD@^jP>
z1zeey+>H~5u>sA^9wck7-tbpe-mJJ`HFAyVaujVa$|{dkY(&9Y+$&Awdj~*=hi7ZF
zi9@4fQ&P+=?6Fn53!5>5Yg!0cX}LkgW5)8>nIag^{xMtNVy>T7D6dr<tY56LUP+PV
zZzdD9DWfWB4O&i!B<5KW^|^7Vg6*S5a=`%2DOv5=OA8KO1)Tl~Q^(<D167}Nk8g>3
zIA{!~xz4=-_&N_7|ICMsW^sOSc-Kr3l}t70IlgQ(q{PE9ctE&h_5<gG=~%^?g%UCt
zj_)aSjpr;aZ_QTEWPZ9WpDj)+)W-BEyF9So(u5H;M0p(g67NL-0U%#F8Nn<$k&H`q
zB$-^XiEOH=GK0qR!n6J8F6*5;{JfwT*?DTy9z@!%+d&S>)T+hm?WfN0xyAKj(-0!3
a7L4Agt}JquB*}AmD+~GfpMNJf#NR)Nh58-<

literal 1246
zcmZuxJ&)5s5cRAB)D$#Sbcawti1wr_%rz8gI0T~HIGgx;t+k!6ir+wqM2#p<l$4bG
z4hnw7@!o9GahBut%$qkeZ^rlj&0^?X)4aM%lJv_XyUbT^y(z1@?R+1Gal6|eQ`=0^
z$wr*?5@eE52Hc5k#mr!y^tA+pCu8neNs<?Z52ML@sbTE}miZu7yh(7pxsXOYLOXB{
z>U4N_0QYz{vceg-EXYotBg|_4Qr5`p#C)1r&;xe_8n~jvGuKF~u>~SnFVi+Sm5B4G
z-Ab!AGWMsk4rv)CU^{Jtb`Nv`ON_691si+u3Yw6Za3&@#lk~F0<>0X>lKw63fW(TM
zqgCUMFtC;gBOIYOjS_fMlD+0j=8PY;Q&I<{SmLHScrPmB!l}svo@|PuFdN}3Bxq2+
z)wfnEh(upRQl5&Q8%AjAeTxaL)aGXw*2RW6Z%&6b%I8tZ3WQQggl9f=*b1Dk_MqAD
z^l}r$$U3v;E6bHjtdFBAgHdL=r6eOdDjD-ki}~6C(BYzQgE??3bT103wS_&-V)wx2
zApPx{77A6WN>FuJwcK{52*z_jtP(iQA|Kaiu~i(b!5Zt86b1ZcF;Sl~DwEZq<q80L
zS454j9J=6qsFU1hg634L4&|u@2X`IbKOyCEPVf(~u(7x$vhW7}%T>^nX9^TCk2?Y9
z&t`^10rRTC$d%+Ip&l;I`4=)I^Y8Evreon}7OKW%aQ~pTHLkOo{1Ue6lf~%^I9hls
zw8QeKw0vWWr3oX1ii$XlBJO$s0U#q6BA6vtj(I7FB<VxWjdL__bAws)Bj&_0Q1-iU
z_<2Gx^7C3|J&07`>p>36)T+hm7fopqbB#}ib3%&O)PmU?)s;=IlO%a8nY@z^|M?dI
HC;t8co>uX%


From d7468b2423b2ff94733839ccbaaf2e1240cab263 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Fri, 13 Jul 2018 11:07:31 +0200
Subject: [PATCH 04/32] Vocabulary

---
 .vim/spell/nl.utf-8.add     |   1 +
 .vim/spell/nl.utf-8.add.spl | Bin 1291 -> 1296 bytes
 2 files changed, 1 insertion(+)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index c7690ea..b76b1eb 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -74,3 +74,4 @@ stellingkast
 Hoenderloo
 Garmin
 Termux
+varkenssaté
diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl
index f4777e767d1049a358b5977e640889bbb7f5c04b..ff549b7b14797d2b3e778d4d46c326b2702720bd 100644
GIT binary patch
delta 54
zcmeC?n!v>u=IL8pkeZWY^q+x&dCx|^1I&C(8O4l=Kv>Mk$iVbs@^$7}jK-6TSdti1
JCtqbT0|3Mv5P1Lq

delta 49
zcmbQh)y>5h=IL8pkeZWY^q+x&dG|)X1I(O^8H|ZQSj;&24)ZKVqsiqgNsK9zZ?TvG
E0C~p`ApigX


From 6242ca7a686cfbb12f478747f8d5bb52845f6a4c Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sat, 14 Jul 2018 09:40:09 +0200
Subject: [PATCH 05/32] Word

---
 .vim/spell/nl.utf-8.add     |   1 +
 .vim/spell/nl.utf-8.add.spl | Bin 1296 -> 1317 bytes
 2 files changed, 1 insertion(+)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index b76b1eb..b157311 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -75,3 +75,4 @@ Hoenderloo
 Garmin
 Termux
 varkenssaté
+tomatenplant
diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl
index ff549b7b14797d2b3e778d4d46c326b2702720bd..7a8a9af4a287a4efb7930082e00efc68e21e0259 100644
GIT binary patch
delta 74
zcmbQhwUmo5%+t5HAT=k)=syDk^VyAjeate<j0}u6DY-?AiHs$Tsf>Ay1&ldBHX{Rr
dcHZR0%odD4C*NV7#pp7*oF$2|Z1OD@GXMrz6(#@x

delta 53
zcmZ3=HGzvS%+t5HAT=k)=syDk^PY`-ea!4kj0}u6DMgcaFk3LbnEa7>7Nhax9+o7=
J)XDEz%mBf55i9@z


From c5e88b9e3bb8d8d9f40d42ef70207b282265381e Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sat, 14 Jul 2018 11:27:53 +0200
Subject: [PATCH 06/32] Vocubulary

---
 .vim/spell/nl.utf-8.add     |   1 +
 .vim/spell/nl.utf-8.add.spl | Bin 1296 -> 1309 bytes
 2 files changed, 1 insertion(+)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index b76b1eb..db0bc53 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -75,3 +75,4 @@ Hoenderloo
 Garmin
 Termux
 varkenssaté
+e-reader
diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl
index ff549b7b14797d2b3e778d4d46c326b2702720bd..18921d3cf0ae9f75a061204f3929f6e4b4b395f9 100644
GIT binary patch
delta 348
zcmXAky-EW?6ou!^tO^kV;tz<5KZS)5h+9}G3PB--O$r+=9OHydoXmvXjbN-S#8$Yq
zg-9O2%FfQt+CqE@pFr>IHZ#My=X`VSW96w*J!u|i17mIcCxrTVt)5|4)*Mn8Xk79M
zA!;dE)F&WN&uNVD%v)Z_33}-A3ompk7gxQP9d>VD1*thw+E`{}()b{J5y{5BH@5F{
z&Ur?sxZt~-I+>)>4`C75@TMfUI~by0_*lKCd9{T#I#98cla#B?so2Z#8$GLKuJNu`
z@Jm1HXerhl<2JXNK|S6?!yyakPuhz%@IdF$!t|~yrVuityJ+q(Hf&h$vayYXBMfK^
gxM|U;mEnf_c?JhXW5jP;_H4PZ<~0YDqwi?v9|@mKQUCw|

delta 345
zcmXAkze)o^5XSG@JrIMW6;TUQSO`LlU?rpo5hCO&u@IX}*z<DP>>l?=L{!Kd2-5`w
z8{2@^7J{Yt9O^@e&R$rUo%v??elriX`&#|9*UwX>b?eXb<m+?&90G=J(OfQ|0MFaa
z=mk%`c~KQH5{x**tdL5VPHSI5<HBWoE+Voba>dvchu1Px8X<C_tP?)zQFPjo(i2;-
zmt{zX0so7x5pgDL$&QYPNG)h*5lT#|IaY6|A$PD!ec2NDrK#Lr3aoH6n#&E$=tFMe
zn||aG0&4nec&B5(adKxIObjw!NAt5V%#izr83|`184BKYjFg)pH;wZQ6o;)5atsl(
b%%^oyHmdgP(wo1&(lze5OJ}C&%Rl%BndnUG


From 20f0e2f05aeb20f8541f90c8a455ca402475d09e Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sat, 14 Jul 2018 11:30:16 +0200
Subject: [PATCH 07/32] Vocabulary, resolved merge conflict

---
 .vim/spell/nl.utf-8.add     |   5 ++---
 .vim/spell/nl.utf-8.add.spl | Bin 1309 -> 1360 bytes
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index bc69ed7..1fc2e4e 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -75,8 +75,7 @@ Hoenderloo
 Garmin
 Termux
 varkenssaté
-<<<<<<< HEAD
 e-reader
-=======
 tomatenplant
->>>>>>> 6242ca7a686cfbb12f478747f8d5bb52845f6a4c
+macarons
+bijgekletst
diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl
index 18921d3cf0ae9f75a061204f3929f6e4b4b395f9..74129c2b8650223fd77702ca91933b61c276423c 100644
GIT binary patch
delta 688
zcmXw0zl#$=7~O9ss9bS{Tp`|hg@{3q^-xeNS>y^)&_<I=I3{~@*-bV(VY69JIXG-Y
z%Q#y47ue)aFkm6r*!m|3>BUOlo182=eDnQy-+OO9t^HVA?>>Ay8QY?`^*4(2a<=~9
z+!-TLw43F#=bPs{Z5c>ktPG_Pq}z7(@`*IFZ%5Mj`|>pIgmmmw?xaK)diJbxH3GR;
zi<2IHj-$}{h2$q4i+h-QGm@zsu+nj@wy}<3T&lD$Mk>s)QUaC}!23$nD9%7B=Y3vl
zTTGctj)2%_bd#qXJ9Wql*Gl)5HnsrdL}A4VGRqvGHK-9L+8OZtT%v=^SnJCKD<}9+
zX>!C3@+1+(FV32jD{L`>%t4S>1(_r)%Ti^Pa#IirCLG%p+3_L7j-<B{bjf?8j0>p1
z{Ox!3rQ3J1l`V+{U%E+aWP?b>DXU=PH3KH&V5!>jul3dK#A$SP4@MO<)ToxIQ!%i2
zN<Y^ZW$wT0Eu}B`U;6sp1(gr+{nyGDZbH8#1}ri6)}T572f9KZ<fnhsy8P?|pQBPe
zt|BoKl}M*Fjz+3?se;?XQwDHUVK%WiZsY(;C0h~O8v`g<wC}&PHn;anK2Jlik5s@t
O1w0FHwD5mgSN;KFFpk^+

delta 624
zcmX9*J!>055WU$uM<9bMlN6C4F(v{#!j2j@0T(KQ3a3y+Ql;2PYu(DHTceZYj}VLt
z6G$hvjvdfnFt|?PE=5RT$X`g8Kalvn70WF%J2P+Id-t>awY>7SwO1UPENlFaqWE^U
z@~X6?C5pDv+55+;Q=5HxEq3<%Sgdc$n|db`6zfh|C%GIjX&U9m2xNOKPCno>i-PsP
z#GZ8w@-THWl!^2>(s4;m8yBE*=>v&PfVd%0R8M6fmic@fn{2|j-D80C8NJ{w&Z&JS
zq#&)+Ses0=6e^&~odxC?Wb7G7HV3>fb9Cf5EcT_q$^r)!YY|WJP7+c5sHD4GVX`5V
z4T7RkP)5pfm#cK7+ysPzZf6!`yZg{L41MUj&`LX*mO?H1<M-m~qbKRYiCqJ}G>~pc
z$)CqndEl?&XX_28@Y3py08QJnK$fIPjyB5N|BEY1{q>b(W9J$Y;r2mjqo#gPqS@Hc
zV1v<*8r1=IQ9bp_5C17ylh6KJ@^JYj{h&Xp@ZXcwcMXGvrxuM}NihO|<{?0X)OH~!
jVBrAF7cHlV$q_T{oaRpv#<{^J{?rVPuozwY=S%DNF=>Eh


From 96ddb648d117500947c7afda9352c63026631968 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sun, 15 Jul 2018 09:28:32 +0200
Subject: [PATCH 08/32] Expanding zeh vocabularah

---
 .vim/spell/nl.utf-8.add     |  10 ++++++++++
 .vim/spell/nl.utf-8.add.spl | Bin 1360 -> 1503 bytes
 2 files changed, 10 insertions(+)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index 1fc2e4e..1533976 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -79,3 +79,13 @@ e-reader
 tomatenplant
 macarons
 bijgekletst
+bijgekletst
+scoutingterrein
+geskipt
+runderstoofpot
+runderlende
+gravelpad
+eh
+dagteller
+proscuitto
+zostraks
diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl
index 74129c2b8650223fd77702ca91933b61c276423c..843c0154b61381a2368f5ace2c46a809463dc37e 100644
GIT binary patch
delta 656
zcmX9*O=}cE5S`aOYDgd##egIigQu`y;!z}r;2}be(SxVnOiyNZd#9KASk0nHZhP|5
zKOp8O_y>d>yh-pM2wn|)%}ssPLo-9wtLpb&RsUT5wYL8H@Ti$u=l1?3N&4pN`U*Bu
zQ`Q|$(Za&<SRhFTb$A5xKo2A?D%6CH6mGKc8GCP&n-(5JeimcFXCrNF&Atgr$qy=(
zH7pi5Lq^y{e#=N0GhT{qJ5yy!%-HBKWeJxiK(()ax3RClDE8sH)z)=_?Z0R1sYJW-
z$HJ>z5^;gyJT=ydTBEEdqE^E<_4JcRgA;V*5?%~jWjm^t)D=7LP|+mKDJPyQ0cRO|
zJx?BuB|H9}IT1bUCcdRF8NH4x=!Gg>_*(gn_M*tb_SQe-c-9dr$=h#P)+EBXE$L|z
zIhb7-WqfqS<Zd|9TN}p(*=T0pa=SjdWNkZ~>n%JF7y8Lcvh<qJF#OQFxDJ0=n1{{u
z<z})pq~_g)q4bFJ8QyQAZ1|Wy#%1`DK3w}=#VR-TCtRiX^JHmB_o9poEBZG-n9^>X
vY25HR9Y>!;#9+?Y^>dCZS^10t`qrwdp_;s^ES)Z{ax%!nFg_lK!JX~@v@eXn

delta 499
zcmX9)J5K^Z5Wd+vBGH6K6HSByjfDj&B-*IC%7Q{mIztv%<gx6Ly91S2SZeEPYvC`z
z-p0gUD-$dK0M;fp_|4JG&dz?Xo$rN@`AnsJ9QBpfrK#h%ljlsDJhvSVY=PvWC>RP!
zk)#GHIZh$8PgD|gXg?`0sA2zTmD+Y&#O1d*0ko(?ZFDq_U8M&+^Dju#8FxjlbQOpu
zU%Gs$j9jTS93r6t9!%_y*r_TSLT2W9J}2u;Q@R(#kPk2qsfKe#FrpQTU;q=20NgA<
zzexk?B{)p)q>w=(3hQ6{?&fy)TA*+~g$Mx|d=kJV7SfO~$jlL)O$oz((u=IkdmCx;
z0~gSWJ@JY(w%1;cR_vp9lqFxn5}X?eg$@)YbRyRMvQuyE;NEa}Q48_FHf&3dTQ>=u
z9C2G0SVtFryc9!5fa@!iEqj_;-mgY<neciLiUAoxgX02GHN3+i3qC030-~`5eso@&
I_9eCc4;nXX`Tzg`


From 98dcac072f684dc42ea845b4bac9c8ef19d79ba3 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 18 Jul 2018 10:22:38 +0200
Subject: [PATCH 09/32] Easily change window positions

---
 .vimrc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.vimrc b/.vimrc
index 444e3d3..bedb064 100644
--- a/.vimrc
+++ b/.vimrc
@@ -74,6 +74,14 @@ let NERDTreeIgnore = ['\.pyc$', 'tags']
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 
 
+" Easily change position of windows
+"<c-w>gh: soft move left
+"<c-w>gj: soft move down
+"<c-w>gk: soft move up
+"<c-w>gl: soft move right
+Plugin 'andymass/vim-tradewinds'
+
+
 " Rooter changes the working directory to the project root when you open a
 " file or directory. Useful when using fzf for example.
 Plugin 'airblade/vim-rooter'

From 1a38ce9c28f4cbfe931f86980b15d507dd77e354 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 18 Jul 2018 10:23:34 +0200
Subject: [PATCH 10/32] Remove syntastic config, as ALE has replaced it

---
 .vimrc | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/.vimrc b/.vimrc
index bedb064..c5decb4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -254,40 +254,6 @@ endif
 " Improved Django handling
 Plugin 'tweekmonster/django-plus.vim'
 
-" Code checker. For python, install flake8 or pylint, preferably in the
-" virtualenv. For Django support, install pylint-django
-"Disabled, using ALE instead (see below); the settings here are not needed
-"Plugin 'vim-syntastic/syntastic'
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
-
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 1
-let g:syntastic_check_on_open = 0
-let g:syntastic_check_on_wq = 0
-
-let g:syntastic_error_symbol = '✗'
-let g:syntastic_warning_symbol = '⚠'
-
-"let g:syntastic_python_checkers = ['pylint']
-"let g:syntastic_python_checkers = ['pylint', 'flake8', 'pyflakes']
-
-" No silly 80-char line limit. Sorry pep-8. Also, Django support. Disable 'invalid name', 'missing docstring'
-"let g:syntastic_python_pylint_post_args="--max-line-length=120 --load-plugins pylint_django -d C0103,C0111"
-let g:syntastic_python_pylint_post_args="--max-line-length=120 -d C0103,C0111"
-
-" Use the virtualenv's Python interpreter
-"if $VIRTUAL_ENV != ''
-"    let g:syntastic_python_python_exec = '$VIRTUAL_ENV/bin/python'
-"endif
-
-"let g:syntastic_python_checkers=['pylint']
-"let g:syntastic_python_python_exec = 'python'
-"let g:syntastic_python_pylint_exe = 'python -m pylint'
-"let g:syntastic_python_pylint_exe = 'python $(which pylint)'
-
-
 " Code checker. For python, install flake8 or pylint, preferably in the
 " virtualenv. For Django support, install pylint-django
 Plugin 'w0rp/ale'

From 6e8d004051ebb17cf283eedd57927790214fa2f8 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 18 Jul 2018 10:28:42 +0200
Subject: [PATCH 11/32] Started making better sections

---
 .vimrc | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.vimrc b/.vimrc
index c5decb4..92cf79e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -19,7 +19,7 @@ call vundle#begin()
 " let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
 
-" == UI ======
+" == Window chrome =============================================================
 
 " Display tags of the current file ordered by scope
 " You need ctags: `sudo apt-get install exuberant-ctags` or
@@ -163,8 +163,15 @@ Plugin 'ryanoasis/vim-devicons'
 " Set guifont when using gvim:
 "set guifont=Droid\ Sans\ Mono\ for\ Powerline\ Plus\ Nerd\ File\ Types\ 11
 
+"
+" undotree.vim : Display your undo history in a graph.
+Plugin 'mbbill/undotree'
+nnoremap <Leader>u :UndotreeToggle<CR>
+let g:undotree_SetFocusWhenToggle=1 " if undotree is opened, it is likely one
+                                    " wants to interact with it.
 
-" == Content convenience ======
+
+" == Content convenience =======================================================
 
 " transparent editing of gpg encrypted files. The filename must have a .gpg,
 " .pgp or .asc suffix.
@@ -294,6 +301,8 @@ if v:version >= 704
 endif
 
 
+" == Writing prose =============================================================
+
 " Distraction-free writing, start with <Leader>V (\V or ,V in this config)
 Plugin 'junegunn/goyo.vim'
 let g:goyo_width = 120
@@ -318,12 +327,6 @@ let g:pencil#wrapModeDefault = 'soft'  " default is 'hard'
 nmap <leader>V :Goyo <bar> :Limelight!! <bar> :TogglePencil <CR>
 
 
-" undotree.vim : Display your undo history in a graph.
-Plugin 'mbbill/undotree'
-nnoremap <Leader>u :UndotreeToggle<CR>
-let g:undotree_SetFocusWhenToggle=1 " if undotree is opened, it is likely one
-                                    " wants to interact with it.
-
 " The NERD Commenter: A plugin that allows for easy commenting of code for
 " many filetypes.
 Plugin 'scrooloose/nerdcommenter'

From 14853e5cefabe6b4a62c595f7985e8837cc97ad8 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 18 Jul 2018 10:45:21 +0200
Subject: [PATCH 12/32] Plugin to better match and highlight code pairs

---
 .vimrc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.vimrc b/.vimrc
index 92cf79e..58947f2 100644
--- a/.vimrc
+++ b/.vimrc
@@ -11,7 +11,8 @@ set encoding=utf-8
 " change the <Leader> key from \ to ,
 let mapleader=","
 
-" Vundle manages the plugins
+
+" == Vundle manages the plugins ================================================
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
@@ -41,6 +42,7 @@ Plugin 'bling/vim-bufferline'
 " Version control notes in the line number bar
 Plugin 'mhinz/vim-signify'
 
+
 " Git wrapper
 Plugin 'tpope/vim-fugitive'
 " fugitive git bindings
@@ -61,6 +63,13 @@ nnoremap <space>go :Git checkout<Space>
 nnoremap <space>gps :Dispatch! git push<CR>
 nnoremap <space>gpl :Dispatch! git pull<CR>
 
+
+" Better matching of code pairs
+Plugin 'andymass/vim-matchup'
+" Deferred highlighting improves cursor movement performance
+let g:matchup_matchparen_deferred = 1
+
+
 " Think of sensible.vim as one step above 'nocompatible' mode: a universal
 " set of defaults that (hopefully) everyone can agree on.
 Plugin 'tpope/vim-sensible'
@@ -258,9 +267,11 @@ let g:ycm_server_python_interpreter = '/usr/bin/python3'
 "let g:ycm_server_log_level = 'debug'
 endif
 
+
 " Improved Django handling
 Plugin 'tweekmonster/django-plus.vim'
 
+
 " Code checker. For python, install flake8 or pylint, preferably in the
 " virtualenv. For Django support, install pylint-django
 Plugin 'w0rp/ale'
@@ -366,9 +377,12 @@ set statusline+=%{gutentags#statusline()}
 let g:gutentags_ctags_exclude = ["*.min.*", "build", ".bundle", ".git", "log", "node_modules", "tmp", "vendor", "*.vim/bundle/*"]
 "let g:gutentags_trace = 1
 
+
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required
+" == End of plugins ============================================================
+
 
 "filetype plugin on
 

From 2e7fa8ac98a29af5940b2d51f3bbc87a85a85432 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 23 Jul 2018 11:32:50 +0200
Subject: [PATCH 13/32] Add user base bin dir, for use with pipenv and such

---
 .config/fish/config.fish | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 0b0749c..ffcf82b 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -18,6 +18,10 @@ set -x VIRTUAL_ENV_DISABLE_PROMPT 1
 set -U grcplugin_ls --color
 
 # PATH
+## If the 'user base' binary directory exists, add it to PATH
+if test -x ~/.local/bin
+    set PATH $PATH ~/.local/bin
+end
 if test -x ~/.dot/dotfiles/bin
     set PATH $PATH ~/.dot/dotfiles/bin
 end

From c079f686a076f9aec1c0b951656b339f86cf8e84 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 25 Jul 2018 10:00:24 +0200
Subject: [PATCH 14/32] Be more inclusive regarding dashes and underscores

---
 .vim/syntax/todo.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim
index d911365..ce61304 100644
--- a/.vim/syntax/todo.vim
+++ b/.vim/syntax/todo.vim
@@ -96,7 +96,7 @@ syntax match timeslot "\v\[.*-.*\] " nextgroup=todoItem skipwhite
 highlight timeslot ctermfg=Magenta
 
 " A todoItem has a subject (e.g., a word that's followed by a ':')
-syn match todoItem '\i\+:' contained
+syn match todoItem '[a-zA-Z0-9\-_]\+:' contained
 hi todoItem ctermfg=Blue
 
 highlight link todoStatusDone PreProc

From 1a24dc19922f3847a9d2f72442bf276960377e28 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 25 Jul 2018 10:38:40 +0200
Subject: [PATCH 15/32] Added notes to their own group

---
 .vim/syntax/todo.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim
index ce61304..66ab279 100644
--- a/.vim/syntax/todo.vim
+++ b/.vim/syntax/todo.vim
@@ -53,10 +53,10 @@ highlight link todoOperator Operator
 
 
 " Task statuses
-syntax match note "\v^n .*$"
-syntax match note "\v n .*$"
-syntax match note "\v  .*$"
-highlight note ctermfg=Grey guifg=#eeeeee
+syntax match todoNote "\v^n .*$" nextgroup=todoNote
+syntax match todoNote "\v n .*$" nextgroup=todoNote
+syntax match todoNote "\v  .*$" nextgroup=todoNote
+highlight todoNote ctermfg=Grey guifg=#eeeeee
 
 syntax match todoStatusDone "\v^v " nextgroup=todoItem skipwhite
 syntax match todoStatusDone "\v  v " nextgroup=todoItem skipwhite

From 8040ca01bc4a7399608b2b2ccf32d185fcf9a184 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 25 Jul 2018 10:40:43 +0200
Subject: [PATCH 16/32] Better match indented todo items

---
 .vim/syntax/todo.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim
index 66ab279..19c3d32 100644
--- a/.vim/syntax/todo.vim
+++ b/.vim/syntax/todo.vim
@@ -75,7 +75,7 @@ syntax match todoStatusTest "\v  t " nextgroup=todoItem skipwhite
 highlight todoStatusTest ctermfg=darkcyan guifg=#6666ff
 
 syntax match todoStatusTodo "\v^- " nextgroup=todoItem skipwhite
-syntax match todoStatusTodo "\v  - " nextgroup=todoItem skipwhite
+syntax match todoStatusTodo "\v  .*- " nextgroup=todoItem skipwhite
 highlight todoStatusTodo ctermfg=red guifg=#ff0000
 
 syntax match todoStatusImportant "\v^\> .*$"

From dab309fa57359215870a48d3f81bb24c464a0807 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 25 Jul 2018 10:41:16 +0200
Subject: [PATCH 17/32] Important items are also todoItem

---
 .vim/syntax/todo.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim
index 19c3d32..e2da3f1 100644
--- a/.vim/syntax/todo.vim
+++ b/.vim/syntax/todo.vim
@@ -78,10 +78,10 @@ syntax match todoStatusTodo "\v^- " nextgroup=todoItem skipwhite
 syntax match todoStatusTodo "\v  .*- " nextgroup=todoItem skipwhite
 highlight todoStatusTodo ctermfg=red guifg=#ff0000
 
-syntax match todoStatusImportant "\v^\> .*$"
-syntax match todoStatusImportant "\v  \> .*$"
-syntax match todoStatusImportant "\v^! .*$"
-syntax match todoStatusImportant "\v  ! .*$"
+syntax match todoStatusImportant "\v^\> .*$" nextgroup=todoItem skipwhite
+syntax match todoStatusImportant "\v  \> .*$" nextgroup=todoItem skipwhite
+syntax match todoStatusImportant "\v^! .*$" nextgroup=todoItem skipwhite
+syntax match todoStatusImportant "\v  ! .*$" nextgroup=todoItem skipwhite
 "highlight todoStatusImportant ctermfg=131 guifg=#af5f5f
 highlight todoStatusImportant ctermfg=167 guifg=#d75f5f
 

From 291718604da4d896c796a9430b10a51792501ecb Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Wed, 25 Jul 2018 10:41:19 +0200
Subject: [PATCH 18/32] Link forgotten items

---
 .vim/syntax/todo.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim
index e2da3f1..2b90a7d 100644
--- a/.vim/syntax/todo.vim
+++ b/.vim/syntax/todo.vim
@@ -101,6 +101,8 @@ hi todoItem ctermfg=Blue
 
 highlight link todoStatusDone PreProc
 highlight link todoStatusDoing PreProc
+highlight link todoStatusCancelled PreProc
+highlight link todoStatusTest PreProc
 highlight link todoStatusTodo PreProc
 highlight link todoStatusImportant PreProc
 highlight link todoStatusQuestion PreProc

From f2eaf81da55099563a6e2de6151e0a2bb9b1ce5f Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sun, 29 Jul 2018 11:00:39 +0200
Subject: [PATCH 19/32] Disable matchup for now, as it breaks now and then

---
 .vimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vimrc b/.vimrc
index 58947f2..45e5bac 100644
--- a/.vimrc
+++ b/.vimrc
@@ -65,9 +65,9 @@ nnoremap <space>gpl :Dispatch! git pull<CR>
 
 
 " Better matching of code pairs
-Plugin 'andymass/vim-matchup'
+"Plugin 'andymass/vim-matchup'
 " Deferred highlighting improves cursor movement performance
-let g:matchup_matchparen_deferred = 1
+"let g:matchup_matchparen_deferred = 1
 
 
 " Think of sensible.vim as one step above 'nocompatible' mode: a universal

From 351f5d631530607e9888ceb4569ba64b9a283fa2 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sun, 5 Aug 2018 19:56:17 +0200
Subject: [PATCH 20/32] Word++

---
 .vim/spell/nl.utf-8.add     |   1 +
 .vim/spell/nl.utf-8.add.spl | Bin 1503 -> 1512 bytes
 2 files changed, 1 insertion(+)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index 1533976..19a2b9b 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -89,3 +89,4 @@ eh
 dagteller
 proscuitto
 zostraks
+badolie
diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl
index 843c0154b61381a2368f5ace2c46a809463dc37e..6992d5da3a5b7cb2b3a937fe2da9f33e325c69e0 100644
GIT binary patch
delta 664
zcmX9+ziSjh6y9%U4~t+Rphme^_=A9v6OzIvfq)3XLP3kI&V$KiF1P32?6JESObQh&
zMUG=y5o{#2rTzoa#wvxCooFY7>m>1ev&G)Nd-J|uZ}#Wh@45Np!NYQ7vuy1wisJTk
z{>ifL?u_sZV~l_(YL&>5Aq};KL9QaUlj;6agYQl`eYb(m^v4@?yu~_B{0Ce{;y<Ig
za8ePw&Bu~YhW#&W;n3ev>lYKtZYJHgLu&0vmG~Fx${=xYJhSZJPbK|UAA{fk$Cb9(
zSbCe!iQbiJRemwaRZsqi5YmI#*sP%2QrVmxwUCmuqL~on_CSE2JoJT2EZUN>M3+8N
z4hey8=^IS+STF8QY&Og*I*=Si$Wv1~-Ome^k7*=;Cbl;Dx<{glwWGl*fQmZKY08sf
zprFV{qfCyy8g$-&*GqS!cE4WArqzbdU04iOL_;n?7{e-W88XT>G21<VEnYr1%XKjR
zC|<>}e-&TFOaDGz!IA$OH=8p<T}GW4vJA*-$W=<zQ-2m;-#C<&7iwE}CQ>4eNPlx-
zoFad_%4XCX@ldc%k!@y4aNj>|EN&Gg_5*H6qKYF2<fy+J6i#koPYC~6<x0Zk?q%B~
PIqGp<bXh0<OXKE$4%(7(

delta 728
zcmXw1v1;5v5Y>!yaj=7HhuBRVa^ORST{whuaN)w3;3h<I8=bs&r;|=ABw2+Cac3^1
zI`#vMD;M!U1Vh}qP8SF%0x^bES0-;(35%rJeKT*~yw%TzZwrfW_V&wMrRl~W$MFuP
zi?6mg$|<2E%84AuFDWF=4#J>KBN~tbm<rTZ_-dSFI4f<knqF*CJ^k^KYLio!Zp|ev
z`GHOMHOCsciDd35)|CXe6)1XmgckeS{H9$xH_y5IGEg|RwWnj~ITSq5UOQA;LO<hZ
z0Cfeb1<9-sg_youZhr{DvFvZmXMXs0qPdU6b!kMsV=q)`f%=jyAJ4}is31m4oX$wz
zpE4u}v0wvCDU;e+>lkfIiXbdTl`xu3clD$`#7<-N8v{FfE{uRqR654UBOnTrWn_`f
z^O-x;1?wYBYH22_(fqCt>gr$P$`%!PgK8E78CweM&O#0~)lJbo^VMBm;$YbLwyj(-
zE3@9ws(Ik8P}i(^Pv`EmYb76e>u~1-&X3K7xAyEx#!s;R4=fj6!vvUd7osb^lMv_#
zoMMfbK{Io|_4xI<{0Ig2#MBf^8k6H*i+kcG|B6_p;LZVBTUl5Y2wue2%VE=KCkK%=
lBQft=k2*;vS5ynxOmS9%SAGm}9t2l?<VsJ(f%(#U@)vwroGJhS


From 2f60dd816de482e6cf08e322d3ad0f6a005e883f Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 6 Aug 2018 09:44:10 +0200
Subject: [PATCH 21/32] Vocabulary++

---
 .vim/spell/nl.utf-8.add     |   4 ++++
 .vim/spell/nl.utf-8.add.spl | Bin 1503 -> 1585 bytes
 2 files changed, 4 insertions(+)

diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add
index 1533976..ab04d76 100644
--- a/.vim/spell/nl.utf-8.add
+++ b/.vim/spell/nl.utf-8.add
@@ -89,3 +89,7 @@ eh
 dagteller
 proscuitto
 zostraks
+fusilli
+knieschotten
+speciaalbiertje
+roomyoghurt
diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl
index 843c0154b61381a2368f5ace2c46a809463dc37e..02afe4fe4d91728ffe867a67190c1429d6f43f22 100644
GIT binary patch
delta 533
zcmXX?Jxc>Y5WU&E6NyLs0b&u27?cRHvydPG#X_tU#OiXne7V^TcNaebA$Im|C5S&j
z(gb@e|3nJW&MK{~zPW^f-I<-YZ{EDGrLmViKR$`Op_IFSmgPK+vv1_sE!{I8w4SAy
zS|kx<S;dz5p+g#(9dR@is)tU9en3sqlpw+srKraDnRdt$-liXF5j4oB2q=D6q<~~B
zO_TITliJ`yJxT0P_V}%Qi<u41N_>*hqRzz?7uCLFKE*N>%v2oY?NImVIu!#%@djf$
zbceG6VJX>mWcKZi;i4ZfQz$#Sn_#4dh={7VS(qp&yQw1qGKpPM<V@9|4w?kH0wr%5
zAy~igTIh6A3gBOT;p<chiUl=?*6^_nuw}k&FCRB&UY6N`04*OO!N6WdJav$mUwex#
zOwKvYqJChv*ngUsduNs2&5LvCVt6KgbaQJXZbzaTr92X=C{~tH^Rf1dsko(rjA03P
YJAfy^_K{0qz$=vqSvOhEo_TgF|2%AQ1poj5

delta 463
zcmXAlze)o^5XNtIF9=a$Ar{smN+3dPMMMO}pjbr<8!x)?F1Oj0`;)}r1K2Otk~c8;
z3~BQUf~{a-VLJ7j3kQ4O?96=gn;kE`FIFy2&eD6O_0FH?`IqC$8%YsaH=%X+Lq{}n
zd*XPNa=In*yr%Ux17%s(jC&PpjgPDdLh4WiMbk_wo%7xPfHd8)s`E)tR<t>YIcN?2
zK<R`6N=4x(%5Fs-EDM!W4^E2vYJE458`lfL4Yw=ZwHd}(Bok`k&m5v`WM~s%b4+6v
z6wXN=+n~;%4JfjrDJgtu79rCuEKvXAer2`X4AIZj%ANXE+I4;ZeA^ThOv5>vYCzir
z(_>s2pob|ozz)dDq5Jl)8Z2q1WS}CEWSBCatiZs8jLy5!$gmbIegcip!Ve}B1K<vn
i_;k;u`c|CMLy_&GJVWgem3qElZ20MV+%|JxrNe*eglP2u


From 45aa2b5f448b610132b2d936ef023ad1e18a2cc8 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Thu, 9 Aug 2018 15:34:38 +0200
Subject: [PATCH 22/32] Use python 3 for virtualfish

---
 .config/fish/config.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index ffcf82b..7661aa0 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -2,7 +2,7 @@
 set EDITOR vim
 
 # Virtualenv support with virtualfish
-eval (python -m virtualfish compat_aliases)
+eval (python3 -m virtualfish compat_aliases)
 
 # Theme options for bobthefish
 set -g theme_nerd_fonts yes

From 9ee0e4b478cdb1cc971914eba4c6b91e0f5d9030 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Fri, 10 Aug 2018 13:20:03 +0200
Subject: [PATCH 23/32] Bye zenburn :( Hello falcon!

---
 .vimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vimrc b/.vimrc
index 45e5bac..14c484f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -74,7 +74,7 @@ nnoremap <space>gpl :Dispatch! git pull<CR>
 " set of defaults that (hopefully) everyone can agree on.
 Plugin 'tpope/vim-sensible'
 " Nice colour scheme
-Plugin 'jnurmine/Zenburn.git'
+Plugin 'fenetikm/falcon'
 " Quick file system tree, mapped to Ctrl+n for quick toggle
 Plugin 'scrooloose/nerdtree'
 map <C-n> :NERDTreeToggle<CR>
@@ -433,7 +433,7 @@ set cryptmethod=blowfish2
 " Ensure 256 colour support if the terminal supports it
 if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
     set t_Co=256
-    colorscheme zenburn
+    colorscheme falcon
 
     " create a bar for airline
     set laststatus=2

From b214f349042c424eef852207abd5c6ce1e7775f6 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Fri, 10 Aug 2018 14:23:19 +0200
Subject: [PATCH 24/32] Reload configuration with leader r

---
 .tmux.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.tmux.conf b/.tmux.conf
index b1b9d50..ed17606 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -3,6 +3,7 @@ set -g bell-action any
 
 # Default termtype. If the rcfile sets $TERM, that overrides this value.
 set -g default-terminal tmux-256color-italic
+set -g terminal-overrides ',tmux-256color-italic:Tc'
 
 # Keep your finger on ctrl, or don't
 bind-key ^D detach-client
@@ -123,3 +124,6 @@ bind - \
 
 # Local config
 if-shell "[ -f ~/.tmux.conf.user ]" 'source ~/.tmux.conf.user'
+
+# reload config with leader-r
+bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."

From 63d23c3453d6b798ed4db85243efcf08a354b374 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Fri, 10 Aug 2018 14:23:34 +0200
Subject: [PATCH 25/32] Trying to make it work with true color

---
 .vimrc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.vimrc b/.vimrc
index 14c484f..e3e2cbf 100644
--- a/.vimrc
+++ b/.vimrc
@@ -431,14 +431,22 @@ set hidden
 set cryptmethod=blowfish2
 
 " Ensure 256 colour support if the terminal supports it
-if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
-    set t_Co=256
+"if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
+    "set t_Co=256
+    " The "^[" is a single character. You enter it by pressing Ctrl+v and then ESC.
+    set t_8f=^[[38;2;%lu;%lu;%lum
+    set t_8b=^[[48;2;%lu;%lu;%lum
+
     colorscheme falcon
 
+    " This is what sets vim to use 24-bit colors. It will also work for any version of neovim
+    " newer than 0.1.4.
+    set termguicolors
+
     " create a bar for airline
     set laststatus=2
     let g:airline_powerline_fonts = 1
-endif
+"endif
 
 " Toggle paste and autoindent mode (enable paste so no indention weirdness
 " happens when pasting into the current file)

From 306cdd9e2ca0d88d7ec43eb4c2614f8459cd620a Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Fri, 10 Aug 2018 17:38:09 +0200
Subject: [PATCH 26/32] Better true colour support

---
 .config/fish/config.fish |  2 +-
 .tmux.conf               |  3 ++-
 .vimrc                   | 20 +++++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 7661aa0..9c801fb 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -88,7 +88,7 @@ function grepl
 end
 
 ## Various
-alias tmux 'tmux -2'
+#alias tmux 'tmux -2'
 alias tmux_reload "tmux source-file ~/.tmux.conf"
 alias tmux_takeover "tmux detach -a"
 
diff --git a/.tmux.conf b/.tmux.conf
index ed17606..a95c6a3 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -3,7 +3,8 @@ set -g bell-action any
 
 # Default termtype. If the rcfile sets $TERM, that overrides this value.
 set -g default-terminal tmux-256color-italic
-set -g terminal-overrides ',tmux-256color-italic:Tc'
+#set -g terminal-overrides ',tmux-256color-italic:Tc'
+set -g terminal-overrides ',*256col*:Tc'
 
 # Keep your finger on ctrl, or don't
 bind-key ^D detach-client
diff --git a/.vimrc b/.vimrc
index e3e2cbf..5607532 100644
--- a/.vimrc
+++ b/.vimrc
@@ -431,22 +431,20 @@ set hidden
 set cryptmethod=blowfish2
 
 " Ensure 256 colour support if the terminal supports it
-"if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
-    "set t_Co=256
-    " The "^[" is a single character. You enter it by pressing Ctrl+v and then ESC.
-    set t_8f=^[[38;2;%lu;%lu;%lum
-    set t_8b=^[[48;2;%lu;%lu;%lum
-
+if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
     colorscheme falcon
 
-    " This is what sets vim to use 24-bit colors. It will also work for any version of neovim
-    " newer than 0.1.4.
-    set termguicolors
-
     " create a bar for airline
     set laststatus=2
     let g:airline_powerline_fonts = 1
-"endif
+endif
+
+" This is what sets vim to use 24-bit colors. It will also work for any version of neovim
+if exists('+termguicolors')
+  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+  set termguicolors
+endif
 
 " Toggle paste and autoindent mode (enable paste so no indention weirdness
 " happens when pasting into the current file)

From 3ba42d9c8061df1a8e266f073aea758a1bd5f1d5 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Fri, 10 Aug 2018 20:08:45 +0200
Subject: [PATCH 27/32] Some more information

---
 .vimrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vimrc b/.vimrc
index 5607532..d4173bf 100644
--- a/.vimrc
+++ b/.vimrc
@@ -440,6 +440,7 @@ if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &te
 endif
 
 " This is what sets vim to use 24-bit colors. It will also work for any version of neovim
+" newer than 0.1.4.
 if exists('+termguicolors')
   let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
   let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"

From c5ed8d5452eb317463dbbbbd8622459d058950e1 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sat, 11 Aug 2018 12:14:50 +0200
Subject: [PATCH 28/32] Better syntax

---
 .tmux.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tmux.conf b/.tmux.conf
index a95c6a3..880c575 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -4,7 +4,7 @@ set -g bell-action any
 # Default termtype. If the rcfile sets $TERM, that overrides this value.
 set -g default-terminal tmux-256color-italic
 #set -g terminal-overrides ',tmux-256color-italic:Tc'
-set -g terminal-overrides ',*256col*:Tc'
+set -ga terminal-overrides ',*256col*:Tc'
 
 # Keep your finger on ctrl, or don't
 bind-key ^D detach-client

From b44fca1e2b25d0d80f4d83f1ce2018e7f24d45d3 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sat, 11 Aug 2018 12:15:05 +0200
Subject: [PATCH 29/32] vim-tradewinds needs a minimum version of vim

---
 .vimrc | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.vimrc b/.vimrc
index d4173bf..655977b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -83,12 +83,15 @@ let NERDTreeIgnore = ['\.pyc$', 'tags']
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 
 
-" Easily change position of windows
-"<c-w>gh: soft move left
-"<c-w>gj: soft move down
-"<c-w>gk: soft move up
-"<c-w>gl: soft move right
-Plugin 'andymass/vim-tradewinds'
+if has('patch-8.0-1364')
+    " Easily change position of windows
+    " Requires vim 8.0.1364 or neovim (exact version uncertain).
+    "<c-w>gh: soft move left
+    "<c-w>gj: soft move down
+    "<c-w>gk: soft move up
+    "<c-w>gl: soft move right
+    Plugin 'andymass/vim-tradewinds'
+endif
 
 
 " Rooter changes the working directory to the project root when you open a

From 7e255e9e082d94ea5da82d93fb3e0bc7e273b07d Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sun, 12 Aug 2018 20:22:15 +0200
Subject: [PATCH 30/32] Some other themes

---
 .vimrc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.vimrc b/.vimrc
index 655977b..9788991 100644
--- a/.vimrc
+++ b/.vimrc
@@ -74,7 +74,12 @@ nnoremap <space>gpl :Dispatch! git pull<CR>
 " set of defaults that (hopefully) everyone can agree on.
 Plugin 'tpope/vim-sensible'
 " Nice colour scheme
+"Plugin 'jnurmine/Zenburn'
 Plugin 'fenetikm/falcon'
+"Plugin 'phanviet/vim-monokai-pro'
+"Plugin 'dracula/vim'
+"Plugin 'sonph/onehalf'
+"Plugin 'jacoborus/tender.vim'
 " Quick file system tree, mapped to Ctrl+n for quick toggle
 Plugin 'scrooloose/nerdtree'
 map <C-n> :NERDTreeToggle<CR>
@@ -435,7 +440,12 @@ set cryptmethod=blowfish2
 
 " Ensure 256 colour support if the terminal supports it
 if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
+    "colorscheme zenburn
     colorscheme falcon
+    "colorscheme monokai_pro
+    "colorscheme dracula
+    "colorscheme onehalfdark
+    "colorscheme tender
 
     " create a bar for airline
     set laststatus=2

From 4f5155102320288d80ec2484cd741eda09a88713 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Sun, 12 Aug 2018 20:22:28 +0200
Subject: [PATCH 31/32] True colour testing for terminal and tmux

---
 bin/testing/color-24bit.sh  | 100 ++++++++++++++++++++++++++++++++++++
 bin/testing/color-spaces.pl |  67 ++++++++++++++++++++++++
 bin/testing/color-zigzag.sh |  14 +++++
 3 files changed, 181 insertions(+)
 create mode 100755 bin/testing/color-24bit.sh
 create mode 100755 bin/testing/color-spaces.pl
 create mode 100755 bin/testing/color-zigzag.sh

diff --git a/bin/testing/color-24bit.sh b/bin/testing/color-24bit.sh
new file mode 100755
index 0000000..f407258
--- /dev/null
+++ b/bin/testing/color-24bit.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+# This file was originally taken from iterm2 https://github.com/gnachman/iTerm2/blob/master/tests/24-bit-color.sh
+#
+#   This file echoes a bunch of 24-bit color codes
+#   to the terminal to demonstrate its functionality.
+#   The foreground escape sequence is ^[38;2;<r>;<g>;<b>m
+#   The background escape sequence is ^[48;2;<r>;<g>;<b>m
+#   <r> <g> <b> range from 0 to 255 inclusive.
+#   The escape sequence ^[0m returns output to default
+
+setBackgroundColor()
+{
+    #printf '\x1bPtmux;\x1b\x1b[48;2;%s;%s;%sm' $1 $2 $3
+    printf '\x1b[48;2;%s;%s;%sm' $1 $2 $3
+}
+
+resetOutput()
+{
+    echo -en "\x1b[0m\n"
+}
+
+# Gives a color $1/255 % along HSV
+# Who knows what happens when $1 is outside 0-255
+# Echoes "$red $green $blue" where
+# $red $green and $blue are integers
+# ranging between 0 and 255 inclusive
+rainbowColor()
+{ 
+    let h=$1/43
+    let f=$1-43*$h
+    let t=$f*255/43
+    let q=255-t
+
+    if [ $h -eq 0 ]
+    then
+        echo "255 $t 0"
+    elif [ $h -eq 1 ]
+    then
+        echo "$q 255 0"
+    elif [ $h -eq 2 ]
+    then
+        echo "0 255 $t"
+    elif [ $h -eq 3 ]
+    then
+        echo "0 $q 255"
+    elif [ $h -eq 4 ]
+    then
+        echo "$t 0 255"
+    elif [ $h -eq 5 ]
+    then
+        echo "255 0 $q"
+    else
+        # execution should never reach here
+        echo "0 0 0"
+    fi
+}
+
+for i in `seq 0 127`; do
+    setBackgroundColor $i 0 0
+    echo -en " "
+done
+resetOutput
+for i in `seq 255 -1 128`; do
+    setBackgroundColor $i 0 0
+    echo -en " "
+done
+resetOutput
+
+for i in `seq 0 127`; do
+    setBackgroundColor 0 $i 0
+    echo -n " "
+done
+resetOutput
+for i in `seq 255 -1 128`; do
+    setBackgroundColor 0 $i 0
+    echo -n " "
+done
+resetOutput
+
+for i in `seq 0 127`; do
+    setBackgroundColor 0 0 $i
+    echo -n " "
+done
+resetOutput
+for i in `seq 255 -1 128`; do
+    setBackgroundColor 0 0 $i
+    echo -n " "
+done
+resetOutput
+
+for i in `seq 0 127`; do
+    setBackgroundColor `rainbowColor $i`
+    echo -n " "
+done
+resetOutput
+for i in `seq 255 -1 128`; do
+    setBackgroundColor `rainbowColor $i`
+    echo -n " "
+done
+resetOutput
diff --git a/bin/testing/color-spaces.pl b/bin/testing/color-spaces.pl
new file mode 100755
index 0000000..8774c04
--- /dev/null
+++ b/bin/testing/color-spaces.pl
@@ -0,0 +1,67 @@
+#!/usr/bin/perl
+# Author: Todd Larason <jtl@molehill.org>
+# $XFree86: xc/programs/xterm/vttests/256colors2.pl,v 1.1 1999/07/11 08:49:54 dawes Exp $
+
+print "256 color mode\n\n";
+
+# display back ground colors
+
+for ($fgbg = 38; $fgbg <= 48; $fgbg +=10) {
+
+# first the system ones:
+print "System colors:\n";
+for ($color = 0; $color < 8; $color++) {
+    print "\x1b[${fgbg};5;${color}m::";
+}
+print "\x1b[0m\n";
+for ($color = 8; $color < 16; $color++) {
+    print "\x1b[${fgbg};5;${color}m::";
+}
+print "\x1b[0m\n\n";
+
+# now the color cube
+print "Color cube, 6x6x6:\n";
+for ($green = 0; $green < 6; $green++) {
+    for ($red = 0; $red < 6; $red++) {
+	for ($blue = 0; $blue < 6; $blue++) {
+	    $color = 16 + ($red * 36) + ($green * 6) + $blue;
+	    print "\x1b[${fgbg};5;${color}m::";
+	}
+	print "\x1b[0m ";
+    }
+    print "\n";
+}
+
+# now the grayscale ramp
+print "Grayscale ramp:\n";
+for ($color = 232; $color < 256; $color++) {
+    print "\x1b[${fgbg};5;${color}m::";
+}
+print "\x1b[0m\n\n";
+
+}
+
+print "Examples for the 3-byte color mode\n\n";
+
+for ($fgbg = 38; $fgbg <= 48; $fgbg +=10) {
+
+# now the color cube
+print "Color cube\n";
+for ($green = 0; $green < 256; $green+=51) {
+    for ($red = 0; $red < 256; $red+=51) {
+	for ($blue = 0; $blue < 256; $blue+=51) {
+            print "\x1b[${fgbg};2;${red};${green};${blue}m::";
+	}
+	print "\x1b[0m ";
+    }
+    print "\n";
+}
+
+# now the grayscale ramp
+print "Grayscale ramp:\n";
+for ($gray = 8; $gray < 256; $gray+=10) {
+    print "\x1b[${fgbg};2;${gray};${gray};${gray}m::";
+}
+print "\x1b[0m\n\n";
+
+}
diff --git a/bin/testing/color-zigzag.sh b/bin/testing/color-zigzag.sh
new file mode 100755
index 0000000..be0700d
--- /dev/null
+++ b/bin/testing/color-zigzag.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+awk 'BEGIN{
+    s="/\\/\\/\\/\\/\\"; s=s s s s s s s s s s s s s s s s s s s s s s s;
+    for (colnum = 0; colnum<256; colnum++) {
+        r = 255-(colnum*255/255);
+        g = (colnum*510/255);
+        b = (colnum*255/255);
+        if (g>255) g = 510-g;
+        printf "\033[48;2;%d;%d;%dm", r,g,b;
+        printf "\033[38;2;%d;%d;%dm", 255-r,255-g,255-b;
+        printf "%s\033[0m", substr(s,colnum+1,1);
+    }
+    printf "\n";
+}'

From 3777793d681c547ef1ae82f2925dc166d692958e Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 13 Aug 2018 10:22:33 +0200
Subject: [PATCH 32/32] Include guifg colours for everything, will break on
 true colour otherwise

---
 .vim/syntax/todo.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim
index 2b90a7d..001016b 100644
--- a/.vim/syntax/todo.vim
+++ b/.vim/syntax/todo.vim
@@ -93,11 +93,11 @@ highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff
 "syntax match brack /[\[\]]/ | hi brack ctermfg=DarkMagenta
 
 syntax match timeslot "\v\[.*-.*\] " nextgroup=todoItem skipwhite
-highlight timeslot ctermfg=Magenta
+highlight timeslot ctermfg=Magenta guifg=#d700af
 
 " A todoItem has a subject (e.g., a word that's followed by a ':')
 syn match todoItem '[a-zA-Z0-9\-_]\+:' contained
-hi todoItem ctermfg=Blue
+hi todoItem ctermfg=Blue guifg=#87d7ff
 
 highlight link todoStatusDone PreProc
 highlight link todoStatusDoing PreProc