From a6f44906ee8496f8f8b7669802da6d6eb7e8b3a8 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Thu, 28 Nov 2019 08:22:01 -0500
Subject: [PATCH] Update vim color schemes

---
 ...lux-dark-green.vim => campo-dark-blue.vim} |  15 +++---
 ...ampo-dark.vim => campo-dark-grey-blue.vim} |  43 +++++++++++-------
 ...ark-green.vim => campo-dark-greyscale.vim} |  30 ++++++------
 vim/spell/en.utf-8.add                        |   1 +
 vim/spell/en.utf-8.add.spl                    | Bin 2586 -> 2614 bytes
 vimrc                                         |   6 +--
 6 files changed, 53 insertions(+), 42 deletions(-)
 rename vim/colors/{campo-flux-dark-green.vim => campo-dark-blue.vim} (98%)
 rename vim/colors/{campo-dark.vim => campo-dark-grey-blue.vim} (95%)
 rename vim/colors/{campo-dark-green.vim => campo-dark-greyscale.vim} (97%)

diff --git a/vim/colors/campo-flux-dark-green.vim b/vim/colors/campo-dark-blue.vim
similarity index 98%
rename from vim/colors/campo-flux-dark-green.vim
rename to vim/colors/campo-dark-blue.vim
index 7aeb49e..df12892 100644
--- a/vim/colors/campo-flux-dark-green.vim
+++ b/vim/colors/campo-dark-blue.vim
@@ -13,18 +13,18 @@ if has('termguicolors')
 
   let s:blue = "3699cc"
   let s:purple = "ce93d8"
-  let s:window = "37474f"
   let s:grey = "b0bec5"
   let s:orange = "ffb74d"
   let s:yellow = "fff176"
   let s:green = "88b888"
   let s:red = "ef2929"
 
-  let s:text = "dfdfdf"
+  let s:text = "e9e9e9"
 
   let s:foreground = s:text
-  let s:background = "0f3c42"
+  let s:background = "08363c"
   let s:selection = "546e7a"
+  let s:window = "37474f"
   let s:line = "034a4a"
   let s:bad_spelling = "ee877d"
   let s:todo = "b8fbb0"
@@ -32,10 +32,10 @@ if has('termguicolors')
   let s:error_msg_background = s:background
   let s:error_msg_foreground = "e40e0e"
 
-  let s:function_name = "24f5d6"
-  let s:pre_processor = "96e4dd"
+  let s:function_name = "0effdb"
+  let s:pre_processor = "a6f0e9"
   let s:define = "a5bce4"
-  let s:struct = "e2a2ec"
+  let s:struct = "de90ea"
   " things like 'return'
   let s:statement = "ffffff"
   let s:number = "ffffff"
@@ -63,7 +63,8 @@ hi clear
 if exists("syntax_on")
     syntax reset
 endif
-let g:colors_name = "campo-dark"
+
+let g:colors_name = "campo-dark-blue"
 
 if has("gui_running") || &t_Co == 88 || &t_Co == 256
     " Returns an approximate grey index for the given grey level
diff --git a/vim/colors/campo-dark.vim b/vim/colors/campo-dark-grey-blue.vim
similarity index 95%
rename from vim/colors/campo-dark.vim
rename to vim/colors/campo-dark-grey-blue.vim
index 0ec7105..c682af7 100644
--- a/vim/colors/campo-dark.vim
+++ b/vim/colors/campo-dark-grey-blue.vim
@@ -6,30 +6,39 @@
 " See https://github.com/chriskempson/vim-tomorrow-theme.git for it.
 " Hex color conversion functions borrowed from the theme "Desert256".
 
-let g:campo_theme_use_rainbow_parens = 1
 
-" Default GUI colors
-let s:foreground = "cfd8dc"
-let s:background = "333333"
-let s:selection = "546e7a"
-let s:line = "444444"
-let s:comment = "78909c"
-let s:red = "ee877d"
-let s:orange = "ffb74d"
-let s:yellow = "fff176"
-let s:green = "88b888"
-let s:aqua = "00b8d4"
-let s:blue = "6699cc"
-let s:purple = "ce93d8"
-let s:window = "37474f"
-let s:grey = "b0bec5"
+if has('termguicolors')
+  " Supports 24-bit color range
+  set termguicolors
+
+  let g:campo_theme_use_rainbow_parens = 0
+
+  " Default GUI colors
+  let s:foreground = "cfd8dc"
+  let s:background = "1f2431"
+  let s:selection = "546e7a"
+  let s:window = "394051"
+  let s:line = "323643"
+  let s:comment = "96a2c1"
+  let s:red = "f27c71"
+  let s:orange = "fcd8a2"
+  let s:yellow = "fff176"
+  let s:green = "80d580"
+  let s:aqua = "2dd7e2"
+  let s:blue = "2dd7e2"
+  let s:purple = "ce93d8"
+  let s:grey = "bac7ce"
+else
+  echoerr "This theme requires 'termguicolors' support!"
+endif
 
 set background=dark
 hi clear
 if exists("syntax_on")
     syntax reset
 endif
