Clean up campo-dark-blue vim color scheme and add some Jai support

This commit is contained in:
Michael Campagnaro 2022-11-25 22:00:38 -05:00
parent dfa5ecaf47
commit b9709088a7
2 changed files with 50 additions and 120 deletions

View File

@ -11,63 +11,49 @@ if has('termguicolors')
set termguicolors set termguicolors
let g:campo_theme_use_rainbow_parens = 0 let g:campo_theme_use_rainbow_parens = 0
let s:blue = "3699cc" " Colors
let s:blue = "3699cc"
let s:purple = "ce93d8" let s:purple = "ce93d8"
let s:grey = "b0bec5" let s:grey = "b0bec5"
let s:orange = "ffb74d" let s:orange = "ffb74d"
let s:yellow = "fff176" let s:yellow = "fff176"
let s:green = "88b888" let s:green = "88b888"
let s:red = "ef2929" let s:red = "ef2929"
let s:text = "f1f1e8"
let s:text = "f1f1e8" let s:foreground = s:text " A majority of the syntax will use this, including variables in C/C++.
let s:background = "072730"
let s:foreground = s:text let s:selection = "546e8f"
let s:background = "072730" let s:window = "37474f"
let s:selection = "546e8f" let s:line = "034a4a"
let s:window = "37474f" let s:color_column = "034a4a" " Vertical line set by colorcolumn option.
let s:line = "034a4a" let s:cursor_line = "023940" " Horizontal line at the cursor.
let s:color_column = "034a4a" " Vertical line set by colorcolumn option. let s:cursor_column = "023940" " Vertical line at the cursor.
let s:cursor_line = "023940" " Horizontal line at the cursor. let s:active_tab_bg = s:background
let s:cursor_column = "023940" " Vertical line at the cursor. let s:active_tab_fg = s:text
let s:active_tab_bg = s:background let s:inactive_tab_bg = s:line
let s:active_tab_fg = s:text let s:inactive_tab_fg = "dddddd"
let s:inactive_tab_bg = s:line let s:tab_line_bg = s:inactive_tab_bg
let s:inactive_tab_fg = "dddddd" let s:bad_spelling = "ee877d"
let s:tab_line_bg = s:inactive_tab_bg let s:todo = "b8fbb0"
let s:bad_spelling = "ee877d" let s:bugs = "b8fbb0"
let s:todo = "b8fbb0"
let s:bugs = "b8fbb0"
let s:error_msg_background = s:background let s:error_msg_background = s:background
let s:error_msg_foreground = "e40e0e" let s:error_msg_foreground = "e40e0e"
let s:function_name = "0eefcb"
let s:function_name = "0eefcb" let s:pre_processor = s:text
let s:pre_processor = s:text let s:define = "a5bce4"
let s:define = "a5bce4" let s:struct = "ae90ea"
let s:struct = "ae90ea" let s:variable = s:text
let s:number = s:text let s:number = s:text
let s:repeat = s:text " 'for' and 'while'
" things like 'return', 'goto', 'case', 'break' let s:statement = s:text " 'return', 'goto', 'case', 'break', etc
let s:statement = s:text let s:identifier = s:grey
let s:type = s:text " Data types
" this like 'inline' let s:include = s:text " #include in C/C++
let s:type = s:text let s:string = s:text
let s:comment = "5dea82"
" #include let s:constant = s:text " Constants, e.g. SOME_CONST
let s:include = s:text let s:boolean = s:text " true, false
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
else else
echoerr "This theme requires 'termguicolors' support!" echoerr "This theme requires 'termguicolors' support!"
endif endif
@ -324,13 +310,14 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("Comment", s:comment, "", "") call <SID>X("Comment", s:comment, "", "")
call <SID>X("Title", s:comment, "", "") call <SID>X("Title", s:comment, "", "")
call <SID>X("Cursor", "", s:foreground, "") call <SID>X("Cursor", "", s:foreground, "")
call <SID>X("Identifier", s:grey, "", "none") call <SID>X("Identifier", s:identifier, "", "none")
call <SID>X("Statement", s:statement, "", "") call <SID>X("Statement", s:statement, "", "")
call <SID>X("Conditional", s:foreground, "", "") call <SID>X("Conditional", s:foreground, "", "")
call <SID>X("Repeat", s:yellow, "", "") call <SID>X("Repeat", s:repeat, "", "")
call <SID>X("Structure", s:struct, "", "") call <SID>X("Structure", s:struct, "", "")
call <SID>X("Function", s:function_name, "", "") call <SID>X("Function", s:function_name, "", "")
call <SID>X("Constant", s:constant, "", "") call <SID>X("Constant", s:constant, "", "")
call <SID>X("Boolean", s:boolean, "", "")
call <SID>X("String", s:string, "", "") call <SID>X("String", s:string, "", "")
call <SID>X("Special", s:foreground, "", "") call <SID>X("Special", s:foreground, "", "")
call <SID>X("PreProc", s:pre_processor, "", "") call <SID>X("PreProc", s:pre_processor, "", "")
@ -348,46 +335,18 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("Notices","dcd53e",s:background,"bold") call <SID>X("Notices","dcd53e",s:background,"bold")
call <SID>X("ErrorMsg", s:error_msg_foreground, s:error_msg_background, "bold") call <SID>X("ErrorMsg", s:error_msg_foreground, s:error_msg_background, "bold")
"call <SID>X("Ignore", "666666", "", "")
" Vim Highlighting " Vim Highlighting
call <SID>X("vimCommand", s:vim_command, "", "") call <SID>X("vimCommand", s:text, "", "")
" Jai Highlighting
call <SID>X("jaiVariableDeclaration", s:variable, "", "")
call <SID>X("jaiTagNote", s:orange, "", "bold")
" C Highlighting " C Highlighting
call <SID>X("cType", s:c_type, "", "") call <SID>X("cType", s:text, "", "")
call <SID>X("cStorageClass", s:c_storage_class, "", "") call <SID>X("cStorageClass", s:text, "", "")
call <SID>X("cConditional", s:c_conditional, "", "") call <SID>X("cConditional", s:text, "", "")
call <SID>X("cRepeat", s:c_loops, "", "") call <SID>X("cRepeat", s:text, "", "")
" PHP Highlighting
call <SID>X("phpVarSelector", s:red, "", "")
call <SID>X("phpIdentifier", s:red, "", "")
call <SID>X("phpFCKeyword", s:purple, "", "")
call <SID>X("phpSCKeyword", s:purple, "", "")
call <SID>X("phpKeyword", s:purple, "", "")
call <SID>X("phpType", s:purple, "", "")
call <SID>X("phpRepeat", s:red, "", "")
call <SID>X("phpDefine", s:purple, "", "")
call <SID>X("phpDocTags", s:function_name, "", "")
call <SID>X("phpDocParam", s:green, "", "")
call <SID>X("phpFunction", s:blue, "", "")
call <SID>X("phpFunctions", s:blue, "", "")
call <SID>X("phpClass", s:blue, "", "")
call <SID>X("phpClasses", s:orange, "", "")
call <SID>X("phpMagicConstants", s:yellow, "", "")
call <SID>X("phpMemberSelector", s:grey, "", "")
" Ruby Highlighting
call <SID>X("rubySymbol", s:green, "", "")
call <SID>X("rubyConstant", s:foreground, "", "")
call <SID>X("rubyAttribute", s:blue, "", "")
call <SID>X("rubyInclude", s:blue, "", "")
call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
call <SID>X("rubyCurlyBlock", s:orange, "", "")
call <SID>X("rubyStringDelimiter", s:green, "", "")
call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
call <SID>X("rubyConditional", s:purple, "", "")
call <SID>X("rubyRepeat", s:purple, "", "")
" Python Highlighting " Python Highlighting
call <SID>X("pythonInclude", s:red, "", "") call <SID>X("pythonInclude", s:red, "", "")
@ -406,28 +365,6 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("pythonBuiltinType", s:orange, "", "") call <SID>X("pythonBuiltinType", s:orange, "", "")
call <SID>X("pythonNumber", s:orange, "", "") call <SID>X("pythonNumber", s:orange, "", "")
" Go Highlighting
call <SID>X("goStatement", s:purple, "", "")
call <SID>X("goConditional", s:purple, "", "")
call <SID>X("goRepeat", s:purple, "", "")
call <SID>X("goException", s:purple, "", "")
call <SID>X("goDeclaration", s:blue, "", "")
call <SID>X("goConstants", s:yellow, "", "")
call <SID>X("goBuiltins", s:orange, "", "")
" CoffeeScript Highlighting
call <SID>X("coffeeKeyword", s:purple, "", "")
call <SID>X("coffeeConditional", s:purple, "", "")
call <SID>X("coffeeSpecialVar", s:orange, "", "")
call <SID>X("coffeeSpecialIdent", s:red, "", "")
call <SID>X("coffeeObject", s:orange, "", "")
call <SID>X("coffeeObjAssign", s:blue, "", "")
call <SID>X("coffeeArrow", s:purple, "", "")
call <SID>X("coffeeBoolean", s:foreground, "", "")
call <SID>X("coffeeGlobal", s:foreground, "", "")
call <SID>X("coffeeModuleKeyword", s:function_name, "", "")
call <SID>X("coffeeFuncCall", s:blue, "", "")
" JavaScript Highlighting " JavaScript Highlighting
call <SID>X("javaScriptBraces", s:foreground, "", "") call <SID>X("javaScriptBraces", s:foreground, "", "")
call <SID>X("javaScriptFunction", s:purple, "", "") call <SID>X("javaScriptFunction", s:purple, "", "")
@ -442,10 +379,6 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("htmlArg", s:foreground, "", "") call <SID>X("htmlArg", s:foreground, "", "")
call <SID>X("htmlScriptTag", s:blue, "", "") call <SID>X("htmlScriptTag", s:blue, "", "")
" Blade Tempalte Highlight
call <SID>X("bladeDelimiter", s:orange, "", "")
call <SID>X("bladeKeyword", s:blue, "", "")
" Diff Highlighting " Diff Highlighting
call <SID>X("diffAdded", "", s:green, "none") call <SID>X("diffAdded", "", s:green, "none")
call <SID>X("diffRemoved", "", s:red, "none") call <SID>X("diffRemoved", "", s:red, "none")
@ -467,9 +400,6 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
call <SID>X("VimwikiHeader5", s:orange, "", "") call <SID>X("VimwikiHeader5", s:orange, "", "")
call <SID>X("VimwikiHeader6", s:yellow, "", "") call <SID>X("VimwikiHeader6", s:yellow, "", "")
" YAML
call <SID>X("yamlBlockMappingKey", s:blue, "", "")
" Delete Functions " Delete Functions
delf <SID>X delf <SID>X
delf <SID>rgb delf <SID>rgb

2
vimrc
View File

@ -200,7 +200,7 @@ Plug 'dracula/vim', { 'as': 'dracula' }
Plug 'tpope/vim-markdown' " Markdown Plug 'tpope/vim-markdown' " Markdown
Plug 'bfrg/vim-cpp-modern' " C/C++ Plug 'bfrg/vim-cpp-modern' " C/C++
Plug 'rluba/jai.vim' " JAI Plug 'rluba/jai.vim' " Jai
Plug 'vim-ruby/vim-ruby' " Ruby Plug 'vim-ruby/vim-ruby' " Ruby
Plug 'fatih/vim-go' " Go Plug 'fatih/vim-go' " Go
Plug 'rust-lang/rust.vim' " Rust Plug 'rust-lang/rust.vim' " Rust