base highlights comlete

This commit is contained in:
ManjaroOne666 2018-04-01 16:07:11 +01:00
parent 6622cfd46b
commit 0efce3dc65
6 changed files with 179 additions and 211 deletions

91
vim/colors/base-grey.vim Normal file
View File

@ -0,0 +1,91 @@
" 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 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 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=#585858 guibg=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 guibg=#aa0000
hi SpellCap guifg=#eeeeee guibg=#340000
" SpellLocal
" SpellRare
hi TabLine guifg=#666666 guibg=#1c1c1c
hi TabLineFill guifg=#eeeeee guibg=#1c1c1c
hi TabLineSel guifg=#bcbcbc guibg=#1c1c1c
hi Title guifg=#a8a8a8 guibg=NONE
hi Visual guifg=#eeeeee guibg=#262626
" VisualNOS
hi WarningMsg guifg=#ffffff
hi WildMenu guifg=#aaaaaa guibg=NONE
" GUI Interface groups
" Menu
" Scrollbar
" ToolTip

View File

@ -1,41 +1,8 @@
" Vim color file
source ~/.vim/colors/grey.vim
source ~/.vim/colors/red.vim
source ~/.vim/colors/green.vim
source ~/.vim/colors/blue.vim
set background=dark
" hi clear Normal
" hi clear
if exists('syntax_on')
syntax reset
endif
set fillchars=stl:\ ,stlnc:\ ,vert:\|
let g:colors_name = 'customred256'
if has('gui_running')
hi Normal ctermfg=246 guifg=#949494 ctermbg=none guibg=#000000
else
hi Normal ctermfg=246 guifg=#6a6a6a ctermbg=none guibg=NONE
endif
""""""""""""""
" #colours
""""""""""""""
hi def link InterfaceFlagBright CRNormalBright 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
"""""""""""""""""""
" #definitions
""""""""""""""""""""
" #general definitions
hi! def link ErrorMsg CRError
hi! def link ExtraWhitespace CRWarning hi! def link ExtraWhitespace CRWarning
hi! def link IdentifierDark CRIdentifierDark hi! def link IdentifierDark CRIdentifierDark
@ -45,132 +12,20 @@ hi! def link TypeBright CRTypeBright
hi! def link Noise CRNoise hi! def link Noise CRNoise
hi Visual ctermfg=255 guifg=#eeeeee ctermbg=235 guibg=#262626 " taboo
" TODO dhjdhjd
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! def link QuickFixLine InterfaceSignError
"}}}
" #comment definitions
"}}}
" #interface definitions
hi!def link SpecialKey InterfaceSpecial"{{{
hi! def link Directory InterfaceSpecial
hi! def link WarningMsg InterfaceWarningMsg
hi Pmenu ctermfg=240 guifg=#585858 ctermbg=233 guibg=#121212
hi PmenuSel ctermfg=249 guifg=#b2b2b2 ctermbg=233 guibg=#121212
hi WildMenu ctermfg=248 guifg=#aaaaaa ctermbg=232 guibg=NONE
hi! def link MoreMsg InterfaceMsg
hi! def link Question InterfaceMsg
hi! def link ModeMsg InterfaceMsg
hi NonText ctermfg=243 guifg=#767676
hi! def link Title InterfaceH3
hi TabLine cterm=none ctermfg=242 guifg=#666666 ctermbg=234 guibg=#1c1c1c
hi TabLineFill cterm=none ctermfg=255 guifg=#eeeeee ctermbg=234 guibg=#1c1c1c
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 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
" custom
hi! def link qfFilename CRNoiseBright hi! def link qfFilename CRNoiseBright
hi! def link qfLineNr CRNoise hi! def link qfLineNr CRNoise
hi! def link qfSeparator CRNoiseDark hi! def link qfSeparator CRNoiseDark
hi! def link qfError InterfaceSignErrorDark 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=239 guifg=#555555 ctermbg=232 guibg=NONE gui=NONE
hi StatusLineNC ctermfg=238 guifg=#444444 ctermbg=232 guibg=NONE term=none cterm=none gui=NONE
hi StatusLineNormal ctermfg=243 guifg=#777777 ctermbg=234 guibg=#1c1c1c term=none cterm=none
hi StatusLineNormalNoText ctermfg=234 guifg=#1c1c1c ctermbg=234 guibg=#1c1c1c term=none cterm=none
hi StatusLineActive ctermfg=255 guifg=#ffffff ctermbg=239 guibg=#4e4e4e term=none cterm=none
hi StatusLineActiveNoText ctermfg=239 guifg=#4e4e4e ctermbg=239 guibg=#4e4e4e term=none cterm=none
hi StatusLineActiveQuotes ctermfg=244 guifg=#888888 ctermbg=239 guibg=#4e4e4e term=none cterm=none
hi StatusLineSeparator ctermfg=255 guifg=#ffffff ctermbg=232 guibg=NONE
hi StatusLineDir ctermfg=241 guifg=#666666 ctermbg=234 guibg=#1c1c1c
hi StatusLineDirActive ctermfg=243 guifg=#777777 ctermbg=237 guibg=#3a3a3a
hi StatusLineFile ctermfg=250 guifg=#cccccc ctermbg=234 guibg=#1c1c1c
hi StatusLineFileActive ctermfg=255 guifg=#eeeeee ctermbg=237 guibg=#3a3a3a
hi StatusLineDot ctermfg=241 guifg=#606060 ctermbg=234 guibg=#1c1c1c
hi StatusLineDotActive ctermfg=244 guifg=#808080 ctermbg=237 guibg=#3a3a3a
hi StatusLineExt ctermfg=243 guifg=#777777 ctermbg=234 guibg=#1c1c1c
hi StatusLineExtActive ctermfg=249 guifg=#bbbbbb ctermbg=239 guibg=#3a3a3a
hi StatusLinePercent ctermfg=241 guifg=#555555 ctermbg=233 guibg=#111111
hi StatusLinePercentActive ctermfg=243 guifg=#777777 ctermbg=233 guibg=#111111
" hi StatusLineMod ctermfg=255 guifg=#ffffff ctermbg=88 guibg=#490000
" TODO get cterm colors same as gui ones for all the following highlights
hi StatusLineDiv ctermfg=233 guifg=#111111 ctermbg=233 guibg=#111111 term=none cterm=none
hi StatusLineDivActive ctermfg=234 guifg=#1c1c1c ctermbg=234 guibg=#1c1c1c term=none cterm=none
hi StatusLineDivMod ctermfg=234 guifg=#290000 ctermbg=234 guibg=#290000 term=none cterm=none
hi StatusLineDivModActive ctermfg=233 guifg=#450000 ctermbg=233 guibg=#450000 term=none cterm=none
hi StatusLineDivInput ctermfg=234 guifg=#cccccc ctermbg=234 guibg=#cccccc term=none cterm=none
hi LinterDash ctermfg=233 guifg=#222222
hi LinterDashActive ctermfg=238 guifg=#333333
hi LinterError ctermfg=196 guifg=#ff0000 gui=bold
hi LinterErrorInactive ctermfg=196 guifg=#999999 gui=bold
hi LinterErrorStyle ctermfg=196 guifg=#aa0000 gui=bold
hi LinterErrorStyleInactive ctermfg=196 guifg=#858585 gui=bold
hi LinterWarning ctermfg=88 guifg=#870000 gui=bold
hi LinterWarningInactive ctermfg=88 guifg=#717171 gui=bold
hi LinterWarningStyle ctermfg=88 guifg=#660000 gui=bold
hi LinterWarningStyleInactive ctermfg=88 guifg=#585858 gui=bold
hi LinterInfo ctermfg=52 guifg=#440000
function! DoInsertEnter()
set cursorline
hi LineNr ctermfg=235 guifg=#262626
hi CursorLineNr ctermfg=250 guifg=#bcbcbc
endfunction
function! DoInsertLeave()
set nocursorline
hi LineNr ctermfg=237 guifg=#3a3a3a
hi CursorLineNr ctermfg=243 guifg=#767676
endfunction
" set insert mode colours
augroup statuscursorlines
au!
au InsertEnter * call DoInsertEnter()
au InsertLeave * call DoInsertLeave()
augroup END
"}}}
" #vim definitions " #vim definitions
hi! def link VimGroup Type"{{{ hi! def link VimGroup Type"{{{

View File

@ -1,5 +1,6 @@
" Includes " Includes
"{{{ "{{{
source ~/.vim/colors/base-grey.vim
source ~/.vim/colors/grey.vim source ~/.vim/colors/grey.vim
source ~/.vim/colors/red.vim source ~/.vim/colors/red.vim
source ~/.vim/colors/green.vim source ~/.vim/colors/green.vim
@ -73,58 +74,6 @@ hi Todo ctermfg=251 guifg=#dd3333 ctermbg=none guibg=NONE
"}}} "}}}
" highlight groups
" ColorColumn
" Conceal
" Cursor
" CursorIM
" CursorColumn
" CursorLine
" Directory
" DiffAdd
" DiffChange
" DiffDelete
" DiffText
" ErrorMsg
" VertSplit
" Folded
" FoldColumn
" SignColumn
" IncSearch
" LineNr
" MatchParen
" ModeMsg
" MoreMsg
" NonText
" Normal
" Pmenu
" PmenuSel
" PmenuSbar
" PmenuThumb
" Question
" Search
" SpecialKey
" SpellBad
" SpellCap
" SpellLocal
" SpellRare
" StatusLine
" StatusLineNC
" TabLine
" TabLineFill
" TabLineSel
" Title
" Visual
" VisualNOS
" WarningMsg
" WildMenu
" GUI Interface groups
" Menu
" Scrollbar
" ToolTip

View File

@ -30,7 +30,7 @@ endif
"" Highlight 'self' keyword "" Highlight 'self' keyword
"call pymode#default('g:pymode_syntax_highlight_self', g:pymode_syntax_all) "call pymode#default('g:pymode_syntax_highlight_self', g:pymode_syntax_all)
"" Highlight indent's errors "" kighlight indent's errors
"call pymode#default('g:pymode_syntax_indent_errors', g:pymode_syntax_all) "call pymode#default('g:pymode_syntax_indent_errors', g:pymode_syntax_all)
"" Highlight space's errors "" Highlight space's errors

View File

@ -5,7 +5,7 @@ if &term == 'xterm-256color'
endif endif
syntax on syntax on
colorscheme customred256 colorscheme monotonous
set guioptions-=mTrLb set guioptions-=mTrLb
set guioptions+=c set guioptions+=c

View File

@ -1,6 +1,65 @@
set statusline=%!GetStatus(1) set statusline=%!GetStatus(1)
" #statusline format " augroups
augroup status "{{{
autocmd!
autocmd WinNew,WinEnter * setlocal statusline=%!GetStatus(1)
autocmd WinLeave * setlocal statusline=%!GetStatus(0)
" autocmd WinNew * setlocal statusline=%!GetStatus(1)
" autocmd InsertChange * setlocal statusline=%!GetStatus(1)
augroup END
"}}}
" colors
hi clear StatusLine"{{{
hi StatusLine ctermfg=239 guifg=#555555 ctermbg=232 guibg=NONE gui=NONE
hi StatusLineNC ctermfg=238 guifg=#444444 ctermbg=232 guibg=NONE term=none cterm=none gui=NONE
hi StatusLineNormal ctermfg=243 guifg=#777777 ctermbg=234 guibg=#1c1c1c term=none cterm=none
hi StatusLineNormalNoText ctermfg=234 guifg=#1c1c1c ctermbg=234 guibg=#1c1c1c term=none cterm=none
hi StatusLineActive ctermfg=255 guifg=#ffffff ctermbg=239 guibg=#4e4e4e term=none cterm=none
hi StatusLineActiveNoText ctermfg=239 guifg=#4e4e4e ctermbg=239 guibg=#4e4e4e term=none cterm=none
hi StatusLineActiveQuotes ctermfg=244 guifg=#888888 ctermbg=239 guibg=#4e4e4e term=none cterm=none
hi StatusLineSeparator ctermfg=255 guifg=#ffffff ctermbg=232 guibg=NONE
hi StatusLineDir ctermfg=241 guifg=#666666 ctermbg=234 guibg=#1c1c1c
hi StatusLineDirActive ctermfg=243 guifg=#777777 ctermbg=237 guibg=#3a3a3a
hi StatusLineFile ctermfg=250 guifg=#cccccc ctermbg=234 guibg=#1c1c1c
hi StatusLineFileActive ctermfg=255 guifg=#eeeeee ctermbg=237 guibg=#3a3a3a
hi StatusLineDot ctermfg=241 guifg=#606060 ctermbg=234 guibg=#1c1c1c
hi StatusLineDotActive ctermfg=244 guifg=#808080 ctermbg=237 guibg=#3a3a3a
hi StatusLineExt ctermfg=243 guifg=#777777 ctermbg=234 guibg=#1c1c1c
hi StatusLineExtActive ctermfg=249 guifg=#bbbbbb ctermbg=239 guibg=#3a3a3a
hi StatusLinePercent ctermfg=241 guifg=#555555 ctermbg=233 guibg=#111111
hi StatusLinePercentActive ctermfg=243 guifg=#777777 ctermbg=233 guibg=#111111
" hi StatusLineMod ctermfg=255 guifg=#ffffff ctermbg=88 guibg=#490000
" TODO get cterm colors same as gui ones for all the following highlights
hi StatusLineDiv ctermfg=233 guifg=#111111 ctermbg=233 guibg=#111111 term=none cterm=none
hi StatusLineDivActive ctermfg=234 guifg=#1c1c1c ctermbg=234 guibg=#1c1c1c term=none cterm=none
hi StatusLineDivMod ctermfg=234 guifg=#290000 ctermbg=234 guibg=#290000 term=none cterm=none
hi StatusLineDivModActive ctermfg=233 guifg=#450000 ctermbg=233 guibg=#450000 term=none cterm=none
hi StatusLineDivInput ctermfg=234 guifg=#cccccc ctermbg=234 guibg=#cccccc term=none cterm=none
hi LinterDash ctermfg=233 guifg=#222222
hi LinterDashActive ctermfg=238 guifg=#333333
hi LinterError ctermfg=196 guifg=#ff0000 gui=bold
hi LinterErrorInactive ctermfg=196 guifg=#999999 gui=bold
hi LinterErrorStyle ctermfg=196 guifg=#aa0000 gui=bold
hi LinterErrorStyleInactive ctermfg=196 guifg=#858585 gui=bold
hi LinterWarning ctermfg=88 guifg=#870000 gui=bold
hi LinterWarningInactive ctermfg=88 guifg=#717171 gui=bold
hi LinterWarningStyle ctermfg=88 guifg=#660000 gui=bold
hi LinterWarningStyleInactive ctermfg=88 guifg=#585858 gui=bold
hi LinterInfo ctermfg=52 guifg=#440000
"}}}
" functions
function! GetStatus(isactive) "{{{ function! GetStatus(isactive) "{{{
" let l:linter = ale#statusline#Count(bufnr('')) " let l:linter = ale#statusline#Count(bufnr(''))
@ -156,16 +215,30 @@ function! GetStatus(isactive) "{{{
return l:statusline return l:statusline
endfunction "}}} endfunction
"}}}
function! DoInsertEnter()
augroup status "{{{ set cursorline"{{{
autocmd! hi LineNr ctermfg=235 guifg=#262626
autocmd WinNew,WinEnter * setlocal statusline=%!GetStatus(1) hi CursorLineNr ctermfg=250 guifg=#bcbcbc
autocmd WinLeave * setlocal statusline=%!GetStatus(0) endfunction
" autocmd WinNew * setlocal statusline=%!GetStatus(1) "}}}
" autocmd InsertChange * setlocal statusline=%!GetStatus(1)
augroup END"}}} function! DoInsertLeave()
set nocursorline"{{{
hi LineNr ctermfg=237 guifg=#3a3a3a
hi CursorLineNr ctermfg=243 guifg=#767676
endfunction
"}}}
" augroups
augroup statuscursorlines
au!
au InsertEnter * call DoInsertEnter()
au InsertLeave * call DoInsertLeave()
augroup END
" vim: foldmethod=marker " vim: foldmethod=marker