From a064515380df27e0f865961734f73e2fffbae043 Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Sat, 17 Nov 2018 16:44:28 +0000 Subject: [PATCH] update --- vim/colors/monotonous-dark.vim | 54 +++++++++++++++++++++++++--------- vimrc | 5 ++-- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/vim/colors/monotonous-dark.vim b/vim/colors/monotonous-dark.vim index 0b375ef..7a561e7 100644 --- a/vim/colors/monotonous-dark.vim +++ b/vim/colors/monotonous-dark.vim @@ -29,7 +29,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi link Number String hi link Boolean String hi link Float String - hi Folded ctermbg=NONE ctermfg=250 cterm=NONE guibg=NONE guifg=#aeadad gui=NONE + hi Folded ctermbg=NONE ctermfg=250 cterm=bold guibg=NONE guifg=#aeadad gui=bold hi Statement ctermbg=NONE ctermfg=243 cterm=NONE guibg=NONE guifg=#767070 gui=NONE hi Conditional ctermbg=NONE ctermfg=250 cterm=bold guibg=NONE guifg=#aeadad gui=bold hi Repeat ctermbg=NONE ctermfg=247 cterm=bold guibg=NONE guifg=#9a9393 gui=bold @@ -39,7 +39,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") 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=#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 Comment ctermbg=NONE ctermfg=240 cterm=bold,italic guibg=NONE guifg=#5d5d5d gui=bold,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=#202122 gui=NONE @@ -72,7 +72,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") 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 hi Directory ctermbg=NONE ctermfg=250 cterm=NONE guibg=NONE guifg=#aeadad gui=NONE - hi MatchParen ctermbg=17 ctermfg=NONE cterm=bold guibg=#49535a guifg=NONE gui=bold + hi MatchParen ctermbg=17 ctermfg=255 cterm=bold guibg=#49535a guifg=#eee4e4 gui=bold hi SpellBad ctermbg=NONE ctermfg=196 cterm=NONE guibg=NONE guifg=#c74444 gui=NONE guisp=#c74444 hi SpellCap ctermbg=NONE ctermfg=166 cterm=NONE guibg=NONE guifg=#a67038 gui=NONE guisp=#a67038 hi SpellLocal ctermbg=NONE ctermfg=247 cterm=NONE guibg=NONE guifg=#797532 gui=NONE guisp=#a67038 @@ -117,15 +117,15 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") 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=#5d5d5d gui=NONE hi LinterError ctermbg=NONE ctermfg=243 cterm=bold guibg=NONE guifg=#716c6c gui=bold - hi LinterErrorActive ctermbg=NONE ctermfg=196 cterm=bold guibg=NONE guifg=#7D3636 gui=bold + hi LinterErrorActive ctermbg=NONE ctermfg=196 cterm=bold guibg=NONE guifg=#c74444 gui=bold hi LinterErrorStyle ctermbg=NONE ctermfg=243 cterm=NONE guibg=NONE guifg=#716c6c gui=NONE - hi LinterErrorStyleActive ctermbg=NONE ctermfg=196 cterm=NONE guibg=NONE guifg=#7D3636 gui=NONE + hi LinterErrorStyleActive ctermbg=NONE ctermfg=196 cterm=NONE guibg=NONE guifg=#c74444 gui=NONE hi LinterWarning ctermbg=NONE ctermfg=240 cterm=bold guibg=NONE guifg=#5d5959 gui=bold - hi LinterWarningActive ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold + hi LinterWarningActive ctermbg=NONE ctermfg=166 cterm=bold guibg=NONE guifg=#a67038 gui=bold hi LinterWarningStyle ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#5d5959 gui=NONE - hi LinterWarningStyleActive ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#725454 gui=NONE + hi LinterWarningStyleActive ctermbg=NONE ctermfg=166 cterm=NONE guibg=NONE guifg=#a67038 gui=NONE hi LinterInfo ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#494646 gui=NONE - hi LinterInfoActive ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#5d5d5d gui=NONE + hi LinterInfoActive ctermbg=NONE ctermfg=247 cterm=NONE guibg=NONE guifg=#797532 gui=NONE hi GitGutterDelete ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold hi GitGutterChange ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#596171 gui=bold hi GitGutterAdd ctermbg=NONE ctermfg=34 cterm=bold guibg=NONE guifg=#496349 gui=bold @@ -275,6 +275,18 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi link yamlKeyValueDelimiter Noise hi link yamlFowIndicator Noise hi link confComment Comment + hi markdownDelimiter ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#494646 gui=bold + hi link markdownHeadingDelimiter markdownDelimiter + hi markdownListMarker ctermbg=NONE ctermfg=250 cterm=bold guibg=NONE guifg=#aeadad gui=bold + hi link markdownCodeDelimiter markdownDelimiter + hi link markdownCode Function + hi markdownItalic ctermbg=NONE ctermfg=250 cterm=italic guibg=NONE guifg=#aeadad gui=italic + hi link markdownItalicDelimiter markdownDelimiter + hi markdownBold ctermbg=NONE ctermfg=247 cterm=bold guibg=NONE guifg=#9a9393 gui=bold + hi link markdownBoldDelimiter markdownDelimiter + hi link markdownIdDeclaration Conditional + hi link markdownId markdownIdDeclaration + hi markdownLinkText ctermbg=NONE ctermfg=247 cterm=underline guibg=NONE guifg=#9a9393 gui=underline hi ExtraWhitespace ctermbg=196 ctermfg=NONE cterm=NONE guibg=#6a2e2e guifg=NONE gui=NONE hi link phpRegion Normal hi link phpComparison Operator @@ -333,7 +345,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi link Number String hi link Boolean String hi link Float String - hi Folded ctermbg=NONE ctermfg=white cterm=NONE + hi Folded ctermbg=NONE ctermfg=white cterm=bold hi Statement ctermbg=NONE ctermfg=gray cterm=NONE hi Conditional ctermbg=NONE ctermfg=white cterm=bold hi Repeat ctermbg=NONE ctermfg=darkgray cterm=bold @@ -343,7 +355,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi Exception ctermbg=NONE ctermfg=darkred cterm=bold hi PreProc ctermbg=NONE ctermfg=gray cterm=bold hi Include ctermbg=NONE ctermfg=gray cterm=NONE - hi Comment ctermbg=NONE ctermfg=gray cterm=italic + hi Comment ctermbg=NONE ctermfg=gray cterm=bold,italic hi SpecialComment ctermbg=NONE ctermfg=darkgray cterm=italic hi Todo ctermbg=NONE ctermfg=darkgray cterm=italic hi Ignore ctermbg=NONE ctermfg=black cterm=NONE @@ -376,7 +388,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi Visual ctermbg=darkblue ctermfg=NONE cterm=NONE hi VisualNOS ctermbg=darkred ctermfg=NONE cterm=NONE hi Directory ctermbg=NONE ctermfg=white cterm=NONE - hi MatchParen ctermbg=darkblue ctermfg=NONE cterm=bold + hi MatchParen ctermbg=darkblue ctermfg=white cterm=bold hi SpellBad ctermbg=NONE ctermfg=red cterm=NONE hi SpellCap ctermbg=NONE ctermfg=yellow cterm=NONE hi SpellLocal ctermbg=NONE ctermfg=darkyellow cterm=NONE @@ -425,11 +437,11 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi LinterErrorStyle ctermbg=NONE ctermfg=gray cterm=NONE hi LinterErrorStyleActive ctermbg=NONE ctermfg=red cterm=NONE hi LinterWarning ctermbg=NONE ctermfg=gray cterm=bold - hi LinterWarningActive ctermbg=NONE ctermfg=red cterm=bold + hi LinterWarningActive ctermbg=NONE ctermfg=yellow cterm=bold hi LinterWarningStyle ctermbg=NONE ctermfg=gray cterm=NONE - hi LinterWarningStyleActive ctermbg=NONE ctermfg=red cterm=NONE + hi LinterWarningStyleActive ctermbg=NONE ctermfg=yellow cterm=NONE hi LinterInfo ctermbg=NONE ctermfg=gray cterm=NONE - hi LinterInfoActive ctermbg=NONE ctermfg=gray cterm=NONE + hi LinterInfoActive ctermbg=NONE ctermfg=darkgray cterm=NONE hi GitGutterDelete ctermbg=NONE ctermfg=red cterm=bold hi GitGutterChange ctermbg=NONE ctermfg=blue cterm=bold hi GitGutterAdd ctermbg=NONE ctermfg=green cterm=bold @@ -579,6 +591,18 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi link yamlKeyValueDelimiter Noise hi link yamlFowIndicator Noise hi link confComment Comment + hi markdownDelimiter ctermbg=NONE ctermfg=gray cterm=bold + hi link markdownHeadingDelimiter markdownDelimiter + hi markdownListMarker ctermbg=NONE ctermfg=white cterm=bold + hi link markdownCodeDelimiter markdownDelimiter + hi link markdownCode Function + hi markdownItalic ctermbg=NONE ctermfg=white cterm=italic + hi link markdownItalicDelimiter markdownDelimiter + hi markdownBold ctermbg=NONE ctermfg=darkgray cterm=bold + hi link markdownBoldDelimiter markdownDelimiter + hi link markdownIdDeclaration Conditional + hi link markdownId markdownIdDeclaration + hi markdownLinkText ctermbg=NONE ctermfg=darkgray cterm=underline hi ExtraWhitespace ctermbg=red ctermfg=NONE cterm=NONE hi link phpRegion Normal hi link phpComparison Operator @@ -620,6 +644,8 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi link Variable Function endif +let g:terminal_ansi_colors = ["#1f2121", "#5d5d5d", "#716c6c", "#767070", "#857f7f", "#9a9393", "#aeadad", "#eee4e4", "#3f3f3f", "#90905c", "#a2a268", "#b4b473", "#c3c67e", "#c6c689", "#d0d095", "#d5d5a1"] + augroup cursorlinebg au! au InsertEnter * hi CursorLine ctermbg=17 ctermfg=NONE cterm=NONE guibg=#384046 guifg=NONE diff --git a/vimrc b/vimrc index 4950c66..1f0c3f1 100644 --- a/vimrc +++ b/vimrc @@ -580,11 +580,12 @@ function! MyFoldText() "{{{ " don't display vim comment quotation marks let l:line = substitute(l:line, "\^\"\\s\\?", '', '') - let l:postfix = l:linecount . ' ' . substitute(v:folddashes, '-', '•', 'g') + " let l:postfix = l:linecount . ' ' . substitute(v:folddashes, '-', '•', 'g') + let l:postfix = l:linecount . ' ' . substitute(v:folddashes, '-', '↓', 'g') while strchars(l:postfix) < 7 let l:postfix = ' ' . l:postfix endwhile - let l:postfix = ' ↓ ' . l:postfix + " let l:postfix = ' ↓ ' . l:postfix let l:len_line = len(l:line) let l:len_postfix = strchars(l:postfix)