From 76fc5cafacbad41a7bb2a9c20935b411a00611c6 Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Sun, 4 Nov 2018 17:48:13 +0000 Subject: [PATCH] update --- vim/colors/monotonous-dark.erb | 52 +++++++++++++++++--------------- vim/colors/monotonous-dark.vim | 54 ++++++++++++++++++++-------------- vimrc | 27 +++++++++++++++-- 3 files changed, 86 insertions(+), 47 deletions(-) diff --git a/vim/colors/monotonous-dark.erb b/vim/colors/monotonous-dark.erb index c369e6f..50eb9a7 100644 --- a/vim/colors/monotonous-dark.erb +++ b/vim/colors/monotonous-dark.erb @@ -42,11 +42,12 @@ # If your colors are defined correctly, the resulting colorscheme is guaranteed # to work in GVim (Windows/Linux), MacVim, and any properly set up terminal emulator. + # TODO rename these to 'base' colors black = ["#131313", 0, "black"] - gray0 = ["#1f2121", 232, "black"] gray_bg_dark2 = ["#181A1B", 232, "gray"] gray_bg_dark3 = ["#1B1C1D", 232, "gray"] gray_bg_dark4 = ["#1F1F1F", 232, "gray"] + gray0 = ["#1f2121", 232, "black"] gray_bg = ["#202122", 234, "black"] gray1 = ["#333535", 237, "black"] gray_deco = ["#3f3f3f", 238, "gray"] @@ -60,16 +61,15 @@ gray7 = ["#aeadad", 250, "white"] white = ["#eee4e4", 255, "white"] - # need red, green , blue, etc colors for syntax - grayred0 = ["#373030", 237, "black"] - grayred3 = ["#6b5d5d", 52, "darkred"] - red1 = ["#866b6b", 52, "darkred"] - red2 = ["#967978", 52, "darkred"] - red3 = ["#a78685", 88, "darkred"] - red4 = ["#b79392", 88, "red"] - red5 = ["#c4a6a5", 88, "red"] - red6 = ["#cab0af", 124, "red"] - red7 = ["#d1bab9", 124, "red"] + darkred1 = ["#373030", 237, "darkred"] + darkred2 = ["#6b5d5d", 52, "darkred"] + darkred3 = ["#866b6b", 52, "darkred"] + red1 = ["#967978", 52, "darkred"] + red2 = ["#a78685", 88, "darkred"] + red3 = ["#b79392", 88, "red"] + lightred1 = ["#c4a6a5", 88, "red"] + lightred2 = ["#cab0af", 124, "red"] + lightred3 = ["#d1bab9", 124, "red"] graygreen0 = ["#303730", 237, "black"] green1 = ["#6b866c", 22, "darkgreen"] @@ -180,15 +180,15 @@ highlights = [ [ "Normal", gray_bg, gray_fg, "NONE" ], - [ "Special", "NONE", red6, "bold" ], - [ "NonText", "NONE", red7, "NONE" ], - [ "Tag", grayred0, "NONE", "NONE" ], + [ "Special", "NONE", lightred2, "bold" ], + [ "NonText", "NONE", lightred3, "NONE" ], + [ "Tag", darkred1, "NONE", "NONE" ], - [ "Identifier", "NONE", red4, "NONE" ], - [ "Function", "NONE", red5, "bold" ], + [ "Identifier", "NONE", red3, "NONE" ], + [ "Function", "NONE", lightred1, "bold" ], - [ "Type", "NONE", red2, "NONE" ], - [ "StorageClass", "NONE", red1, "bold" ], + [ "Type", "NONE", red1, "NONE" ], + [ "StorageClass", "NONE", darkred3, "bold" ], [ "Structure", "StorageClass"], [ "TypeDef", "StorageClass"], @@ -206,8 +206,8 @@ [ "Repeat", "NONE", gray6, "bold" ], [ "Label", "NONE", gray5, "bold" ], [ "Operator", "NONE", gray6, "bold" ], - [ "Keyword", "NONE", gray7, "bold" ], - [ "Exception", "NONE", grayred3, "bold" ], + [ "Keyword", "NONE", gray5, "bold" ], + [ "Exception", "NONE", darkred2, "bold" ], [ "PreProc", "NONE", gray2, "bold" ], [ "Include", "NONE", gray2, "NONE" ], @@ -451,7 +451,7 @@ # javascript [ "jsFunctionKey", "Function" ], - [ "jsFuncCall", "NONE", red3, "bold" ], + [ "jsFuncCall", "NONE", red2, "bold" ], [ "jsFuncCall", "Identifier" ], [ "jsOperator", "Operator" ], [ "jsVariableDef", "Identifier" ], @@ -460,9 +460,9 @@ [ "jsExceptions", "jsGlobalObjects" ], [ "jsBuiltins", "jsGlobalObjects" ], [ "jsStorageClass", "Include" ], - [ "jsObjectKey", "NONE", red4, "NONE"], + [ "jsObjectKey", "NONE", red3, "NONE"], [ "jsObjectProp", "Type" ], - [ "jsObjectValue", "NONE", red1, "NONE" ], + [ "jsObjectValue", "NONE", darkred3, "NONE" ], [ "jsModuleKeyword", "Type" ], [ "jsOperatorKeyword", "Label" ], [ "jsThis", "jsGlobalObjects" ], @@ -478,6 +478,8 @@ [ "pythonDot", "Noise" ], [ "pythonNoise", "Noise" ], [ "pythonExtraOperator", "Operator" ], + [ "pythonDocString", "SpecialComment" ], + [ "pythonSelf", "NONE", gray2, "bold" ], # sql @@ -508,6 +510,7 @@ [ "vimBracket", "vimSep" ], [ "vimOperParen", "Normal" ], [ "vimUserFunc", "Identifier" ], + [ "vimFoldMarker", "Noise" ], # yaml @@ -577,6 +580,9 @@ [ "CtrlPUndoSv", "NONE", red_ui3, "NONE" ], [ "CtrlPUndoPo", "NONE", gray7, "bold" ], + # i3config + [ "Variable", "Function" ], + # to be implemented # "" #shell highlighting diff --git a/vim/colors/monotonous-dark.vim b/vim/colors/monotonous-dark.vim index ba9ff49..7b4e1c6 100644 --- a/vim/colors/monotonous-dark.vim +++ b/vim/colors/monotonous-dark.vim @@ -12,7 +12,7 @@ endif let colors_name = "monotonous-dark" if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") - hi Normal ctermbg=234 ctermfg=243 cterm=NONE guibg=#2a2c2d guifg=#767070 gui=NONE + hi Normal ctermbg=234 ctermfg=243 cterm=NONE guibg=#202122 guifg=#767070 gui=NONE set background=dark hi Special ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#cab0af gui=bold hi NonText ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#d1bab9 gui=NONE @@ -35,14 +35,14 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi Repeat ctermbg=NONE ctermfg=247 cterm=bold guibg=NONE guifg=#9a9393 gui=bold hi Label ctermbg=NONE ctermfg=244 cterm=bold guibg=NONE guifg=#857f7f gui=bold hi Operator ctermbg=NONE ctermfg=247 cterm=bold guibg=NONE guifg=#9a9393 gui=bold - hi Keyword ctermbg=NONE ctermfg=250 cterm=bold guibg=NONE guifg=#aeadad gui=bold + hi Keyword ctermbg=NONE ctermfg=244 cterm=bold guibg=NONE guifg=#857f7f gui=bold hi Exception ctermbg=NONE ctermfg=52 cterm=bold guibg=NONE guifg=#6b5d5d gui=bold - hi PreProc ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#494545 gui=bold - hi Include ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494545 gui=NONE + hi PreProc ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#494646 gui=bold + hi Include ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494646 gui=NONE hi Comment ctermbg=NONE ctermfg=240 cterm=italic guibg=NONE guifg=#5d5d5d gui=italic hi SpecialComment ctermbg=NONE ctermfg=244 cterm=italic guibg=NONE guifg=#857f7f gui=italic hi Todo ctermbg=NONE ctermfg=247 cterm=italic guibg=NONE guifg=#9a9393 gui=italic - hi Ignore ctermbg=NONE ctermfg=234 cterm=NONE guibg=NONE guifg=#2a2c2d gui=NONE + hi Ignore ctermbg=NONE ctermfg=234 cterm=NONE guibg=NONE guifg=#202122 gui=NONE hi Error ctermbg=NONE ctermfg=196 cterm=bold guibg=NONE guifg=#c74444 gui=bold hi Underlined ctermbg=NONE ctermfg=NONE cterm=underline guibg=NONE guifg=NONE gui=underline hi StatusLine ctermbg=238 ctermfg=250 cterm=NONE guibg=#3f3f3f guifg=#aeadad gui=NONE @@ -50,14 +50,14 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi TabLine ctermbg=238 ctermfg=243 cterm=NONE guibg=#3f3f3f guifg=#716c6c gui=NONE hi TabLineFill ctermbg=238 ctermfg=238 cterm=NONE guibg=#3f3f3f guifg=#3f3f3f gui=NONE hi TabLineSel ctermbg=238 ctermfg=250 cterm=NONE guibg=#3f3f3f guifg=#aeadad gui=NONE - hi VertSplit ctermbg=234 ctermfg=238 cterm=NONE guibg=#2a2c2d guifg=#3f3f3f gui=NONE - hi FoldColumn ctermbg=234 ctermfg=238 cterm=NONE guibg=#2a2c2d guifg=#494545 gui=NONE - hi ColorColumn ctermbg=232 ctermfg=NONE cterm=NONE guibg=#272829 guifg=NONE gui=NONE - hi SignColumn ctermbg=234 ctermfg=250 cterm=NONE guibg=#2a2c2d guifg=#aeadad gui=NONE - hi CursorLine ctermbg=232 ctermfg=NONE cterm=NONE guibg=#272829 guifg=NONE gui=NONE + hi VertSplit ctermbg=234 ctermfg=238 cterm=NONE guibg=#202122 guifg=#3f3f3f gui=NONE + hi FoldColumn ctermbg=234 ctermfg=238 cterm=NONE guibg=#202122 guifg=#494646 gui=NONE + hi ColorColumn ctermbg=232 ctermfg=NONE cterm=NONE guibg=#1B1C1D guifg=NONE gui=NONE + hi SignColumn ctermbg=234 ctermfg=250 cterm=NONE guibg=#202122 guifg=#aeadad gui=NONE + hi CursorLine ctermbg=232 ctermfg=NONE cterm=NONE guibg=#1B1C1D guifg=NONE gui=NONE hi Title ctermbg=NONE ctermfg=247 cterm=bold guibg=NONE guifg=#9a9393 gui=bold - hi LineNr ctermbg=234 ctermfg=240 cterm=NONE guibg=#2a2c2d guifg=#5d5959 gui=NONE - hi CursorLineNr ctermbg=234 ctermfg=244 cterm=NONE guibg=#2a2c2d guifg=#857f7f gui=NONE + hi LineNr ctermbg=234 ctermfg=240 cterm=NONE guibg=#202122 guifg=#5d5959 gui=NONE + hi CursorLineNr ctermbg=234 ctermfg=244 cterm=NONE guibg=#202122 guifg=#857f7f gui=NONE hi Pmenu ctermbg=237 ctermfg=244 cterm=NONE guibg=#333535 guifg=#857f7f gui=NONE hi PmenuSbar ctermbg=237 ctermfg=237 cterm=NONE guibg=#333535 guifg=#333535 gui=NONE hi PmenuSel ctermbg=237 ctermfg=250 cterm=bold guibg=#333535 guifg=#aeadad gui=bold @@ -67,7 +67,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi DiffChange ctermbg=17 ctermfg=NONE cterm=NONE guibg=#242528 guifg=NONE gui=NONE hi DiffDelete ctermbg=52 ctermfg=NONE cterm=NONE guibg=#282020 guifg=NONE gui=NONE hi DiffText ctermbg=17 ctermfg=21 cterm=NONE guibg=#242528 guifg=#656a7c gui=NONE - hi IncSearch ctermbg=17 ctermfg=234 cterm=NONE guibg=#93adc2 guifg=#2a2c2d gui=NONE + hi IncSearch ctermbg=17 ctermfg=234 cterm=NONE guibg=#93adc2 guifg=#202122 gui=NONE hi Search ctermbg=17 ctermfg=250 cterm=NONE guibg=#49535a guifg=#aeadad gui=NONE hi Visual ctermbg=17 ctermfg=NONE cterm=NONE guibg=#384046 guifg=NONE gui=NONE hi VisualNOS ctermbg=52 ctermfg=NONE cterm=NONE guibg=#463838 guifg=NONE gui=NONE @@ -83,9 +83,9 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi MoreMsg ctermbg=NONE ctermfg=255 cterm=NONE guibg=NONE guifg=#eee4e4 gui=NONE hi Question ctermbg=NONE ctermfg=247 cterm=NONE guibg=NONE guifg=#797532 gui=NONE hi WarningMsg ctermbg=NONE ctermfg=166 cterm=bold guibg=NONE guifg=#a67038 gui=bold - hi Cursor ctermbg=124 ctermfg=0 cterm=bold guibg=#d1bab9 guifg=#131313 gui=bold - hi CursorColumn ctermbg=232 ctermfg=NONE cterm=NONE guibg=#292a29 guifg=NONE gui=NONE - hi EndOfBuffer ctermbg=234 ctermfg=234 cterm=NONE guibg=#2a2c2d guifg=#2a2c2d gui=NONE + hi Cursor ctermbg=255 ctermfg=0 cterm=bold guibg=#eee4e4 guifg=#131313 gui=bold + hi CursorColumn ctermbg=232 ctermfg=NONE cterm=NONE guibg=#1F1F1F guifg=NONE gui=NONE + hi EndOfBuffer ctermbg=234 ctermfg=234 cterm=NONE guibg=#202122 guifg=#202122 gui=NONE hi Noise ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#5d5959 gui=NONE hi TabLineNum ctermbg=238 ctermfg=243 cterm=bold guibg=#3f3f3f guifg=#716c6c gui=bold hi TabLineNumSel ctermbg=238 ctermfg=244 cterm=bold guibg=#3f3f3f guifg=#857f7f gui=bold @@ -114,7 +114,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi StatusLineFileReadOnlyActive ctermbg=NONE ctermfg=124 cterm=italic guibg=NONE guifg=#725454 gui=italic hi StatusLineWarning ctermbg=238 ctermfg=244 cterm=bold guibg=#3f3f3f guifg=#857f7f gui=bold hi StatusLineWarningActive ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold - hi LinterDash ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494545 gui=NONE + hi LinterDash ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494646 gui=NONE hi LinterDashActive ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#5d5959 gui=NONE hi LinterError ctermbg=NONE ctermfg=196 cterm=bold guibg=NONE guifg=#6a2e2e gui=bold hi LinterErrorActive ctermbg=NONE ctermfg=196 cterm=bold guibg=NONE guifg=#833838 gui=bold @@ -143,6 +143,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi link cssIdentifier cssIdentifier hi link cssClassName cssClass hi link cssClassNameDot cssClass + hi link cssTagName htmlTagName hi link cssPseudoClassId cssClassName hi link cssKeyFrameSelector Label hi link cssFunctionName cssIdentifier @@ -244,8 +245,10 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi link pythonDot Noise hi link pythonNoise Noise hi link pythonExtraOperator Operator + hi link pythonDocString SpecialComment + hi pythonSelf ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#494646 gui=bold hi link sqlOperator Operator - hi vimFoldMarker ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494545 gui=NONE + hi vimFoldMarker ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494646 gui=NONE hi link vimMap Noise hi link vimAbb vimMap hi link VimCommand Statement @@ -268,6 +271,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi link vimBracket vimSep hi link vimOperParen Normal hi link vimUserFunc Identifier + hi link vimFoldMarker Noise hi link yamlKeyValueDelimiter Noise hi link yamlFowIndicator Noise hi link confComment Comment @@ -306,16 +310,17 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi CtrlPqfLineCol ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold hi CtrlPUndoT ctermbg=NONE ctermfg=244 cterm=NONE guibg=NONE guifg=#857f7f gui=NONE hi CtrlPUndoBr ctermbg=NONE ctermfg=237 cterm=NONE guibg=NONE guifg=#333535 gui=NONE - hi CtrlPUndoNr ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494545 gui=NONE + hi CtrlPUndoNr ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494646 gui=NONE hi CtrlPUndoSv ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#725454 gui=NONE hi CtrlPUndoPo ctermbg=NONE ctermfg=250 cterm=bold guibg=NONE guifg=#aeadad gui=bold + hi link Variable Function elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 set t_Co=16 hi Normal ctermbg=black ctermfg=gray cterm=NONE set background=dark hi Special ctermbg=NONE ctermfg=red cterm=bold hi NonText ctermbg=NONE ctermfg=red cterm=NONE - hi Tag ctermbg=black ctermfg=NONE cterm=NONE + hi Tag ctermbg=darkred ctermfg=NONE cterm=NONE hi Identifier ctermbg=NONE ctermfg=red cterm=NONE hi Function ctermbg=NONE ctermfg=red cterm=bold hi Type ctermbg=NONE ctermfg=darkred cterm=NONE @@ -334,7 +339,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi Repeat ctermbg=NONE ctermfg=darkgray cterm=bold hi Label ctermbg=NONE ctermfg=darkgray cterm=bold hi Operator ctermbg=NONE ctermfg=darkgray cterm=bold - hi Keyword ctermbg=NONE ctermfg=white cterm=bold + hi Keyword ctermbg=NONE ctermfg=darkgray cterm=bold hi Exception ctermbg=NONE ctermfg=darkred cterm=bold hi PreProc ctermbg=NONE ctermfg=gray cterm=bold hi Include ctermbg=NONE ctermfg=gray cterm=NONE @@ -382,7 +387,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi MoreMsg ctermbg=NONE ctermfg=white cterm=NONE hi Question ctermbg=NONE ctermfg=darkgray cterm=NONE hi WarningMsg ctermbg=NONE ctermfg=yellow cterm=bold - hi Cursor ctermbg=red ctermfg=black cterm=bold + hi Cursor ctermbg=white ctermfg=black cterm=bold hi CursorColumn ctermbg=gray ctermfg=NONE cterm=NONE hi EndOfBuffer ctermbg=black ctermfg=black cterm=NONE hi Noise ctermbg=NONE ctermfg=gray cterm=NONE @@ -442,6 +447,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi link cssIdentifier cssIdentifier hi link cssClassName cssClass hi link cssClassNameDot cssClass + hi link cssTagName htmlTagName hi link cssPseudoClassId cssClassName hi link cssKeyFrameSelector Label hi link cssFunctionName cssIdentifier @@ -543,6 +549,8 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi link pythonDot Noise hi link pythonNoise Noise hi link pythonExtraOperator Operator + hi link pythonDocString SpecialComment + hi pythonSelf ctermbg=NONE ctermfg=gray cterm=bold hi link sqlOperator Operator hi vimFoldMarker ctermbg=NONE ctermfg=gray cterm=NONE hi link vimMap Noise @@ -567,6 +575,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi link vimBracket vimSep hi link vimOperParen Normal hi link vimUserFunc Identifier + hi link vimFoldMarker Noise hi link yamlKeyValueDelimiter Noise hi link yamlFowIndicator Noise hi link confComment Comment @@ -608,6 +617,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi CtrlPUndoNr ctermbg=NONE ctermfg=gray cterm=NONE hi CtrlPUndoSv ctermbg=NONE ctermfg=red cterm=NONE hi CtrlPUndoPo ctermbg=NONE ctermfg=white cterm=bold + hi link Variable Function endif augroup cursorlinebg diff --git a/vimrc b/vimrc index eb7b0b1..b52630b 100644 --- a/vimrc +++ b/vimrc @@ -41,11 +41,26 @@ augroup END "}}} +"#html5{{{ +" https://github.com/othree/html5.vim +Plug 'othree/html5.vim' +"}}} + " #php.vim{{{ " https://github.com/StanAngeloff/php.vim Plug 'StanAngeloff/php.vim' "}}} +"#vim-json{{{ +" https://github.com/elzr/vim-json +Plug 'elzr/vim-json' +"}}} + +"#i3config.vim{{{ +" https://github.com/mboughaba/i3config.vim +Plug 'mboughaba/i3config.vim' +"}}} + " #tagbar {{{ Plug 'majutsushi/tagbar' @@ -213,8 +228,14 @@ Plug 'shawncplus/phpcomplete.vim' " https://github.com/joseluis/wordpress.vim-generator "}}} +" #wordpress.vim{{{ +" doesn't support universal ctags " #Plug 'dsawardekar/wordpress.vim' -" disabled - doesn't support universal ctags? +" This fork does: +" https://github.com/DArcMattr/wordpress.vim/tree/universal-ctags +" Using studio-vx fork +Plug 'studio-vx/wordpress.vim', { 'branch': 'universal-ctags' } +"}}} " #vim-commentary{{{ " https://github.com/tpope/vim-commentary @@ -560,7 +581,9 @@ function! MyFoldText() "{{{ let l:linecount = v:foldend - v:foldstart " don't display foldmarker braces - let l:line = substitute(getline(v:foldstart), '"{{{', '', '') + " put one of the braces in brackets so vim doesn't treat + " it as an actual fold marker + let l:line = substitute(getline(v:foldstart), '"\?{\({\){', '', '') " don't display vim comment quotation marks let l:line = substitute(l:line, "\^\"\\s\\?", '', '')