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 fd8c31f..ba3b590 100644 Binary files a/vim/spell/en.utf-8.add.spl and b/vim/spell/en.utf-8.add.spl differ 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()"