formatting and folds

This commit is contained in:
ManjaroOne666 2018-03-28 20:24:50 +01:00
parent 68b716e82a
commit 88d50f1f21
1 changed files with 76 additions and 59 deletions

View File

@ -24,7 +24,7 @@ endif
"""""""""""""" """"""""""""""
" interface " interface
hi InterfaceH1 ctermfg=255 guifg=#eeeeee ctermbg=none guibg=NONE hi InterfaceH1 ctermfg=255 guifg=#eeeeee ctermbg=none guibg=NONE"{{{
hi InterfaceH2 ctermfg=250 guifg=#bcbcbc ctermbg=none guibg=NONE hi InterfaceH2 ctermfg=250 guifg=#bcbcbc ctermbg=none guibg=NONE
hi InterfaceH3 ctermfg=248 guifg=#a8a8a8 ctermbg=none guibg=NONE hi InterfaceH3 ctermfg=248 guifg=#a8a8a8 ctermbg=none guibg=NONE
@ -50,8 +50,6 @@ hi def link InterfaceFlagBright CRNormalBright
hi def link InterfaceFlag CRNormal hi def link InterfaceFlag CRNormal
hi def link InterfaceFlagDark CRNormalDark hi def link InterfaceFlagDark CRNormalDark
hi InterfaceSignError ctermfg=196 guifg=#ff0000 gui=bold hi InterfaceSignError ctermfg=196 guifg=#ff0000 gui=bold
hi InterfaceSignErrorDark ctermfg=196 guifg=#aa0000 gui=bold hi InterfaceSignErrorDark ctermfg=196 guifg=#aa0000 gui=bold
hi InterfaceSignWarning ctermfg=88 guifg=#870000 gui=bold hi InterfaceSignWarning ctermfg=88 guifg=#870000 gui=bold
@ -60,9 +58,10 @@ hi InterfaceSignWarningDark ctermfg=88 guifg=#660000 gui=bold
hi InterfaceSignAdd ctermfg=22 guifg=#395239 hi InterfaceSignAdd ctermfg=22 guifg=#395239
hi InterfaceSignModified ctermfg=178 guifg=#4e4e33 hi InterfaceSignModified ctermfg=178 guifg=#4e4e33
hi InterfaceSignDelete ctermfg=88 guifg=#582b2b hi InterfaceSignDelete ctermfg=88 guifg=#582b2b
"}}}
" general colours " general colours
hi CRNormalBright ctermfg=250 guifg=#bcbcbc hi CRNormalBright ctermfg=250 guifg=#bcbcbc"{{{
hi def link CRNormal Normal hi def link CRNormal Normal
hi CRNormalDark ctermfg=242 guifg=#666666 hi CRNormalDark ctermfg=242 guifg=#666666
@ -99,9 +98,10 @@ hi CRCommentDark ctermfg=238 guifg=#444444 gui=italic cterm=italic term=itali
hi CRWarning ctermfg=255 guifg=#eeeeee ctermbg=52 guibg=#340000 hi CRWarning ctermfg=255 guifg=#eeeeee ctermbg=52 guibg=#340000
hi CRError ctermfg=255 guifg=#eeeeee ctermbg=124 guibg=#af0000 hi CRError ctermfg=255 guifg=#eeeeee ctermbg=124 guibg=#af0000
hi CRErrorInverse ctermfg=255 guifg=#000000 ctermbg=124 guibg=#af0000 hi CRErrorInverse ctermfg=255 guifg=#000000 ctermbg=124 guibg=#af0000
"}}}
" HTML colours " HTML colours
hi CRHtmlNormalBright ctermfg=67 guifg=#5f87af hi CRHtmlNormalBright ctermfg=67 guifg=#5f87af"{{{
hi CRHtmlNormal ctermfg=60 guifg=#5f5f87 hi CRHtmlNormal ctermfg=60 guifg=#5f5f87
hi CRHtmlBaseBright ctermfg=39 guifg=#6590ff hi CRHtmlBaseBright ctermfg=39 guifg=#6590ff
@ -120,11 +120,11 @@ hi CRHtmlSpecial ctermfg=69 guifg=#97b1ff
hi CRHtmlSpecialDark ctermfg=61 guifg=#5f5faf hi CRHtmlSpecialDark ctermfg=61 guifg=#5f5faf
" hi CRHtmlString ctermfg=105 guifg=#8787ff " hi CRHtmlString ctermfg=105 guifg=#8787ff
"}}}
" CSS colours " CSS colours
hi CRCssBaseBright ctermfg=40 guifg=#00d700 hi CRCssBaseBright ctermfg=40 guifg=#00d700"{{{
hi CRCssBase ctermfg=28 guifg=#008700 hi CRCssBase ctermfg=28 guifg=#008700
hi CRCssBaseDark ctermfg=22 guifg=#005f00 hi CRCssBaseDark ctermfg=22 guifg=#005f00
@ -134,14 +134,15 @@ hi CRCssAlt ctermfg=29 guifg=#444a44
hi CRCssSelectorBright ctermfg=158 guifg=#abffd5 hi CRCssSelectorBright ctermfg=158 guifg=#abffd5
hi CRCssSelector ctermfg=85 guifg=#5fffaf hi CRCssSelector ctermfg=85 guifg=#5fffaf
hi CRCssSelectorDark ctermfg=72 guifg=#2dac6d hi CRCssSelectorDark ctermfg=72 guifg=#2dac6d
"}}}
""""""""""""""""""" """""""""""""""""""
" #definitions " #definitions
"""""""""""""""""""" """"""""""""""""""""
" #general definitions " #general definitions
hi Underlined cterm=underline term=underline gui=underline hi Underlined cterm=underline term=underline gui=underline"{{{
hi Ignore ctermfg=232 guifg=NONE hi Ignore ctermfg=232 guifg=NONE
hi! def link Error CRError hi! def link Error CRError
hi! def link ErrorMsg CRError hi! def link ErrorMsg CRError
@ -174,14 +175,16 @@ hi Todo ctermfg=251 guifg=#c6c6c6 ctermbg=none guibg=NONE
hi Search ctermfg=255 guifg=#ffffff ctermbg=none guibg=NONE gui=NONE cterm=NONE hi Search ctermfg=255 guifg=#ffffff ctermbg=none guibg=NONE gui=NONE cterm=NONE
hi IncSearch ctermfg=232 guifg=#000000 ctermbg=255 guibg=#ffffff gui=NONE cterm=NONE hi IncSearch ctermfg=232 guifg=#000000 ctermbg=255 guibg=#ffffff gui=NONE cterm=NONE
hi! def link QuickFixLine InterfaceSignError hi! def link QuickFixLine InterfaceSignError
"}}}
" #comment definitions " #comment definitions
hi! def link Comment CRComment hi! def link Comment CRComment"{{{
hi! def link SpecialComment CRCommentBright hi! def link SpecialComment CRCommentBright
hi! def link preProc CRCommentBright hi! def link preProc CRCommentBright
"}}}
" #interface definitions " #interface definitions
hi!def link SpecialKey InterfaceSpecial hi!def link SpecialKey InterfaceSpecial"{{{
hi! def link Directory InterfaceSpecial hi! def link Directory InterfaceSpecial
hi! def link WarningMsg InterfaceWarningMsg hi! def link WarningMsg InterfaceWarningMsg
@ -202,7 +205,34 @@ hi TabLineSel ctermfg=250 guifg=#bcbcbc ctermbg=234 guibg=#1c1c1c
hi TabModified ctermfg=250 guifg=#bcbcbc ctermbg=234 guibg=#1c1c1c hi TabModified ctermfg=250 guifg=#bcbcbc ctermbg=234 guibg=#1c1c1c
hi TabModifiedSelected ctermfg=255 guifg=#eeeeee ctermbg=234 guibg=#1c1c1c hi TabModifiedSelected ctermfg=255 guifg=#eeeeee ctermbg=234 guibg=#1c1c1c
hi clear StatusLine hi VertSplit ctermfg=234 guifg=#090909 ctermbg=none guibg=#090909 term=none cterm=none
hi Folded ctermfg=240 guifg=#585858 ctermbg=none guibg=NONE term=bold
hi FoldColumn ctermfg=235 guifg=#262626 ctermbg=233 guibg=#111111 cterm=bold term=bold
hi LineNr ctermfg=237 guifg=#3a3a3a ctermbg=none guibg=NONE cterm=none
hi CursorLine ctermbg=235 guibg=#222222 gui=NONE term=NONE cterm=NONE
hi CursorLineNr ctermfg=243 guifg=#767676 ctermbg=none guibg=NONE cterm=none
hi EndOfBuffer ctermfg=233 guifg=#121212 ctermbg=none guibg=NONE
hi ColorColumn ctermbg=52 guibg=#1d0808
hi SignColumn ctermfg=255 guifg=#eeeeee ctermbg=none guibg=NONE
hi DiffAdd ctermbg=22 guibg=#001000 ctermfg=248 guifg=#aaaaaa term=none cterm=none gui=NONE
hi DiffChange ctermbg=235 guibg=#101010 ctermfg=243 guifg=#777777 cterm=none gui=NONE
hi DiffDelete ctermbg=52 guibg=#200000 ctermfg=236 guifg=#333333 cterm=none gui=NONE
hi DiffText ctermbg=235 guibg=#101010 ctermfg=240 guifg=#cccccc cterm=none gui=NONE
hi! def link SpellBad CRError
hi! def link SpellCap CRWarning
hi! def link qfFilename CRNoiseBright
hi! def link qfLineNr CRNoise
hi! def link qfSeparator CRNoiseDark
hi! def link qfError InterfaceSignErrorDark
hi MatchParen ctermfg=255 guifg=#ffffff ctermbg=241 guibg=#292929 gui=underline
"}}}
" status line
hi clear StatusLine"{{{
hi StatusLine ctermfg=238 guifg=#444444 ctermbg=232 guibg=NONE gui=NONE hi StatusLine ctermfg=238 guifg=#444444 ctermbg=232 guibg=NONE gui=NONE
hi StatusLineNC ctermfg=238 guifg=#444444 ctermbg=232 guibg=NONE term=none cterm=none gui=NONE hi StatusLineNC ctermfg=238 guifg=#444444 ctermbg=232 guibg=NONE term=none cterm=none gui=NONE
@ -268,34 +298,10 @@ augroup statuscursorlines
au InsertEnter * call DoInsertEnter() au InsertEnter * call DoInsertEnter()
au InsertLeave * call DoInsertLeave() au InsertLeave * call DoInsertLeave()
augroup END augroup END
"}}}
hi VertSplit ctermfg=234 guifg=#090909 ctermbg=none guibg=#090909 term=none cterm=none
hi Folded ctermfg=240 guifg=#585858 ctermbg=none guibg=NONE term=bold
hi FoldColumn ctermfg=235 guifg=#262626 ctermbg=233 guibg=#111111 cterm=bold term=bold
hi LineNr ctermfg=237 guifg=#3a3a3a ctermbg=none guibg=NONE cterm=none
hi CursorLine ctermbg=235 guibg=#222222 gui=NONE term=NONE cterm=NONE
hi CursorLineNr ctermfg=243 guifg=#767676 ctermbg=none guibg=NONE cterm=none
hi EndOfBuffer ctermfg=233 guifg=#121212 ctermbg=none guibg=NONE
hi ColorColumn ctermbg=52 guibg=#1d0808
hi SignColumn ctermfg=255 guifg=#eeeeee ctermbg=none guibg=NONE
hi DiffAdd ctermbg=22 guibg=#001000 ctermfg=248 guifg=#aaaaaa term=none cterm=none gui=NONE
hi DiffChange ctermbg=235 guibg=#101010 ctermfg=243 guifg=#777777 cterm=none gui=NONE
hi DiffDelete ctermbg=52 guibg=#200000 ctermfg=236 guifg=#333333 cterm=none gui=NONE
hi DiffText ctermbg=235 guibg=#101010 ctermfg=240 guifg=#cccccc cterm=none gui=NONE
hi! def link SpellBad CRError
hi! def link SpellCap CRWarning
hi! def link qfFilename CRNoiseBright
hi! def link qfLineNr CRNoise
hi! def link qfSeparator CRNoiseDark
hi! def link qfError InterfaceSignErrorDark
hi MatchParen ctermfg=255 guifg=#ffffff ctermbg=241 guibg=#292929 gui=underline
" #vim definitions " #vim definitions
hi! def link VimGroup Type hi! def link VimGroup Type"{{{
hi! def link VimGroupName CRIdentifier hi! def link VimGroupName CRIdentifier
hi! def link VimGroupList CRNormalDark hi! def link VimGroupList CRNormalDark
hi! def link VimHiGroup TypeBright hi! def link VimHiGroup TypeBright
@ -330,9 +336,10 @@ hi! def link vimSynPatRange CRSpecialDark
hi! def link vimDefLink CRNoiseDark hi! def link vimDefLink CRNoiseDark
hi! def link vimHighlight CRNoiseDark hi! def link vimHighlight CRNoiseDark
hi! vimFoldMarker ctermfg=233 guifg=#222222 hi! vimFoldMarker ctermfg=233 guifg=#222222
"}}}
" #scss definitions " #scss definitions
hi! def link scssParamaters CRNoise hi! def link scssParamaters CRNoise"{{{
hi! def link scssVariableAssignment CRNoise hi! def link scssVariableAssignment CRNoise
hi! def link scssVariableValue CRNoise hi! def link scssVariableValue CRNoise
hi! def link scssBooleanOp CRNoiseBright hi! def link scssBooleanOp CRNoiseBright
@ -359,9 +366,10 @@ hi! def link scssReturn CRScssMediaKeyword
hi! def link scssIf CRScssMediaKeyword hi! def link scssIf CRScssMediaKeyword
hi! def link scssElse CRScssMediaKeyword hi! def link scssElse CRScssMediaKeyword
hi! def link scssCondition CRCssAlt hi! def link scssCondition CRCssAlt
"}}}
" #css definitions " #css definitions
hi! def link cssNoise CRNoise hi! def link cssNoise CRNoise"{{{
hi! def link cssBraces CssNoise hi! def link cssBraces CssNoise
hi! def link cssAttrComma CssNoise hi! def link cssAttrComma CssNoise
hi! def link cssFunctionComma CRNoise hi! def link cssFunctionComma CRNoise
@ -396,9 +404,10 @@ hi! def link cssSelectorOp CRNoise
hi! def link cssInclude CRNoise hi! def link cssInclude CRNoise
hi! def link cssIncludeKeyword CRNoiseBright hi! def link cssIncludeKeyword CRNoiseBright
hi! def link cssDimensionProp cssProp hi! def link cssDimensionProp cssProp
"}}}
" #html definitions " #html definitions
hi! def link htmlNormal CRHtmlNormal hi! def link htmlNormal CRHtmlNormal"{{{
hi! def link htmlTitle CRHtmlAltBright hi! def link htmlTitle CRHtmlAltBright
hi! def link htmlTag CRNoise hi! def link htmlTag CRNoise
hi! def link htmlEndTag htmlTag hi! def link htmlEndTag htmlTag
@ -422,23 +431,25 @@ hi! def link htmlDataArg htmlTagName
hi! def link htmlDataValue CRHtmlString hi! def link htmlDataValue CRHtmlString
hi! def link htmlHrefArg htmlArg hi! def link htmlHrefArg htmlArg
hi! def link htmlHrefValue CRHtmlBaseBright hi! def link htmlHrefValue CRHtmlBaseBright
"}}}
" #html css definitions " #html css definitions
hi! def link cssClassName scssSelectorName hi! def link cssClassName scssSelectorName"{{{
hi! def link cssClassNameDot scssSelectorName hi! def link cssClassNameDot scssSelectorName
hi! def link cssIdentifier CRCssSelectorBright hi! def link cssIdentifier CRCssSelectorBright
hi! def link cssClassAttr CRNoise hi! def link cssClassAttr CRNoise
hi! def link cssIdentifierAttr CRNoise hi! def link cssIdentifierAttr CRNoise
"}}}
" #php definitions " #php definitions
hi! def link phpRegion Normal hi! def link phpRegion Normal "{{{
hi! def link phpComparison Operator hi! def link phpComparison Operator
hi! def link phpVarSelector IdentifierDark hi! def link phpVarSelector IdentifierDark
hi! def link wpFunction IdentifierBright hi! def link wpFunction IdentifierBright
"}}}
" #javaScript definitions " #javaScript definitions
hi! def link jsFunction CRIdentifierDark hi! def link jsFunction CRIdentifierDark"{{{
hi! def link jsFuncName CRIdentifier hi! def link jsFuncName CRIdentifier
hi! def link jsFunctionKey CRSpecialBright hi! def link jsFunctionKey CRSpecialBright
hi! def link jsFuncBlock CRIdentifier hi! def link jsFuncBlock CRIdentifier
@ -466,9 +477,10 @@ hi! def link jsArrowFunction CRNoiseBright
hi! def link jsImport CRNoise hi! def link jsImport CRNoise
hi! def link jsFrom jsImport hi! def link jsFrom jsImport
hi! def link jsExport CRNoiseBright hi! def link jsExport CRNoiseBright
"}}}
" #vue definitions " #vue definitions
hi! vueTagSpecial guifg=#8700d7 hi! vueTagSpecial guifg=#8700d7"{{{
hi! def link vueComponentName CRHtmlSpecial hi! def link vueComponentName CRHtmlSpecial
hi! def link vueDynamicComponent CRHtmlSpecialDark hi! def link vueDynamicComponent CRHtmlSpecialDark
hi! def link vueTransitionComponent vueDynamicComponent hi! def link vueTransitionComponent vueDynamicComponent
@ -499,13 +511,15 @@ hi! def link GitGutterAdd InterfaceSignAdd
hi! def link GitGutterChange InterfaceSignModified hi! def link GitGutterChange InterfaceSignModified
hi! def link GitGutterDelete InterfaceSignDelete hi! def link GitGutterDelete InterfaceSignDelete
hi! def link GitGutterChangeDelete InterfaceSignModified hi! def link GitGutterChangeDelete InterfaceSignModified
"}}}
""""""""""""""" """""""""""""""
" #highlighting " #highlighting
""""""""""""""" """""""""""""""
" #vimwiki highlighting " #vimwiki highlighting
hi VimwikiLink ctermfg=252 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c hi VimwikiLink ctermfg=252 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c"{{{
hi! def link VimwikiHeaderChar CRNoiseDark hi! def link VimwikiHeaderChar CRNoiseDark
hi VimwikiHeader1 ctermbg=242 guibg=#666666 ctermfg=255 guifg=#eeeeee hi VimwikiHeader1 ctermbg=242 guibg=#666666 ctermfg=255 guifg=#eeeeee
hi VimwikiHeader2 ctermbg=238 guibg=#444444 ctermfg=255 guifg=#eeeeee hi VimwikiHeader2 ctermbg=238 guibg=#444444 ctermfg=255 guifg=#eeeeee
@ -514,9 +528,10 @@ hi VimwikiHeader4 ctermbg=236 guibg=#303030 guibg=#303030 cter
hi VimwikiHeader5 ctermbg=236 guibg=#303030 guibg=#303030 ctermfg=246 guifg=#949494 hi VimwikiHeader5 ctermbg=236 guibg=#303030 guibg=#303030 ctermfg=246 guifg=#949494
hi VimwikiHeader6 ctermbg=236 guibg=#303030 guibg=#303030 ctermfg=244 guifg=#808080 hi VimwikiHeader6 ctermbg=236 guibg=#303030 guibg=#303030 ctermfg=244 guifg=#808080
hi VimwikiListTodo ctermbg=233 guibg=#121212 ctermfg=255 guifg=#eeeeee hi VimwikiListTodo ctermbg=233 guibg=#121212 ctermfg=255 guifg=#eeeeee
"}}}
" #shell highlighting " #shell highlighting
" TODO do properly " TODO do properly{{{
hi! def link shConditional shLoop hi! def link shConditional shLoop
hi! def link shFunctionTwo CRIdentifierBright hi! def link shFunctionTwo CRIdentifierBright
hi! def link shFunction CRIdentifier hi! def link shFunction CRIdentifier
@ -530,13 +545,14 @@ hi! def link shCommandSub CRSpecialDark
hi! def link shEscape CRNoise hi! def link shEscape CRNoise
hi! def link shTestOpr CRNoise hi! def link shTestOpr CRNoise
hi! def link shSnglCase CRNoise hi! def link shSnglCase CRNoise
"}}}
" #config highlighting " #config highlighting
hi! def link confComment CRCommentDark hi! def link confComment CRCommentDark"{{{
"}}}
" #bufexplorer highlighting " #bufexplorer highlighting
hi! def link bufExplorerBufNbr InterfaceH1 hi! def link bufExplorerBufNbr InterfaceH1"{{{
hi! def link bufExplorerMapping InterfaceHelpBright hi! def link bufExplorerMapping InterfaceHelpBright
hi! def link bufExplorerHelp InterfaceHelp hi! def link bufExplorerHelp InterfaceHelp
hi! def link bufExplorerOpenIn InterfaceSpecial hi! def link bufExplorerOpenIn InterfaceSpecial
@ -555,10 +571,10 @@ hi! def link bufExplorerLockedBuf InterfaceSpecial
hi! def link bufExplorerModBuf InterfaceSignWarning hi! def link bufExplorerModBuf InterfaceSignWarning
hi! def link bufExplorerUnlBuf InterfaceNormalDark hi! def link bufExplorerUnlBuf InterfaceNormalDark
hi! def link bufExplorerInactBuf InterfaceNormal hi! def link bufExplorerInactBuf InterfaceNormal
"}}}
" #tagbar highlighting " #tagbar highlighting
" TagbarHighlight defined in vimrc as it gets overridden " TagbarHighlight defined in vimrc as it gets overridden{{{
" by plugin when defined in here " by plugin when defined in here
hi! def link TagbarFoldIcon InterfaceNormal hi! def link TagbarFoldIcon InterfaceNormal
@ -580,20 +596,20 @@ hi! def link TagbarAccessProtected InterfaceH2
hi! def link TagbarAccessPrivate InterfaceH2 hi! def link TagbarAccessPrivate InterfaceH2
hi! TagbarHighlight ctermfg=255 guifg=#eeeeee ctermbg=240 guibg=#585858 hi! TagbarHighlight ctermfg=255 guifg=#eeeeee ctermbg=240 guibg=#585858
"}}}
" #netrw highlighting " #netrw highlighting
hi! def link netrwVersion InterfaceNormalBright hi! def link netrwVersion InterfaceNormalBright"{{{
hi! def link netrwClassify InterfaceNormal hi! def link netrwClassify InterfaceNormal
hi! def link netrwTreebar InterfaceNormalDark hi! def link netrwTreebar InterfaceNormalDark
hi! def link netrwHelpCmd InterfaceHelp hi! def link netrwHelpCmd InterfaceHelp
hi! def link netrwCmdNote InterfaceHelpBright hi! def link netrwCmdNote InterfaceHelpBright
hi! def link netrwQuickHelp netrwCmdNote hi! def link netrwQuickHelp netrwCmdNote
hi! def link netrwList InterfaceH3 hi! def link netrwList InterfaceH3
"}}}
" #nerdtree highlighting " #nerdtree highlighting
hi! def link NERDTreeDir InterfaceNormalBright hi! def link NERDTreeDir InterfaceNormalBright"{{{
hi! def link NERDTreeFile InterfaceNormal hi! def link NERDTreeFile InterfaceNormal
hi! def link NERDTreeOpenable InterfaceNormal hi! def link NERDTreeOpenable InterfaceNormal
hi! def link NERDTreeClosable InterfaceNormal hi! def link NERDTreeClosable InterfaceNormal
@ -637,10 +653,11 @@ hi! def link NERDTreeGitStatusDirDirty NERDTreeGitStatusModified
hi! def link NERDTreeGitStatusDirClean InterfaceNormalDark hi! def link NERDTreeGitStatusDirClean InterfaceNormalDark
" TODO: use diff color " TODO: use diff color
hi! def link NERDTreeGitStatusIgnored InterfaceNormal hi! def link NERDTreeGitStatusIgnored InterfaceNormal
"}}}
" #ale highlighting " #ale highlighting
hi! def link ALEErrorSign InterfaceSignError hi! def link ALEErrorSign InterfaceSignError"{{{
hi! def link ALEWarningSign InterfaceSignWarning hi! def link ALEWarningSign InterfaceSignWarning
"}}}
" vim: foldmethod=marker " vim: foldmethod=marker