-let g:colors_name = "campo-dark"
+
+let g:colors_name = "campo-dark-grey-blue"
 
 if has("gui_running") || &t_Co == 88 || &t_Co == 256
     " Returns an approximate grey index for the given grey level
diff --git a/vim/colors/campo-dark-green.vim b/vim/colors/campo-dark-greyscale.vim
similarity index 97%
rename from vim/colors/campo-dark-green.vim
rename to vim/colors/campo-dark-greyscale.vim
index c27bf40..17fc780 100644
--- a/vim/colors/campo-dark-green.vim
+++ b/vim/colors/campo-dark-greyscale.vim
@@ -13,40 +13,39 @@ if has('termguicolors')
 
   let s:blue = "3699cc"
   let s:purple = "ce93d8"
-  let s:window = "37474f"
   let s:grey = "b0bec5"
   let s:orange = "ffb74d"
   let s:yellow = "fff176"
   let s:green = "88b888"
   let s:red = "ef2929"
 
-  let s:text = "cbc5b0"
+  let s:text = "ffffff"
 
   let s:foreground = s:text
-  "let s:background = "132f32"
-  let s:background = "05353d"
+  let s:background = "282d37"
   let s:selection = "546e7a"
-  let s:line = "034a4a"
+  let s:window = "394051"
+  let s:line = "333946"
   let s:bad_spelling = "ee877d"
   let s:todo = "b8fbb0"
   let s:bugs = "b8fbb0"
   let s:error_msg_background = s:background
   let s:error_msg_foreground = "e40e0e"
 
-  let s:function_name = "2ebda9"
-  let s:pre_processor = "97debf"
-  let s:define = "a5bce4"
-  let s:struct = "ce93d8"
+  let s:function_name = s:text
+  let s:pre_processor = s:text
+  let s:define = s:text
+  let s:struct = s:text
   " things like 'return'
-  let s:statement = "ffffff"
-  let s:number = "ffffff"
+  let s:statement = s:text
+  let s:number = s:text
   " this like 'inline'
-  let s:type = "ffffff"
+  let s:type = s:text
   " #include
   let s:include = s:text
   let s:string = s:text
-  let s:comment = "71d87d"
-  let s:constant = "a0dbdf"
+  let s:comment = "aaaaaa"
+  let s:constant = s:text
 
   let s:c_type = s:pre_processor
   let s:c_storage_class = s:text
@@ -64,7 +63,8 @@ hi clear
 if exists("syntax_on")
     syntax reset
 endif
-let g:colors_name = "campo-dark"
+
+let g:colors_name = "campo-dark-greyscale"
 
 if has("gui_running") || &t_Co == 88 || &t_Co == 256
     " Returns an approximate grey index for the given grey level
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 9f43d1b..8e0fbde 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -229,3 +229,4 @@ updatable
 blogging
 Screenshot
 architecting
