diff --git a/vim/colors/base-grey.vim b/vim/colors/base-grey.vim deleted file mode 100644 index b1e2632..0000000 --- a/vim/colors/base-grey.vim +++ /dev/null @@ -1,585 +0,0 @@ -" clear highlights used below - needed or not? -"{{{ -hi clear ColorColumn -hi clear CursorLine -hi clear Directory -hi clear DiffAdd -hi clear DiffChange -hi clear DiffDelete -hi clear DiffText -hi clear EndOfBuffer -hi clear ErrorMsg -hi clear Error -hi clear VertSplit -hi clear Folded -hi clear FoldColumn -hi clear SignColumn -hi clear IncSearch -hi clear LineNr -hi clear CursorLineNr -hi clear MatchParen -hi clear ModeMsg -hi clear MoreMsg -hi clear NonText -hi clear Pmenu -hi clear PmenuSel -hi clear Question -hi clear QuickFixLine -hi clear Search -hi clear SpecialKey -hi clear SpellBad -hi clear SpellCap -hi clear TabLine -hi clear TabLineFill -hi clear TabLineSel -hi clear Title -hi clear Visual -hi clear WarningMsg -hi clear WildMenu - -hi clear Identifier -"}}} - -if has('gui_running') - hi! Normal guifg=#555555 ctermbg=none guibg=#000000"{{{ -else - hi! Normal guifg=#555555 ctermbg=none guibg=NONE -endif -"}}} - -" highlight groups -"{{{ -hi! ColorColumn guibg=#1d0808 -" Conceal -" Cursor -" CursorIM -" CursorColumn -hi! CursorLine guibg=#222222 gui=NONE -hi! Directory guifg=#eeeeee -hi! DiffAdd guifg=#aaaaaa guibg=#001000 gui=NONE -hi! DiffChange guifg=#777777 guibg=#101010 gui=NONE -hi! DiffDelete guifg=#333333 guibg=#200000 gui=NONE -hi! DiffText guifg=#cccccc guibg=#101010 gui=NONE -hi! EndOfBuffer guifg=#121212 guibg=NONE -hi! ErrorMsg guifg=#ff0000 -hi! VertSplit guifg=#090909 guibg=#090909 -hi! Folded guifg=#666666 guibg=NONE cterm=none gui=NONE -hi! FoldColumn guifg=#262626 guibg=#111111 -hi! SignColumn guifg=#eeeeee guibg=NONE -hi! LineNr guifg=#3a3a3a guibg=NONE -hi! CursorLineNr guifg=#767676 guibg=NONE -hi! MatchParen guifg=#ffffff guibg=#292929 gui=underline -hi! ModeMsg guifg=#c6c6c6 - -hi! MoreMsg guifg=#c6c6c6 -hi! NonText guifg=#767676 -hi! Pmenu guifg=#585858 guibg=#121212 -hi! PmenuSel guifg=#b2b2b2 guibg=#121212 -" PmenuSbar -" PmenuThumb -hi! Question guifg=#c6c6c6 -hi! QuickFixLine guifg=#ff0000 -hi! Search guifg=#ffffff guibg=NONE gui=NONE -hi! IncSearch guifg=#000000 guibg=#ffffff gui=NONE -hi! SpecialKey guifg=#eeeeee -hi! SpellBad guifg=#aa0000 guibg=#220000 -hi! SpellCap guifg=#550000 guibg=#220000 -" SpellLocal -" SpellRare -hi! TabLine guifg=#555555 guibg=#111111 gui=italic -hi! TabLineFill guifg=#eeeeee guibg=#111111 gui=italic -hi! TabLineSel guifg=#777777 guibg=#111111 gui=italic -hi! TabLineNoise guifg=#444444 guibg=#111111 gui=italic -hi! Title guifg=#a8a8a8 guibg=NONE cterm=bold gui=bold -hi! Visual guifg=#eeeeee guibg=#262626 -" VisualNOS -hi! WarningMsg guifg=#ffffff -hi! WildMenu guifg=#aaaaaa guibg=NONE -"}}} - -" GUI Interface groups -"{{{ -" Menu -" Scrollbar -" ToolTip -"}}} - -" syntax groups -"{{{ - -hi! Special guifg=#aa7674 cterm=bold gui=bold -hi! def link SpecialChar Special -hi! def link Tag Special -hi! def link Delimiter Special -hi! SpecialComment guifg=#555555 cterm=italic gui=italic -hi! def link Debug Special - -hi! Identifier guifg=#945f5d -hi! Function guifg=#945f5d cterm=bold gui=bold - -hi! Type guifg=#663c3b -hi! StorageClass guifg=#472a29 cterm=bold gui=bold -hi! def link Structure StorageClass -hi! def link TypeDef StorageClass - -hi! Constant guifg=#888888 cterm=italic gui=italic -hi! String guifg=#777777 cterm=italic gui=italic -hi! def link Character String -hi! def link Number String -hi! def link Boolean String -hi! def link Float String - -hi! def link Statement Normal -hi! Conditional guifg=#707070 cterm=bold gui=bold -hi! def link Repeat Conditional -hi! Label guifg=#777777 cterm=bold gui=bold -hi! Operator guifg=#444444 cterm=bold gui=bold -hi! Keyword guifg=#999999 cterm=bold gui=bold -hi! Exception guifg=#666666 cterm=bold gui=bold - -hi! PreProc guifg=#363636 gui=bold cterm=bold -hi! Include guifg=#404040 -hi! def link Define PreProc -hi! def link Macro PreProc -hi! def link PreCondit PreProc - -hi! def link Todo SpecialComment - -hi! Comment guifg=#383838 gui=italic cterm=italic - -hi! Underlined cterm=underline term=underline gui=underline - -hi! Ignore guifg=NONE - -hi! Error guifg=#ee0000 cterm=bold gui=bold - - -hi! Noise guifg=#333333 -"}}} - - -"" #css, scss definitions -"{{{ -hi! gSpecial guifg=#a1ccb7 cterm=bold gui=bold -hi! gIdentifier guifg=#5b6e5e cterm=bold gui=bold -hi! gFunction guifg=#5a635a -hi! gType guifg=#343d35 - -hi! cssClass guifg=#54b082 -hi! cssProp guifg=#555555 - -hi! def link cssAttr String -hi! def link cssIdentifierAttr Noise -hi! def link cssClassAttr cssIdentifierAttr -hi! def link cssAttrNoise Noise -hi! def link atKeyword PreProc -hi! def link cssIdentifier gSpecial -hi! def link cssClassName cssClass -hi! def link cssPseudoClassId cssClassName -hi! def link cssKeyFrameSelector Label -hi! def link cssFunctionName gIdentifier -hi! def link cssBraces Noise - - -hi! def link scssSelector cssClassName -hi! def link scssSelectorName scssSelector -hi! def link scssSelectorChar gSpecial -hi! def link scssVariable gIdentifier -hi! def link scssFunctionName gFunction -hi! def link scssMixinName gSpecial -hi! def link scssampersand scssSelectorName -hi! def link scssAtRoot atKeyword -hi! def link vue_scss cssIdentifier -"}}} - -"" #html definitions -""{{{ - - -hi! bNormalBright guifg=#5f87af -hi! bNormal guifg=#5f5f87 - -hi! bValueBrightItalic guifg=#bbbbdd cterm=italic gui=italic -hi! bValueItalic guifg=#9999bb cterm=italic gui=italic -hi! bValue guifg=#9999bb -hi! bValueDarkItalic guifg=#666688 cterm=italic gui=italic - -" values -hi! bSpecialBrighter guifg=#cec4ff -hi! bSpecialBright guifg=#b9afed -hi! bSpecial guifg=#8f88b8 -hi! bSpecialDark guifg=#615d7a - -" tags -hi! bKeywordBright guifg=#6c7bc2 -hi! bKeyword guifg=#505b8f -hi! bKeywordDark guifg=#373e61 - - -hi! def link htmlNormal Normal - -hi! def link htmlTitle Title -hi! def link htmlH1 htmlTitle -hi! def link htmlTag Noise -hi! def link htmlEndTag htmlTag -hi! def link htmlArg PreProc -hi! htmlTagName guifg=#373e61 cterm=bold gui=bold -hi! htmlSpecialTagName guifg=#505b8f cterm=bold gui=bold -hi! def link htmlValue String -hi! def link htmlSpecialChar Special -hi! htmlLink guifg=#484a4d cterm=italic gui=italic - -hi! def link htmlPreStmt PreProc -hi! def link htmlPreError Error -hi! def link htmlPreProc PreProc -hi! def link htmlPreAttr String -hi! def link htmlPreProcAttrName PreProc -hi! def link htmlPreProcAttrError Error -hi! def link htmlSpecial Special -hi! def link htmlSpecialChar Special -hi! def link htmlString String -hi! def link htmlStatement Statement -hi! def link htmlComment Comment -hi! def link htmlCommentPart Comment -hi! def link htmlValue String -hi! def link htmlCommentError htmlError -hi! def link htmlTagError htmlError -hi! def link htmlEvent javaScript -hi! def link htmlError Error - -hi! def link javaScript Special -hi! def link javaScriptExpression javaScript -hi! def link htmlCssStyleComment Comment -hi! def link htmlCssDefinition Special - -hi! def link htmlImgArg htmlArg -hi! def link htmlSrcValue String -hi! def link htmlSrcsetValue htmlSrcValue -hi! def link htmlAltValue String -hi! def link htmlDataArg htmlTagName -hi! def link htmlDataValue Constant -hi! def link htmlHrefArg htmlArg -hi! def link htmlHrefValue htmlSrcValue -"}}} - -"" #vue definitions -""{{{ -hi! vueTagSpecial guifg=#bbbbdd -hi! vueComponentName guifg=#9999bb -hi! vueDynamicComponent guifg=#615d7a -hi! def link vueTransitionComponent vueDynamicComponent -hi! def link vueTransitionName cssIdentifier -hi! def link vueTransitionMode String -hi! def link vueDirective Identifier -hi! def link vueEvent Function -hi! def link vueConditional Special -hi! def link vueFor vueConditional -hi! def link vueRef vueDirective -hi! def link vueSlot Identifier - -hi! def link vueDirectiveValue Type -hi! def link vueEventValue vueDirectiveValue -hi! def link vueConditionalValue vueDirectiveValue -hi! def link vueForValue vueConditionalValue -hi! def link vueRefValue Constant -hi! def link vueSlotValue Function -hi! def link vueObjectKey cssClass -hi! def link vueObjectValue vueDirectiveValue -hi! def link vueDirectiveClass Noise -""}}} - -"" #python definitions -""{{{ -" hi! def link pythonImport mNoise -" hi! def link pythonInclude pythonImport -" hi! def link pythonFunction Identifier -hi! def link pythonBuiltin Type -hi! def link pythonBuiltinObj Special -hi! def link pythonDottedName Identifier -hi! def link pythonBrackets pythonNoise -hi! def link pythonQuotes pythonNoise -hi! def link pythonDot pythonNoise -hi! def link pythonNoise pythonNoise -hi! def link pythonExtraOperator Operator -""}}} - -"" #javaScript definitions -""{{{ -"hi! def link jsFunction mKeyword -"hi! def link jsFuncName midentifier -hi! def link jsFunctionKey Function -"hi! def link jsFuncBlock mIdentifier -hi! def link jsFuncCall Identifier -"hi! def link jsIfElseBlock jsFuncBlock -"hi! def link jsTernaryIf jsFuncBlock -hi! def link jsOperator Operator -"hi! def link jsParen mNoiseBright -"hi! def link jsBracket jsParen -"hi! def link jsParenIfElse jsParen -"hi! def link jsObjectFuncName jsFunctionKey -hi! def link jsVariableDef Identifier -"hi! def link jsFuncArgs mIdentifier -hi! def link jsGlobalObjects SpecialComment -hi! def link jsGlobalNodeObjects jsGlobalObjects -hi! def link jsExceptions jsGlobalObjects -hi! def link jsBuiltins jsGlobalObjects -hi! def link jsStorageClass Include -"hi! def link jsObject mIdentifier -hi! def link jsObjectKey Identifier -hi! def link jsObjectProp Type -"hi! def link jsObjectValue mIdentifierDark -"hi! def link jsModuleKeyword mIdentifier -hi! def link jsThis Statement -"" hi! def link jsConditional mIdentifierDark -"hi! def link jsParenRepeat mIdentifierBright -"hi! def link jsArrowFunction mNoiseBright -"hi! def link jsImport mNoise -"hi! def link jsFrom jsImport -"hi! def link jsExport mNoiseBright - -"hi! def link jsConstant mValueItalic -"hi! def link jsString mValueDarkItalic -"hi! def link jsCharacter jsString -"hi! def link jsNumber mValueDarkItalic -"hi! def link jsBooleanFalse jsNumber -"hi! def link jsBooleanTrue jsNumber -"hi! def link jsBoolean jsNumber -"hi! def link jsFloat jsNumber -""}}} - -"" #sql -"{{{ -hi! def link sqlOperator Operator -"}}} - -"" #vim definitions -"{{{ -hi! def link vimMap Noise -hi! def link vimAbb vimMap -hi! def link VimCommand Statement -hi! def link VimOption String -hi! vimFoldMarker guifg=#252525 cterm=bold gui=bold -hi! def link vimFunction Function -hi! def link vimFuncKey Special -hi! def link vimHighlight Noise -hi! def link vimAuGroupKey Noise -hi! def link vimAutoCmd Noise -hi! def link vimHiTerm Include -hi! def link vimHiAttrib Number -hi! vimHiClear cterm=bold gui=bold -hi! def link VimIsCommand Type -hi! def link vimNotation StorageClass -hi! def link vimMapLhs Special -hi! def link vimMapRhs Label -hi! def link vimNotFunc Conditional -hi! def link vimSep Noise -hi! def link vimParenSep vimSep -hi! def link vimContinue vimSep -hi! def link vimBracket vimSep -hi! def link vimOperParen Normal -hi! def link vimUserFunc Identifier -"}}} - -"" yaml -""{{{ -hi! def link yamlKeyValueDelimiter Noise -hi! def link yamlFlowIndicator Noise -""}}} - -"" #config highlighting -""{{{ -hi! def link confComment Comment -""}}} - -"" extra whitespace -""{{{ -hi! def link ExtraWhitespace SpellCap -""}}} - -"" #php definitions -""{{{ -hi! def link phpRegion Normal -hi! def link phpComparison Operator -""}}} - -"" quickfix -""{{{ -hi! def link qfFilename Normal -hi! def link qfLineNr Keyword -hi! def link qfSeparator Normal -hi! def link qfError String -""}}} - -"" #json definitions -""{{{ -hi! def link jsonKeyword Identifier -hi! def link jsonValue String -hi! def link jsonQuote Noise -""}}} - -""""""""""""""""""""""""""""""""""""""""" -" following are to be done -""""""""""""""""""""""""""""""""""""""""" - -"" #shell highlighting -"{{{ -"hi! def link shConditional shLoop -"hi! def link shFunctionTwo mIdentifierBright -"hi! def link shFunction mIdentifier -"hi! def link shFunctionKey mStatement -"hi! def link shCaseEsac mValue -"hi! def link shCaseBar mNoise -"hi! def link shEcho mNoiseBright -"hi! def link bashSpecialVariables mSpecial -"hi! def link shCmdSubRegion mNoiseBright -"hi! def link shCommandSub mSpecialDark -"hi! def link shEscape mNoise -"hi! def link shTestOpr mNoise -"hi! def link shSnglCase mNoise -hi! def link shDerefSimple Type -hi! def link shDerefVar shDerefSimple -hi! def link shDerefOp Conditional -hi! def link shDerefPattern shDerefOp -hi! def link shCommandSub Type -hi! def link shOption StorageClass -""}}} - -"" custom tabline -""{{{ -highlight def link TabNum Comment -highlight def link TabNumSel String -highlight def link TabSeparator Comment -highlight def link TabLineItem Comment -highlight def link TabLineItemSel String -""}}} - -"" plugins -""{{{ - -"" vim-fugitive -""{{{ -"hi! def link gitCommitBranch mValueDarkItalic -"hi! def link gitCommitDiscarded mNoiseDark -"hi! def link gitCommitComment mNoiseDark -"hi! def link gitCommitOnBranch mNoise -"hi! def link gitCommitWarning mInterfaceError -"hi! def link gitCommitDiscardedType mNoise -"hi! def link gitCommitSelectedType mNoise -"hi! def link gitCommitSelectedFile mValueDarkerItalic -"hi! def link gitCommitDiscardedFile mInterfaceWarning -"hi! def link gitCommitUntrackedFile mStatementBright -"hi! def link gitCommitNumber mInterfaceError -"hi! def link gitCommitAhead gitCommitNumber -"hi! def link gitCommitBehind gitCommitNumber -""}}} - -"" #gitgutter -""{{{ -hi! gitGutterAdd guifg=#344230 cterm=bold gui=bold -hi! GitGutterChange guifg=#483b2b cterm=bold gui=bold -hi! gitGutterDelete guifg=#582b2b cterm=bold gui=bold -hi! gitGutterChangeDelete guifg=#583b2b cterm=bold gui=bold - -hi! def link GitGutterAdd mInterfaceAdd -hi! def link GitGutterChange mInterfaceModified -hi! def link GitGutterDelete mInterfaceDelete -hi! def link GitGutterChangeDelete mInterfaceDelete -""}}} - - -"" #ale highlighting -""{{{ -"hi! def link ALEErrorSign mInterfaceError -"hi! def link ALEWarningSign mInterfaceWarning -""}}} - -"" #bufexplorer highlighting -""{{{ -"hi! def link bufExplorerBufNbr mNoise -"hi! def link bufExplorerMapping mInterfaceKey -"hi! def link bufExplorerHelp mInterfaceHelp -"hi! def link bufExplorerOpenIn mInterfaceSpecial -"hi! def link bufExplorerSortBy mInterfaceSpecial -"hi! def link bufExplorerSplit mInterfaceNormalDark -"hi! def link bufExplorerTitle mInterfaceHeading -"hi! def link bufExplorerSortType mInterfaceKeyword -"" hi! def link bufExplorerToggleSplit bufExplorerSplit -"" hi! def link bufExplorerToggleOpen bufExplorerOpenIn - -"hi! def link bufExplorerActBuf mInterfaceH3 -"hi! def link bufExplorerAltBuf mInterfaceH2 -"hi! def link bufExplorerCurBuf mInterfaceH1 -"hi! def link bufExplorerHidBuf mInterfaceNormal -"" hi! def link bufExplorerLockedBuf mInterfaceSpecial -"" hi! def link bufExplorerModBuf mInterfaceSignWarning -"hi! def link bufExplorerUnlBuf mInterfaceNormalDark -"hi! def link bufExplorerInactBuf mInterfaceNormal -""}}} - -"" #netrw highlighting -""{{{ -"hi! def link netrwVersion mInterfaceH3 -"hi! def link netrwComment mInterfaceNormalNormal -"hi! def link netrwClassify mInterfaceNormal -"hi! def link netrwTreebar mInterfaceNormalDark -"hi! def link netrwCmdNote mInterfaceHelpBright -"hi! def link netrwQuickHelp netrwCmdNote -"hi! def link netrwList mInterfaceSpecial -"hi! def link netrwHidePat mInterfaceSpecial -"hi! def link netrwQHTopic mInterfaceKeyword -"hi! def link netrwHelpCmd mInterfaceKey -""}}} - -"" ctrl-p highlighting -""{{{ -hi! def link CtrlPPrtText Directory -hi! def link CtrlPmatch CtrlPPrtText -"hi! def link CtrlPPrtText mInterfaceH1 -"hi! def link CtrlPMode1 mInterfaceH3 -"hi! def link CtrlPMode2 mInterfaceH3 -""}}} - -"" #tagbar highlighting TODO -""{{{ -"" TagbarHighlight defined in vimrc as it gets overridden -"" by plugin when defined in here -"" hi! def link TagbarFoldIcon InterfaceNormal - -"" hi! def link TagbarHelp InterfaceHelp -"" hi! def link TagbarHelpKey InterfaceHelpDark -"" hi! def link TagbarHelpTitle InterfaceHelpBright - -"" hi! def link TagbarKind InterfaceH1 -"" hi! def link TagbarNestedKind InterfaceH1 - -"" hi! def link TagbarScope InterfaceH1 -"" hi! def link TagbarType InterfaceH1 -"" hi! def link TagbarSignature InterfaceNormal -"" hi! def link TagbarPseudoID InterfaceNormal -"" hi! def link TagbarHighlight InterfaceCurrent - -"" hi! def link TagbarAccessPublic InterfaceH2 -"" hi! def link TagbarAccessProtected InterfaceH2 -"" hi! def link TagbarAccessPrivate InterfaceH2 - -"" hi! TagbarHighlight ctermfg=255 guifg=#eeeeee ctermbg=240 guibg=#585858 -""}}} - -"" #vimwiki highlighting TODO -""{{{ -"" hi VimwikiLink ctermfg=252 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c -"" hi! def link VimwikiHeaderChar CRNoiseDark -"" hi VimwikiHeader1 ctermbg=242 guibg=#666666 ctermfg=255 guifg=#eeeeee -"" hi VimwikiHeader2 ctermbg=238 guibg=#444444 ctermfg=255 guifg=#eeeeee -"" hi VimwikiHeader3 ctermbg=236 guibg=#303030 guibg=#303030 ctermfg=255 guifg=#eeeeee -"" hi VimwikiHeader4 ctermbg=236 guibg=#303030 guibg=#303030 ctermfg=251 guifg=#c6c6c6 -"" 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 VimwikiListTodo ctermbg=233 guibg=#121212 ctermfg=255 guifg=#eeeeee -""}}} - -""}}} - - - -" vim: foldmethod=marker diff --git a/vim/colors/blue.vim b/vim/colors/blue.vim deleted file mode 100644 index 2aec43f..0000000 --- a/vim/colors/blue.vim +++ /dev/null @@ -1,21 +0,0 @@ -hi bNormalBright guifg=#5f87af -hi bNormal guifg=#5f5f87 - -hi bValueBrightItalic guifg=#bbbbdd cterm=italic gui=italic -hi bValueItalic guifg=#9999bb cterm=italic gui=italic -hi bValue guifg=#9999bb -hi bValueDarkItalic guifg=#666688 cterm=italic gui=italic - -" values -hi bSpecialBrighter guifg=#cec4ff -hi bSpecialBright guifg=#b9afed -hi bSpecial guifg=#8f88b8 -hi bSpecialDark guifg=#615d7a - -" tags -hi bKeywordBright guifg=#6c7bc2 -hi bKeyword guifg=#505b8f -hi bKeywordDark guifg=#373e61 - - - diff --git a/vim/colors/green.vim b/vim/colors/green.vim deleted file mode 100644 index 16e6902..0000000 --- a/vim/colors/green.vim +++ /dev/null @@ -1,28 +0,0 @@ -hi gValueBrightItalic guifg=#889088 cterm=italic gui=italic -hi gValueItalic guifg=#667066 cterm=italic gui=italic -hi gValueDark guifg=#313631 -hi gValueDarkItalic guifg=#313631 cterm=italic gui=italic - -hi gIdentifierBright guifg=#648264 -hi gIdentifier guifg=#587358 -hi gIdentifierDark guifg=#475c47 - -hi gKeyword guifg=#3b5236 -hi gKeywordDark guifg=#384734 - -hi gSpecialBright guifg=#a1ccb7 -hi gSpecial guifg=#54b082 -hi gSpecialDark guifg=#2e7d56 - -hi gType guifg=#4a5a4a -hi gTypeDark guifg=#3e453e - - - - - - - - - -" vim: foldmethod=marker diff --git a/vim/colors/monotonous.vim b/vim/colors/monotonous.vim index 9b5cf53..41a8425 100644 --- a/vim/colors/monotonous.vim +++ b/vim/colors/monotonous.vim @@ -1,145 +1,362 @@ -set background=dark -" hi clear -if exists('syntax_on') - syntax reset +if !exists('g:monotonous_light') + g:monotonous_light=0 endif -" Includes -"{{{ -source ~/.vim/colors/base-grey.vim -"}}} +if g:monotonous_light == 1 + set background=light +else + set background=dark +endif -set fillchars=stl:\ ,stlnc:\ ,vert:\| +" highlight clear + +if exists('syntax_on') + syntax reset +endif let g:colors_name = 'monotonous' -"" #python definitions -""{{{ -"hi! def link pythonImport mNoise -"hi! def link pythonInclude pythonImport -"hi! def link pythonFunction mIdentifierBright -"hi! def link pythonBuiltin mIdentifierDark -"hi! def link pythonBuiltinObj mSpecial -"hi! def link pythonBrackets mNoiseDark -"hi! def link pythonQuotes mNoise -"hi! def link pythonDot mNoise -"hi! def link pythonNoise mNoiseDark -""}}} +" clear highlights used below - needed or not? +"{{{ +hi clear ColorColumn +hi clear CursorLine +hi clear Directory +hi clear DiffAdd +hi clear DiffChange +hi clear DiffDelete +hi clear DiffText +hi clear EndOfBuffer +hi clear ErrorMsg +hi clear Error +hi clear VertSplit +hi clear Folded +hi clear FoldColumn +hi clear SignColumn +hi clear IncSearch +hi clear LineNr +hi clear CursorLineNr +hi clear MatchParen +hi clear ModeMsg +hi clear MoreMsg +hi clear NonText +hi clear Pmenu +hi clear PmenuSel +hi clear Question +hi clear QuickFixLine +hi clear Search +hi clear SpecialKey +hi clear SpellBad +hi clear SpellCap +hi clear TabLine +hi clear TabLineFill +hi clear TabLineSel +hi clear Title +hi clear Visual +hi clear WarningMsg +hi clear WildMenu -"" #shell highlighting -"" TODO do properly{{{ -"hi! def link shConditional shLoop -"hi! def link shFunctionTwo mIdentifierBright -"hi! def link shFunction mIdentifier -"hi! def link shFunctionKey mStatement -"hi! def link shCaseEsac mValue -"hi! def link shCaseBar mNoise -"hi! def link shEcho mNoiseBright -"hi! def link bashSpecialVariables mSpecial -"hi! def link shCmdSubRegion mNoiseBright -"hi! def link shCommandSub mSpecialDark -"hi! def link shEscape mNoise -"hi! def link shTestOpr mNoise -"hi! def link shSnglCase mNoise -""}}} +hi clear Identifier +"}}} -"" #php definitions -""{{{ -"hi! def link phpRegion Normal -"hi! def link phpComparison Operator -"hi! def link phpVarSelector mIdentifierDark -"hi! def link wpFunction mIdentifierBright -""}}} +if has('gui_running') +"{{{ + if g:monotonous_light == 1 + hi! Normal guifg=#555555 ctermbg=none guibg=#000000 + else + hi! Normal guifg=#555555 ctermbg=none guibg=#000000 + endif +else + if g:monotonous_light == 1 + hi! Normal guifg=#555555 ctermbg=none guibg=NONE + else + hi! Normal guifg=#555555 ctermbg=none guibg=NONE + endif +endif +"}}} -"" yaml -""{{{ -"hi! def link yamlKeyValueDelimiter mNoiseDark -"hi! def link yamlFlowIndicator mNoiseDark -""}}} +" highlight groups +"{{{ +hi! ColorColumn guibg=#1d0808 +" Conceal +" Cursor +" CursorIM +" CursorColumn +hi! CursorLine guibg=#222222 gui=NONE +hi! Directory guifg=#eeeeee +hi! DiffAdd guifg=#aaaaaa guibg=#001000 gui=NONE +hi! DiffChange guifg=#777777 guibg=#101010 gui=NONE +hi! DiffDelete guifg=#333333 guibg=#200000 gui=NONE +hi! DiffText guifg=#cccccc guibg=#101010 gui=NONE +hi! EndOfBuffer guifg=#121212 guibg=NONE +hi! ErrorMsg guifg=#ff0000 +hi! VertSplit guifg=#090909 guibg=#090909 +hi! Folded guifg=#666666 guibg=NONE cterm=none gui=NONE +hi! FoldColumn guifg=#262626 guibg=#111111 +hi! SignColumn guifg=#eeeeee guibg=NONE +hi! LineNr guifg=#3a3a3a guibg=NONE +hi! CursorLineNr guifg=#767676 guibg=NONE +hi! MatchParen guifg=#ffffff guibg=#292929 gui=underline +hi! ModeMsg guifg=#c6c6c6 -"" #json definitions -""{{{ -"hi! def link jsonKeyword Identifier -"hi! def link jsonValue String -"hi! def link jsonQuote mNoise -""}}} +hi! MoreMsg guifg=#c6c6c6 +hi! NonText guifg=#767676 +hi! Pmenu guifg=#585858 guibg=#121212 +hi! PmenuSel guifg=#b2b2b2 guibg=#121212 +" PmenuSbar +" PmenuThumb +hi! Question guifg=#c6c6c6 +hi! QuickFixLine guifg=#ff0000 +hi! Search guifg=#ffffff guibg=NONE gui=NONE +hi! IncSearch guifg=#000000 guibg=#ffffff gui=NONE +hi! SpecialKey guifg=#eeeeee +hi! SpellBad guifg=#aa0000 guibg=#220000 +hi! SpellCap guifg=#550000 guibg=#220000 +" SpellLocal +" SpellRare +hi! TabLine guifg=#555555 guibg=#111111 gui=italic +hi! TabLineFill guifg=#eeeeee guibg=#111111 gui=italic +hi! TabLineSel guifg=#777777 guibg=#111111 gui=italic +hi! TabLineNoise guifg=#444444 guibg=#111111 gui=italic +hi! Title guifg=#a8a8a8 guibg=NONE cterm=bold gui=bold +hi! Visual guifg=#eeeeee guibg=#262626 +" VisualNOS +hi! WarningMsg guifg=#ffffff +hi! WildMenu guifg=#aaaaaa guibg=NONE +"}}} + +" GUI Interface groups +"{{{ +" Menu +" Scrollbar +" ToolTip +"}}} + +" syntax groups +"{{{ + +hi! Special guifg=#aa7674 cterm=bold gui=bold +hi! def link SpecialChar Special +hi! def link Tag Special +hi! def link Delimiter Special +hi! SpecialComment guifg=#555555 cterm=italic gui=italic +hi! def link Debug Special + +hi! Identifier guifg=#945f5d +hi! Function guifg=#945f5d cterm=bold gui=bold + +hi! Type guifg=#663c3b +hi! StorageClass guifg=#472a29 cterm=bold gui=bold +hi! def link Structure StorageClass +hi! def link TypeDef StorageClass + +hi! Constant guifg=#888888 cterm=italic gui=italic +hi! String guifg=#777777 cterm=italic gui=italic +hi! def link Character String +hi! def link Number String +hi! def link Boolean String +hi! def link Float String + +hi! def link Statement Normal +hi! Conditional guifg=#707070 cterm=bold gui=bold +hi! def link Repeat Conditional +hi! Label guifg=#777777 cterm=bold gui=bold +hi! Operator guifg=#444444 cterm=bold gui=bold +hi! Keyword guifg=#999999 cterm=bold gui=bold +hi! Exception guifg=#666666 cterm=bold gui=bold + +hi! PreProc guifg=#363636 gui=bold cterm=bold +hi! Include guifg=#404040 +hi! def link Define PreProc +hi! def link Macro PreProc +hi! def link PreCondit PreProc + +hi! def link Todo SpecialComment + +hi! Comment guifg=#383838 gui=italic cterm=italic + +hi! Underlined cterm=underline term=underline gui=underline + +hi! Ignore guifg=NONE + +hi! Error guifg=#ee0000 cterm=bold gui=bold + + +hi! Noise guifg=#333333 +"}}} + + +"" #css, scss definitions +"{{{ +hi! gSpecial guifg=#a1ccb7 cterm=bold gui=bold +hi! gIdentifier guifg=#5b6e5e cterm=bold gui=bold +hi! gFunction guifg=#5a635a +hi! gType guifg=#343d35 + +hi! cssClass guifg=#54b082 +hi! cssProp guifg=#555555 + +hi! def link cssAttr String +hi! def link cssIdentifierAttr Noise +hi! def link cssClassAttr cssIdentifierAttr +hi! def link cssAttrNoise Noise +hi! def link atKeyword PreProc +hi! def link cssIdentifier gSpecial +hi! def link cssClassName cssClass +hi! def link cssPseudoClassId cssClassName +hi! def link cssKeyFrameSelector Label +hi! def link cssFunctionName gIdentifier +hi! def link cssBraces Noise + + +hi! def link scssSelector cssClassName +hi! def link scssSelectorName scssSelector +hi! def link scssSelectorChar gSpecial +hi! def link scssVariable gIdentifier +hi! def link scssFunctionName gFunction +hi! def link scssMixinName gSpecial +hi! def link scssampersand scssSelectorName +hi! def link scssAtRoot atKeyword +hi! def link vue_scss cssIdentifier +"}}} "" #html definitions ""{{{ -"hi! def link htmlNormal bNormal -"hi! def link htmlTitle bValueBrightItalic -"hi! def link htmlTag mNoise -"hi! def link htmlEndTag htmlTag -"hi! def link htmlTagName bKeyword -"hi! def link htmlTagN bKeyword -"hi! def link htmlSpecialTagName bKeywordBright -"hi! def link htmlArg bKeywordDark -"hi! def link htmlScriptTag htmlTag -"hi! def link htmlString mValueDarkItalic -"hi! def link htmlBold htmlTitle -"hi! def link htmlLink bValueItalic -"hi! def link htmlH1 bValueBrightItalic -"hi! def link htmlSpecialChar bValueDarkItalic -"hi! def link JavaScript mKeyword -"hi! def link htmlImgArg htmlArg -"hi! def link htmlSrcValue mValueDarkerItalic -"hi! def link htmlSrcsetValue htmlSrcValue -"hi! def link htmlAltValue mValueDarkItalic -"hi! def link htmlDataArg htmlTagName -"hi! def link htmlDataValue bValueBrightItalic -"hi! def link htmlHrefArg htmlArg -"hi! def link htmlHrefValue htmlSrcValue -""}}} + +hi! bNormalBright guifg=#5f87af +hi! bNormal guifg=#5f5f87 + +hi! bValueBrightItalic guifg=#bbbbdd cterm=italic gui=italic +hi! bValueItalic guifg=#9999bb cterm=italic gui=italic +hi! bValue guifg=#9999bb +hi! bValueDarkItalic guifg=#666688 cterm=italic gui=italic + +" values +hi! bSpecialBrighter guifg=#cec4ff +hi! bSpecialBright guifg=#b9afed +hi! bSpecial guifg=#8f88b8 +hi! bSpecialDark guifg=#615d7a + +" tags +hi! bKeywordBright guifg=#6c7bc2 +hi! bKeyword guifg=#505b8f +hi! bKeywordDark guifg=#373e61 + + +hi! def link htmlNormal Normal + +hi! def link htmlTitle Title +hi! def link htmlH1 htmlTitle +hi! def link htmlTag Noise +hi! def link htmlEndTag htmlTag +hi! def link htmlArg PreProc +hi! htmlTagName guifg=#373e61 cterm=bold gui=bold +hi! htmlSpecialTagName guifg=#505b8f cterm=bold gui=bold +hi! def link htmlValue String +hi! def link htmlSpecialChar Special +hi! htmlLink guifg=#484a4d cterm=italic gui=italic + +hi! def link htmlPreStmt PreProc +hi! def link htmlPreError Error +hi! def link htmlPreProc PreProc +hi! def link htmlPreAttr String +hi! def link htmlPreProcAttrName PreProc +hi! def link htmlPreProcAttrError Error +hi! def link htmlSpecial Special +hi! def link htmlSpecialChar Special +hi! def link htmlString String +hi! def link htmlStatement Statement +hi! def link htmlComment Comment +hi! def link htmlCommentPart Comment +hi! def link htmlValue String +hi! def link htmlCommentError htmlError +hi! def link htmlTagError htmlError +hi! def link htmlEvent javaScript +hi! def link htmlError Error + +hi! def link javaScript Special +hi! def link javaScriptExpression javaScript +hi! def link htmlCssStyleComment Comment +hi! def link htmlCssDefinition Special + +hi! def link htmlImgArg htmlArg +hi! def link htmlSrcValue String +hi! def link htmlSrcsetValue htmlSrcValue +hi! def link htmlAltValue String +hi! def link htmlDataArg htmlTagName +hi! def link htmlDataValue Constant +hi! def link htmlHrefArg htmlArg +hi! def link htmlHrefValue htmlSrcValue +"}}} "" #vue definitions ""{{{ -"hi! def link vueTagSpecial bSpecialBright -"hi! def link vueComponentName bSpecial -"hi! def link vueDynamicComponent bSpecialDark -"hi! def link vueTransitionComponent vueDynamicComponent -"hi! def link vueTransitionName gSpecialDark -"hi! def link vueTransitionMode mValueDarkItalic -"hi! def link vueDirective mType -"hi! def link vueEvent mTypeBright -"hi! def link vueConditional mSpecial -"hi! def link vueFor vueConditional -"hi! def link vueRef vueDirective +hi! vueTagSpecial guifg=#bbbbdd +hi! vueComponentName guifg=#9999bb +hi! vueDynamicComponent guifg=#615d7a +hi! def link vueTransitionComponent vueDynamicComponent +hi! def link vueTransitionName cssIdentifier +hi! def link vueTransitionMode String +hi! def link vueDirective Identifier +hi! def link vueEvent Function +hi! def link vueConditional Special +hi! def link vueFor vueConditional +hi! def link vueRef vueDirective +hi! def link vueSlot Identifier -"hi! def link vueDirectiveValue mIdentifier -"hi! def link vueEventValue vueDirectiveValue -"hi! def link vueConditionalValue vueDirectiveValue -"hi! def link vueForValue vueConditionalValue -"hi! def link vueRefValue mValueBrightItalic -"hi! def link vueObjectKey gSpecial -"hi! def link vueObjectValue vueDirectiveValue -"hi! def link vueDirectiveClass mNoise +hi! def link vueDirectiveValue Type +hi! def link vueEventValue vueDirectiveValue +hi! def link vueConditionalValue vueDirectiveValue +hi! def link vueForValue vueConditionalValue +hi! def link vueRefValue Constant +hi! def link vueSlotValue Function +hi! def link vueObjectKey cssClass +hi! def link vueObjectValue vueDirectiveValue +hi! def link vueDirectiveClass Noise +""}}} + +"" #python definitions +""{{{ +" hi! def link pythonImport mNoise +" hi! def link pythonInclude pythonImport +" hi! def link pythonFunction Identifier +hi! def link pythonBuiltin Type +hi! def link pythonBuiltinObj Special +hi! def link pythonDottedName Identifier +hi! def link pythonBrackets pythonNoise +hi! def link pythonQuotes pythonNoise +hi! def link pythonDot pythonNoise +hi! def link pythonNoise pythonNoise +hi! def link pythonExtraOperator Operator ""}}} "" #javaScript definitions ""{{{ "hi! def link jsFunction mKeyword "hi! def link jsFuncName midentifier -"hi! def link jsFunctionKey jsObjectKey +hi! def link jsFunctionKey Function "hi! def link jsFuncBlock mIdentifier -"hi! def link jsFuncCall mIdentifierBright +hi! def link jsFuncCall Identifier "hi! def link jsIfElseBlock jsFuncBlock "hi! def link jsTernaryIf jsFuncBlock +hi! def link jsOperator Operator "hi! def link jsParen mNoiseBright "hi! def link jsBracket jsParen "hi! def link jsParenIfElse jsParen "hi! def link jsObjectFuncName jsFunctionKey -"hi! def link jsObjectProp mIdentifier -"hi! def link jsVariableDef mIdentifierBright +hi! def link jsVariableDef Identifier "hi! def link jsFuncArgs mIdentifier -"hi! def link jsGlobalObjects mIdentifierDark -"hi! def link jsGlobalNodeObjects jsGlobalObjects -"hi! def link jsStorageClass mIdentifierDark +hi! def link jsGlobalObjects SpecialComment +hi! def link jsGlobalNodeObjects jsGlobalObjects +hi! def link jsExceptions jsGlobalObjects +hi! def link jsBuiltins jsGlobalObjects +hi! def link jsStorageClass Include "hi! def link jsObject mIdentifier -"hi! def link jsObjectKey mIdentifierBright +hi! def link jsObjectKey Identifier +hi! def link jsObjectProp Type "hi! def link jsObjectValue mIdentifierDark "hi! def link jsModuleKeyword mIdentifier -"hi! def link jsThis mIdentifierDark +hi! def link jsThis Statement "" hi! def link jsConditional mIdentifierDark "hi! def link jsParenRepeat mIdentifierBright "hi! def link jsArrowFunction mNoiseBright @@ -157,80 +374,110 @@ let g:colors_name = 'monotonous' "hi! def link jsFloat jsNumber ""}}} +"" #sql +"{{{ +hi! def link sqlOperator Operator +"}}} + "" #vim definitions +"{{{ +hi! def link vimMap Noise +hi! def link vimAbb vimMap +hi! def link VimCommand Statement +hi! def link VimOption String +hi! vimFoldMarker guifg=#252525 cterm=bold gui=bold +hi! def link vimFunction Function +hi! def link vimFuncKey Special +hi! def link vimHighlight Noise +hi! def link vimAuGroupKey Noise +hi! def link vimAutoCmd Noise +hi! def link vimHiTerm Include +hi! def link vimHiAttrib Number +hi! vimHiClear cterm=bold gui=bold +hi! def link VimIsCommand Type +hi! def link vimNotation StorageClass +hi! def link vimMapLhs Special +hi! def link vimMapRhs Label +hi! def link vimNotFunc Conditional +hi! def link vimSep Noise +hi! def link vimParenSep vimSep +hi! def link vimContinue vimSep +hi! def link vimBracket vimSep +hi! def link vimOperParen Normal +hi! def link vimUserFunc Identifier +"}}} + +"" yaml ""{{{ -"hi! def link VimGroup mType -"hi! def link VimGroupName mIdentifier -"hi! def link VimGroupList CRNormalDark -"hi! def link VimHiGroup mIdentifier -"hi! def link VimContinue mNoise -"hi! def link VimCommand mStatementDark -"hi! def link VimIsCommand mIdentifier -"hi! def link VimAutoCmd mStatementDark -"hi! def link VimAugroupKey mStatement -"hi! def link vimFuncKey mStatement -"hi! def link vimFunction mIdentifier -"hi! def link vimUserFunc mIdentifierBright -"hi! def link vimNotFunc mConditional -"hi! def link vimVar mIdentifierBright -"hi! def link vimOption mIdentifierDark -"hi! def link vimFuncSID mIdentifierBright -"hi! def link vimMap mNoise -"hi! def link vimMapLhs mIdentifier -"hi! def link vimAbb mNoise -"hi! def link vimMapModKey mSpecial -"hi! def link vimHiKeyList mNoiseDark -"hi! def link vimHiBang mNoise -"hi! def link vimLet mStatementDark -"hi! def link vimHiGui mValueDarker -"hi! def link vimHiGuiFgBg vimHiGui -"hi! def link vimHiCtermFgBg vimHiGui -"hi! def link vimHiCTerm vimHiGui -"hi! def link vimHiAttrib mValueItalic -"hi! def link vimFgBgAttrib vimHiAttrib -"hi! def link vimHiGuiRgb mValueItalic -"hi! def link vimSynRegOpt mKeyword -"hi! def link vimSynMtchOpt vimSynRegOpt -"hi! def link vimSynKeyOpt vimSynRegOpt -"hi! def link vimSynContains vimSynMtchOpt -"hi! def link vimSynKeyRegion CRNormalDar -"hi! def link vimSynRegion mNoise -"hi! def link vimSynReg mKeywordDark -"hi! def link vimSynRegPat mValueItalic -"hi! def link vimSetSep mNoiseDark -"hi! def link vimPatSep mValueDarkerItalic -"hi! def link vimSynPatMod mKeywordDark -"hi! def link vimSynPatRange mValueBrightItalic -"hi! def link vimDefLink mStatementDark -"hi! def link vimHighlight mStatementDark -"hi! def link vimFoldMarker mNoiseDark +hi! def link yamlKeyValueDelimiter Noise +hi! def link yamlFlowIndicator Noise ""}}} "" #config highlighting ""{{{ -"hi! def link confComment mComment +hi! def link confComment Comment ""}}} "" extra whitespace ""{{{ -"hi! def link ExtraWhitespace CRWarning +hi! def link ExtraWhitespace SpellCap +""}}} + +"" #php definitions +""{{{ +hi! def link phpRegion Normal +hi! def link phpComparison Operator ""}}} "" quickfix ""{{{ -"hi! def link qfFilename mNoiseBright -"hi! def link qfLineNr mNoise -"hi! def link qfSeparator mNoiseDark -"hi! def link qfError mInterfaceWarning +hi! def link qfFilename Normal +hi! def link qfLineNr Keyword +hi! def link qfSeparator Normal +hi! def link qfError String +""}}} + +"" #json definitions +""{{{ +hi! def link jsonKeyword Identifier +hi! def link jsonValue String +hi! def link jsonQuote Noise +""}}} + +""""""""""""""""""""""""""""""""""""""""" +" following are to be done +""""""""""""""""""""""""""""""""""""""""" + +"" #shell highlighting +"{{{ +"hi! def link shConditional shLoop +"hi! def link shFunctionTwo mIdentifierBright +"hi! def link shFunction mIdentifier +"hi! def link shFunctionKey mStatement +"hi! def link shCaseEsac mValue +"hi! def link shCaseBar mNoise +"hi! def link shEcho mNoiseBright +"hi! def link bashSpecialVariables mSpecial +"hi! def link shCmdSubRegion mNoiseBright +"hi! def link shCommandSub mSpecialDark +"hi! def link shEscape mNoise +"hi! def link shTestOpr mNoise +"hi! def link shSnglCase mNoise +hi! def link shDerefSimple Type +hi! def link shDerefVar shDerefSimple +hi! def link shDerefOp Conditional +hi! def link shDerefPattern shDerefOp +hi! def link shCommandSub Type +hi! def link shOption StorageClass ""}}} "" custom tabline ""{{{ -"hi! def link TabNum TabLineNoise -"hi! def link TabNumSel TabLineSel -"hi! def link TabSeparator TabLineNoise -"hi! def link TabLineItem TabLine -"hi! def link TabLineItemSel TabLineSel +highlight def link TabNum Comment +highlight def link TabNumSel String +highlight def link TabSeparator Comment +highlight def link TabLineItem Comment +highlight def link TabLineItemSel String ""}}} "" plugins @@ -312,7 +559,8 @@ hi! def link GitGutterChangeDelete mInterfaceDelete "" ctrl-p highlighting ""{{{ -"hi! def link CtrlPmatch mInterfaceH1 +hi! def link CtrlPPrtText Directory +hi! def link CtrlPmatch CtrlPPrtText "hi! def link CtrlPPrtText mInterfaceH1 "hi! def link CtrlPMode1 mInterfaceH3 "hi! def link CtrlPMode2 mInterfaceH3 @@ -358,4 +606,7 @@ hi! def link GitGutterChangeDelete mInterfaceDelete ""}}} ""}}} -"" vim: foldmethod=marker + + + +" vim: foldmethod=marker diff --git a/vimrc.d/settings.vim b/vimrc.d/settings.vim index 9bb2dee..2828fec 100644 --- a/vimrc.d/settings.vim +++ b/vimrc.d/settings.vim @@ -5,6 +5,7 @@ if &term == 'xterm-256color' endif syntax on +let g:monotonous_light=1 colorscheme monotonous set guioptions-=mTrLb diff --git a/vimrc.plugins.vim b/vimrc.plugins.vim index c28bff3..02336cd 100644 --- a/vimrc.plugins.vim +++ b/vimrc.plugins.vim @@ -130,6 +130,10 @@ Plugin 'prabirshrestha/asyncomplete-necovim.vim' Plugin 'prabirshrestha/async.vim' Plugin 'prabirshrestha/vim-lsp' +" typewriter +" https://github.com/logico-dev/typewriter/blob/master/README.md +Plugin 'logico-dev/typewriter' + " All of your Plugins must be added before the following line call vundle#end() " required filetype plugin indent on " required @@ -157,21 +161,21 @@ augroup END call asyncomplete#register_source(asyncomplete#sources#file#get_source_options({ \ 'name': 'file', \ 'whitelist': ['*'], - \ 'priority': 99, + \ 'priority': -20, \ 'completor': function('asyncomplete#sources#file#completor') \ })) call asyncomplete#register_source(asyncomplete#sources#ultisnips#get_source_options({ \ 'name': 'ultisnips', \ 'whitelist': ['*'], - \ 'priority': 95, + \ 'priority': -30, \ 'completor': function('asyncomplete#sources#ultisnips#completor'), \ })) call asyncomplete#register_source(asyncomplete#sources#necovim#get_source_options({ \ 'name': 'necovim', \ 'whitelist': ['vim'], - \ 'priority': 90, + \ 'priority': -40, \ 'completor': function('asyncomplete#sources#necovim#completor'), \ })) @@ -179,23 +183,23 @@ call asyncomplete#register_source(asyncomplete#sources#buffer#get_source_options \ 'name': 'buffer', \ 'whitelist': ['*'], \ 'blacklist': ['go'], - \ 'priority': 80, + \ 'priority': -50, \ 'completor': function('asyncomplete#sources#buffer#completor'), \ })) call asyncomplete#register_source(asyncomplete#sources#omni#get_source_options({ \ 'name': 'omni', \ 'whitelist': ['*'], - \ 'blacklist': ['c', 'cpp', 'html'], - \ 'priority': 70, + \ 'blacklist': ['c', 'cpp', 'html', 'python'], + \ 'priority': -60, \ 'completor': function('asyncomplete#sources#omni#completor') \ })) call asyncomplete#register_source(asyncomplete#sources#tags#get_source_options({ \ 'name': 'tags', \ 'whitelist': ['*'], - \ 'blacklist': ['vim'], - \ 'priority': 60, + \ 'blacklist': ['vim', 'python'], + \ 'priority': -70, \ 'completor': function('asyncomplete#sources#tags#completor'), \ 'config': { \ 'max_file_size': 50000000, @@ -209,14 +213,22 @@ call asyncomplete#register_source(asyncomplete#sources#tags#get_source_options({ augroup User lsp_setup autocmd! if executable('vls') - autocmd User lsp_setup call lsp#register_server({ + autocmd User lsp_setup call lsp#register_server({ \ 'name': 'vue', \ 'cmd': {server_info->['vls']}, \ 'whitelist': ['vue'], \ }) endif + if executable('pyls') + autocmd User lsp_setup call lsp#register_server({ + \ 'name': 'pyls', + \ 'cmd': {server_info->['pyls']}, + \ 'whitelist': ['python'], + \ }) + endif augroup END + "}}} " switch.vim