Merge branch 'master' of git.246060.ru:f1x1t/vimrc

vimrc

@@ -24,6 +24,10 @@ Plug 'skywind3000/asyncrun.vim'
 " Автоматическое переключение раскладки клавиатуры в режиме вставки "
 Plug 'lyokha/vim-xkbswitch'
 
+" https://github.com/srcery-colors/srcery-vim
+" Тема srcery
+Plug 'srcery-colors/srcery-vim'
+
 " https://github.com/itchyny/lightline.vim
 " Настраиваемая строка состояния "
 " https://github.com/taohexxx/lightline-buffer
@@ -298,29 +302,54 @@ let g:XkbSwitchSkipIMappings = {
 
 "{{{ Цветовая схема kolor https://github.com/zeis/vim-kolor/
 " Enable italic. Default: 1
-let g:kolor_italic=0
+" let g:kolor_italic=0
 
 " Enable bold. Default: 1
-let g:kolor_bold=1
+" let g:kolor_bold=1
 
 " Enable underline. Default: 0
-let g:kolor_underlined=0
+" let g:kolor_underlined=0
 
 " Gray 'MatchParen' color. Default: 0
-let g:kolor_alternative_matchparen=0
+" let g:kolor_alternative_matchparen=0
 
 " White foreground 'MatchParen' color that might work better with some terminals. Default: 0
-let g:kolor_inverted_matchparen=0
+" let g:kolor_inverted_matchparen=0
 
-colorscheme kolor
+" colorscheme kolor
+"}}}
 
-highlight SpecialKey      guifg=#585858    guibg=NONE       gui=none
-highlight NonText         guifg=#585858    guibg=#2e2d2b    gui=none
 
-if &t_Co > 255
+"{{{ Цветовая схема srcery https://github.com/srcery-colors/srcery-vim
-	highlight SpecialKey      ctermfg=240     ctermbg=none    cterm=none
+" Enables italic text.
-	highlight NonText         ctermfg=240     ctermbg=235     cterm=none
+" let g:srcery_italic=0
-endif
+
+" Enables bold text.
+let g:srcery_bold=1
+
+" Enables underlined text.
+let g:srcery_underline=1
+
+" Enables undercurled text.
+let g:srcery_undercurl=1
+
+" Highlight search matches using inverse colors.
+let g:srcery_inverse_matches=0
+
+" When enabled will highlight matching delimiters using inverse colors. (:DoMatchParen)
+let g:srcery_inverse_match_paren=0
+
+colorscheme srcery
+"}}}
+
+"{{{
+"highlight SpecialKey      guifg=#585858    guibg=NONE       gui=none
+"highlight NonText         guifg=#585858    guibg=#2e2d2b    gui=none
+
+"if &t_Co <= 256
+"	highlight SpecialKey      ctermfg=240     ctermbg=none    cterm=none
+"	highlight NonText         ctermfg=240     ctermbg=235     cterm=none
+"endif
 
 " Разноцветные скобки для определённых типов файлов
 autocmd FileType bash,python,vim,html,c,cpp,objc,objcpp call rainbow#load()