+souvlaki
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
index fd8c31fabf378a90e20eaa1ec188e576bab482bc..ba3b590ca279e9bb5a829cacbab39a3c2521abf7 100644
GIT binary patch
literal 2614
zcmYjTJ#QRE7@nCu+agV58YD!4j7||!Kyg4skxmpxBs(a8;c!CAx!t+D_3iF#cJ_Q;
z%Y{q-19Ximls`a|IxRv%LDYzbD!(8NJkL9Kg2LYUct4-_dEdFm55EevD~h}SD7Brv
zW5;RcCevAdQk0dio6s&!muKBpn%B)jr^b0*Xr)W-b*8OuwN|R{uq$Mho4nShm#AAj
z4{{bv%FR^IbPfflQ~b|$C6`mIy{@5dxgT}gnJY@ah}(V#C96*%?)5?x8k2i2zHRl?
zP-9Bt(Nk?ougCDvAV3Qb#+aftN+gU8xWjV4SjT|%g@@?^snn29#ld{r79MFQ6rGfn
zTuouj!Ys~K9)b=^G{b$C<R{*kUaIHZ|748{MvW0KP2;4W=@aZ4?GR6Zc7vN5iJQw_
zR#cMCh_X4QUuSy4?~@pq*GsV>a1COfXOd*e^DDbU4`Y|3Eb2+=Pq%G4DZ(kt&jf{b
zo!1NyRyyFkK`=4b77|V*q5Q_{4)<=IRv^0lbR*s}10KC`_;;KqN~#(*unaTPAnjOP
zFl6@(wmR649-vb-x&TbP3rLEwSlr^~dCmWW+*ECnJ;SokinD-K3}zVMUC<saVpub5
z8(hPhb6Ym2Qq?R>%BqZ!s-U`>#|pd{n`r@`)QUx;7)uJheR73SvSgD8{)IC|1>IOJ
zs_5II*iW~t%YDr#R<jaePVkq)0yzzYjWPz-cq+wTMSO+4D+UI|=TjQ|d9h<NSNgUy
zGhtTWf`}<ZG77x`TL{+65{dfAt(BM=u&@jljG|<J3Fr6@Yp{y2d?Y31Ei5JsNSUKR
zV|OyhJt?au$<P=s*JlvQ#G&3D$3_*KLx%()yUz+VhUB^;s3bWx*uNyQlTcv!W`!LS
zh=rqSn%I0HHB!}FpTnHFJdZW&{1#9QY>`U-h=}@;SP2x@94T|y3%I2%fn+e|deCm8
z1X?Bc3(N@^J*^VNXMQU=T%5G~F`_UTo0|7D>h)9t6vB;4Lm-9~;w2N7BB=HolaUls
zxZy22`yE7RSzDr)mvv}yD^~Y9d`ln>sZjxHZSW@Cn=ZknzT*<>PX(tS!vy0a&ZG=c
z#n|eY<}k&V5JGL&!lmj@YV<O>DxBGs&<3m;ankQKH!MCcQ#S)3zvhL<l!n%sDdG$a
za1nWEfe6cZT}oR<kGf+KCq{XE*atA?2tkFwJWfs|6n1I{J2~nB6Q83^=>_#8^X2TC
z6g02e1a*bp0@CaVOm?#Gk`21zIAGw+uZMZLsR$iYn8qa7ik%0wcV~%pO%mD;_fhlQ
zSeUvXQv{~l9?&C4f{urXqe*O-G~dBvHmT}hG8#3n7!kg2lc5kC1u@lckt|2!#y`!f
z{c{NMp#m^cER4MjA>it@jKKl1?DOfe9A-V~GCC(N5t2cD19ic$Xxc@WpvRT|nDbRA
zIJ8)?u0i65+A22jGZ<WZ8a9AvGo_|x9A}{JI=qPM2lF1ABr>Mg<2W?GOcU2cZgSwo
zl9{KR-$4B^g{Bjy2<LB15mU3r$S5cu(QG8Oxh&utLdWg4n;;EL0ZP?`MB`Q6j68&X
zy`Iz8v2JR><VtwqJ4r+)Qh7c;0{vB)WL_G5Kzg#)y+gJ<*$?>-Eb6`x7&tJuUQD8$
zKVk`0HS3KbHpnX(c!{*!Uyfu|7a%&M3s@tcaPnshOR{=RdQy=ym92sGbz@wkm&Vm{
zHsje9M>$f*1#ye4Om5=WjVI6U%`5#0<yLp0Gsm!}H^R5npUL^B*e^sEKS%H+Tq-zv
z>x%~m55NBA=xGr7^=|?_LY$jl1j;<h^&^_t3pm`orfTm8eZ<obkMY7}?1ebEABgA>
zdpxf2xf#z7QM&(+XZ3!i9}Bv|?mde#l6(iE{|G$!ujRj#vyo)*J+c_f-s$i7Jv=}r
GO8pBQpXccS

literal 2586
zcmYjTzi%8x6rPzqpG6u(m6n)`B9P!j;ONo>$G>EPMIZ_(kmh#h?$)=vv)S3TeRh)?
zUE>NxmZ&IbsM8`O6hw_^sQeeWP6glh#s?I4yEF5Ce(!s4_VMm#p>{=a_iv^82RH3F
z&D>-<%MXjP@^us1?&$brv6kj_)9F+@U1+5}{<Ttr+~l=3y+qyND#%_iDHl^c)46V;
zkm5hrl^jm-?sW}y%k|cxpShy+U0e<pP_p_6;$C;6(3srwWwX^&LyakoM^CjWy&l6u
zqf4k&+89%`Mu~*60cSBxcO3-|yod2ZXNbWfGK$Xow(!U^!Qx_4R&q3jISa$sTl(v~
z3z*?LOY%c+OfS`QuD`QJ1*67@n5MBa$n+srjdqAAK)b<7jnvKaURG3+&=zHLN?&Gr
z!slKL%<E&ZA%G2IrYDkS$^A3CP7h<3qY!GZ^hbT0PKs~@^E1Jrz0PX}5Gx(9-yoQn
zYYPb{l2E?#dVzDIgViz+-$A+(Z<ztNt{nb$@<d5p!wQyBW*Vd&>kCfwPhe{S`_Th*
zY@-Xn#It~;7>mUzPF~dfALgcNlk6E@2dp_uSjAvQ0p2C7tuBT&!?M9KtUYyWHm6e6
zbS7n0#z<9AUCv_#ej1x;0iV>0*-?xoh290(!YEm?Nd(_JQ&iB6)uM{NC5nS|&AQyz
zjAA(}5#|KH6c)&8AZ(N|u*O{}{xae#^j$JAD887|;E&z9&0Oi*g_#Mn1{Oq2A(Bz(
z3Tz=*FH0oqBe#}fX2`-aTri4~gJU?yb5w&>gynrHDNkWBVL-|}2sCy(gWO(OHA#ln
zaJfE#P$mv_e;iv?Y>pfffb0b;&=`{IjG&U_)L;jb$WB6m<z9sq6NrVQYMR)*lNu>I
z*QYRNy3<&*%C7;%z!s_GM?}=O#7dwzcapM20b&>e$#6`mVcSOuv`RiGFezYkUL}an
z{91CnIBEDDL}4;EHP30(>!}1Ngxe|&ff!YYmrOVoL3PoXjHHmljqcFdZy-X;+7i8Q
z$~v?-6{|NFc$PpMQd<S6wZfZluet<>`nF4~KN6gR3=@paIF&L)6=SPonxhm?LI}0K
zg-bP<)aYe$RXEd^(1xrUanf%!H!L16Q#S)3zvP9-SccY#DdH3ia1nWEfe6cZUP@a=
zkGf(JCq{WZ*atB7ln_)1%wy+JLSd&aU?)dCVB$lxDZQY6WWMa3lY-_|o1m`H>mbdJ
zz-%Y`IyUH%<A8xPzvOlLZ$;>s!ZaqqT6P}P-kc@YHA!d}IFFjA#=?{*Qv{}49?&C4
zf<B0&No<%W`8sZ|NmU1v(WrUFi11t|Lm|Bt#MGcgvK);o|1_&EP9emr3cyIQF!nNp
zfTK$pgF|9D;N@jG%zDygn2X#E5t3nj19ic$XxeU(pvRSdhx1h^II?(SU4z6AwPkGL
zXE1o}Y19Cs)s&i|;ptyjBwi#*@|qLS{5(xu6Y0nq7pr6*a%5}OyO#nGCw`#)7Y2u^
z*;XVGlpm1Kk;kSh;0{82ZQo50IU1i*HBr#GN>@`3(VkzA=JQx8HDo>|yzrBNAWWp#
zyl({UvoguN^!AX9WO;k{*ySWV<Torz-AU%0k!wFpqMhGk)s&s}#t<9kmCU$Ay6jI!
zeku=cL%M)9QV2VLw6G*^mt-UrIY!wHct3B9YxJ>kwd~EfcgE?B)Sn_z;1-FP^zcdJ
zNv-$hmHvow%e&B-W4_ZH;XBr!$o|JzccP0r;TCwVl=}XSPdB%BAAWxDbrAXM&j9@h
zajrfBl-bYqK22-{Y_2X)wedtBaQEG>aH(XZf1K5uB6=Td+^6uln#j8--Tx=Ddb`q(
p1zjQZhD904w{6ki2T%U%@;%vmBpG~(EXJ~S`U^gHwvmZa{{R_I;Ya`g

diff --git a/vimrc b/vimrc
index 6867ad9..e189ccb 100644
--- a/vimrc
+++ b/vimrc
@@ -718,9 +718,9 @@ set statusline=%<%f\ (%{&ft})\ %-4(%m%)%=%-19(%3l,%02c%03V%)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 let g:campo_theme_use_rainbow_parens = 1
-"let s:dark_theme = 'campo-dark-green'
-let s:dark_theme = 'campo-flux-dark-green'
-"let s:dark_theme = 'campo-dark'
+"let s:dark_theme = 'campo-dark-blue'
+let s:dark_theme = 'campo-dark-greyscale'
+"let s:dark_theme = 'campo-dark-grey-blue'
 let s:light_theme = 'campo-light'
 
 execute "autocmd ColorScheme " . s:dark_theme . " call ReloadRainbow()"