From b9709088a70a96d7b73e36010b59431b1209a0be Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Fri, 25 Nov 2022 22:00:38 -0500 Subject: [PATCH] Clean up campo-dark-blue vim color scheme and add some Jai support --- vim/colors/campo-dark-blue.vim | 168 ++++++++++----------------------- vimrc | 2 +- 2 files changed, 50 insertions(+), 120 deletions(-) diff --git a/vim/colors/campo-dark-blue.vim b/vim/colors/campo-dark-blue.vim index 0c3d1a6..57f16f5 100644 --- a/vim/colors/campo-dark-blue.vim +++ b/vim/colors/campo-dark-blue.vim @@ -11,63 +11,49 @@ if has('termguicolors') set termguicolors let g:campo_theme_use_rainbow_parens = 0 - let s:blue = "3699cc" + " Colors + let s:blue = "3699cc" let s:purple = "ce93d8" - let s:grey = "b0bec5" + let s:grey = "b0bec5" let s:orange = "ffb74d" let s:yellow = "fff176" - let s:green = "88b888" - let s:red = "ef2929" + let s:green = "88b888" + let s:red = "ef2929" + let s:text = "f1f1e8" - let s:text = "f1f1e8" - - let s:foreground = s:text - let s:background = "072730" - let s:selection = "546e8f" - let s:window = "37474f" - let s:line = "034a4a" - let s:color_column = "034a4a" " Vertical line set by colorcolumn option. - let s:cursor_line = "023940" " Horizontal line at the cursor. - let s:cursor_column = "023940" " Vertical line at the cursor. - let s:active_tab_bg = s:background - let s:active_tab_fg = s:text - let s:inactive_tab_bg = s:line - let s:inactive_tab_fg = "dddddd" - let s:tab_line_bg = s:inactive_tab_bg - let s:bad_spelling = "ee877d" - let s:todo = "b8fbb0" - let s:bugs = "b8fbb0" + let s:foreground = s:text " A majority of the syntax will use this, including variables in C/C++. + let s:background = "072730" + let s:selection = "546e8f" + let s:window = "37474f" + let s:line = "034a4a" + let s:color_column = "034a4a" " Vertical line set by colorcolumn option. + let s:cursor_line = "023940" " Horizontal line at the cursor. + let s:cursor_column = "023940" " Vertical line at the cursor. + let s:active_tab_bg = s:background + let s:active_tab_fg = s:text + let s:inactive_tab_bg = s:line + let s:inactive_tab_fg = "dddddd" + let s:tab_line_bg = s:inactive_tab_bg + 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 = "0eefcb" - let s:pre_processor = s:text - let s:define = "a5bce4" - let s:struct = "ae90ea" - let s:number = s:text - - " things like 'return', 'goto', 'case', 'break' - let s:statement = s:text - - " this like 'inline' - let s:type = s:text - - " #include - let s:include = s:text - - let s:string = s:text - let s:comment = "5dea82" - - " true, false, etc - let s:constant = s:text - - let s:c_type = s:text - let s:c_storage_class = s:text - let s:c_conditional = s:text - let s:c_loops = s:text - - let s:vim_command = s:text - + let s:function_name = "0eefcb" + let s:pre_processor = s:text + let s:define = "a5bce4" + let s:struct = "ae90ea" + let s:variable = s:text + let s:number = s:text + let s:repeat = s:text " 'for' and 'while' + let s:statement = s:text " 'return', 'goto', 'case', 'break', etc + let s:identifier = s:grey + let s:type = s:text " Data types + let s:include = s:text " #include in C/C++ + let s:string = s:text + let s:comment = "5dea82" + let s:constant = s:text " Constants, e.g. SOME_CONST + let s:boolean = s:text " true, false else echoerr "This theme requires 'termguicolors' support!" endif @@ -324,13 +310,14 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256 call X("Comment", s:comment, "", "") call X("Title", s:comment, "", "") call X("Cursor", "", s:foreground, "") - call X("Identifier", s:grey, "", "none") + call X("Identifier", s:identifier, "", "none") call X("Statement", s:statement, "", "") call X("Conditional", s:foreground, "", "") - call X("Repeat", s:yellow, "", "") + call X("Repeat", s:repeat, "", "") call X("Structure", s:struct, "", "") call X("Function", s:function_name, "", "") call X("Constant", s:constant, "", "") + call X("Boolean", s:boolean, "", "") call X("String", s:string, "", "") call X("Special", s:foreground, "", "") call X("PreProc", s:pre_processor, "", "") @@ -348,46 +335,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256 call X("Notices","dcd53e",s:background,"bold") call X("ErrorMsg", s:error_msg_foreground, s:error_msg_background, "bold") - "call X("Ignore", "666666", "", "") - " Vim Highlighting - call X("vimCommand", s:vim_command, "", "") + call X("vimCommand", s:text, "", "") + + " Jai Highlighting + call X("jaiVariableDeclaration", s:variable, "", "") + call X("jaiTagNote", s:orange, "", "bold") " C Highlighting - call X("cType", s:c_type, "", "") - call X("cStorageClass", s:c_storage_class, "", "") - call X("cConditional", s:c_conditional, "", "") - call X("cRepeat", s:c_loops, "", "") - - " PHP Highlighting - call X("phpVarSelector", s:red, "", "") - call X("phpIdentifier", s:red, "", "") - call X("phpFCKeyword", s:purple, "", "") - call X("phpSCKeyword", s:purple, "", "") - call X("phpKeyword", s:purple, "", "") - call X("phpType", s:purple, "", "") - call X("phpRepeat", s:red, "", "") - call X("phpDefine", s:purple, "", "") - call X("phpDocTags", s:function_name, "", "") - call X("phpDocParam", s:green, "", "") - call X("phpFunction", s:blue, "", "") - call X("phpFunctions", s:blue, "", "") - call X("phpClass", s:blue, "", "") - call X("phpClasses", s:orange, "", "") - call X("phpMagicConstants", s:yellow, "", "") - call X("phpMemberSelector", s:grey, "", "") - - " Ruby Highlighting - call X("rubySymbol", s:green, "", "") - call X("rubyConstant", s:foreground, "", "") - call X("rubyAttribute", s:blue, "", "") - call X("rubyInclude", s:blue, "", "") - call X("rubyLocalVariableOrMethod", s:orange, "", "") - call X("rubyCurlyBlock", s:orange, "", "") - call X("rubyStringDelimiter", s:green, "", "") - call X("rubyInterpolationDelimiter", s:orange, "", "") - call X("rubyConditional", s:purple, "", "") - call X("rubyRepeat", s:purple, "", "") + call X("cType", s:text, "", "") + call X("cStorageClass", s:text, "", "") + call X("cConditional", s:text, "", "") + call X("cRepeat", s:text, "", "") " Python Highlighting call X("pythonInclude", s:red, "", "") @@ -406,28 +365,6 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256 call X("pythonBuiltinType", s:orange, "", "") call X("pythonNumber", s:orange, "", "") - " Go Highlighting - call X("goStatement", s:purple, "", "") - call X("goConditional", s:purple, "", "") - call X("goRepeat", s:purple, "", "") - call X("goException", s:purple, "", "") - call X("goDeclaration", s:blue, "", "") - call X("goConstants", s:yellow, "", "") - call X("goBuiltins", s:orange, "", "") - - " CoffeeScript Highlighting - call X("coffeeKeyword", s:purple, "", "") - call X("coffeeConditional", s:purple, "", "") - call X("coffeeSpecialVar", s:orange, "", "") - call X("coffeeSpecialIdent", s:red, "", "") - call X("coffeeObject", s:orange, "", "") - call X("coffeeObjAssign", s:blue, "", "") - call X("coffeeArrow", s:purple, "", "") - call X("coffeeBoolean", s:foreground, "", "") - call X("coffeeGlobal", s:foreground, "", "") - call X("coffeeModuleKeyword", s:function_name, "", "") - call X("coffeeFuncCall", s:blue, "", "") - " JavaScript Highlighting call X("javaScriptBraces", s:foreground, "", "") call X("javaScriptFunction", s:purple, "", "") @@ -442,10 +379,6 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256 call X("htmlArg", s:foreground, "", "") call X("htmlScriptTag", s:blue, "", "") - " Blade Tempalte Highlight - call X("bladeDelimiter", s:orange, "", "") - call X("bladeKeyword", s:blue, "", "") - " Diff Highlighting call X("diffAdded", "", s:green, "none") call X("diffRemoved", "", s:red, "none") @@ -467,9 +400,6 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256 call X("VimwikiHeader5", s:orange, "", "") call X("VimwikiHeader6", s:yellow, "", "") - " YAML - call X("yamlBlockMappingKey", s:blue, "", "") - " Delete Functions delf X delf rgb diff --git a/vimrc b/vimrc index 8bfb8e1..0cd7e30 100644 --- a/vimrc +++ b/vimrc @@ -200,7 +200,7 @@ Plug 'dracula/vim', { 'as': 'dracula' } Plug 'tpope/vim-markdown' " Markdown Plug 'bfrg/vim-cpp-modern' " C/C++ -Plug 'rluba/jai.vim' " JAI +Plug 'rluba/jai.vim' " Jai Plug 'vim-ruby/vim-ruby' " Ruby Plug 'fatih/vim-go' " Go Plug 'rust-lang/rust.vim' " Rust