[vim] merge

Vertical splits style moved from main config to theme file

tmux.conf

@@ -1,4 +1,4 @@
-
+set -g default-terminal "screen-256color"
 set -g mouse on
 set -g set-clipboard external
 set -g escape-time 10 # https://www.johnhawthorn.com/2012/09/vi-escape-delays/

vim/colors/antiphoton.vim

@@ -0,0 +1,209 @@
+" Name:        antiphoton.vim
+" Author:      Alex Vear <alex@vear.uk>
+" Webpage:     https://github.com/axvr/photon.vim
+" Description: An elegant, light colour scheme with minimal syntax highlighting
+" Licence:     MIT (2020)
+" Last Change: 2021-08-16
+
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "antiphoton"
+
+" if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
+if has("gui_running") || (&t_Co == 256 && (&term ==# "xterm" || &term =~# "^screen") )
+    hi Normal ctermbg=231 ctermfg=233 cterm=NONE guibg=#ffffff guifg=#121212 gui=NONE
+
+    set background=light
+    echo "Light 256"
+
+    hi NonText ctermbg=bg ctermfg=253 cterm=NONE guibg=bg guifg=#dadada gui=NONE
+    hi Comment ctermbg=bg ctermfg=246 cterm=NONE guibg=bg guifg=#949494 gui=NONE
+    hi Conceal ctermbg=bg ctermfg=242 cterm=NONE guibg=bg guifg=#6c6c6c gui=NONE
+    hi Constant ctermbg=bg ctermfg=134 cterm=NONE guibg=bg guifg=#af5fd7 gui=NONE
+    hi Identifier ctermbg=bg ctermfg=233 cterm=NONE guibg=bg guifg=#121212 gui=NONE
+    hi Statement ctermbg=bg ctermfg=242 cterm=NONE guibg=bg guifg=#6c6c6c gui=NONE
+    hi Operator ctermbg=bg ctermfg=233 cterm=NONE guibg=bg guifg=#121212 gui=NONE
+    hi PreProc ctermbg=bg ctermfg=242 cterm=NONE guibg=bg guifg=#6c6c6c gui=NONE
+    hi Type ctermbg=bg ctermfg=233 cterm=NONE guibg=bg guifg=#121212 gui=NONE
+    hi Special ctermbg=NONE ctermfg=242 cterm=NONE guibg=NONE guifg=#6c6c6c gui=NONE
+    hi Error ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#af0000 gui=NONE
+    hi Warning ctermbg=NONE ctermfg=166 cterm=NONE guibg=NONE guifg=#d75f00 gui=NONE
+    hi ModeMsg ctermbg=NONE ctermfg=242 cterm=NONE guibg=NONE guifg=#6c6c6c gui=NONE
+    hi Todo ctermbg=NONE ctermfg=203 cterm=bold guibg=NONE guifg=#d75f5f gui=bold
+    hi Underlined ctermbg=NONE ctermfg=233 cterm=underline guibg=NONE guifg=#121212 gui=underline
+    hi StatusLine ctermbg=254 ctermfg=134 cterm=bold guibg=#e4e4e4 guifg=#af5fd7 gui=bold
+    hi StatusLineNC ctermbg=255 ctermfg=242 cterm=NONE guibg=#eeeeee guifg=#6c6c6c gui=NONE
+    hi TabLine ctermbg=253 ctermfg=242 cterm=NONE guibg=#dadada guifg=#6c6c6c gui=NONE
+    hi TabLineSel ctermbg=255 ctermfg=134 cterm=bold guibg=#eeeeee guifg=#af5fd7 gui=bold
+    hi WildMenu ctermbg=203 ctermfg=231 cterm=NONE guibg=#d75f5f guifg=#ffffff gui=NONE
+    hi VertSplit ctermbg=255 ctermfg=255 cterm=NONE guibg=#eeeeee guifg=#eeeeee gui=NONE
+    hi Title ctermbg=NONE ctermfg=233 cterm=bold guibg=NONE guifg=#121212 gui=bold
+    hi LineNr ctermbg=NONE ctermfg=246 cterm=NONE guibg=NONE guifg=#949494 gui=NONE
+    hi CursorLineNr ctermbg=255 ctermfg=134 cterm=NONE guibg=#eeeeee guifg=#af5fd7 gui=NONE
+    hi Cursor ctermbg=134 ctermfg=233 cterm=NONE guibg=#af5fd7 guifg=#121212 gui=NONE
+    hi CursorLine ctermbg=255 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE
+    hi SignColumn ctermbg=NONE ctermfg=242 cterm=NONE guibg=NONE guifg=#6c6c6c gui=NONE
+    hi Visual ctermbg=254 ctermfg=NONE cterm=NONE guibg=#e4e4e4 guifg=NONE gui=NONE
+    hi VisualNOS ctermbg=253 ctermfg=NONE cterm=NONE guibg=#dadada guifg=NONE gui=NONE
+    hi Pmenu ctermbg=255 ctermfg=242 cterm=NONE guibg=#eeeeee guifg=#6c6c6c gui=NONE
+    hi PmenuSbar ctermbg=254 ctermfg=NONE cterm=NONE guibg=#e4e4e4 guifg=NONE gui=NONE
+    hi PmenuSel ctermbg=254 ctermfg=134 cterm=bold guibg=#e4e4e4 guifg=#af5fd7 gui=bold
+    hi PmenuThumb ctermbg=203 ctermfg=NONE cterm=NONE guibg=#d75f5f guifg=NONE gui=NONE
+    hi Folded ctermbg=253 ctermfg=242 cterm=NONE guibg=#dadada guifg=#6c6c6c gui=NONE
+    hi FoldColumn ctermbg=NONE ctermfg=166 cterm=NONE guibg=NONE guifg=#d75f00 gui=NONE
+    hi SpecialKey ctermbg=NONE ctermfg=242 cterm=NONE guibg=NONE guifg=#6c6c6c gui=NONE
+    hi IncSearch ctermbg=203 ctermfg=231 cterm=NONE guibg=#d75f5f guifg=#ffffff gui=NONE
+    hi Search ctermbg=134 ctermfg=231 cterm=NONE guibg=#af5fd7 guifg=#ffffff gui=NONE
+    hi Directory ctermbg=NONE ctermfg=134 cterm=NONE guibg=NONE guifg=#af5fd7 gui=NONE
+    hi MatchParen ctermbg=NONE ctermfg=203 cterm=bold guibg=NONE guifg=#d75f5f gui=bold
+    hi SpellBad ctermbg=NONE ctermfg=124 cterm=underline guibg=NONE guifg=#af0000 gui=underline
+    hi SpellCap ctermbg=NONE ctermfg=28 cterm=underline guibg=NONE guifg=#008700 gui=underline
+    hi SpellLocal ctermbg=NONE ctermfg=166 cterm=underline guibg=NONE guifg=#d75f00 gui=underline
+    hi QuickFixLine ctermbg=253 ctermfg=NONE cterm=NONE guibg=#dadada guifg=NONE gui=NONE
+    hi DiffAdd ctermbg=255 ctermfg=28 cterm=NONE guibg=#eeeeee guifg=#008700 gui=NONE
+    hi DiffChange ctermbg=255 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE
+    hi DiffDelete ctermbg=255 ctermfg=124 cterm=NONE guibg=#eeeeee guifg=#af0000 gui=NONE
+    hi DiffText ctermbg=255 ctermfg=166 cterm=NONE guibg=#eeeeee guifg=#d75f00 gui=NONE
+    hi helpHyperTextJump ctermbg=bg ctermfg=134 cterm=NONE guibg=bg guifg=#af5fd7 gui=NONE
+
+elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
+    " set t_Co=16
+
+    hi Normal ctermbg=white ctermfg=black cterm=NONE
+    echo "light 8"
+
+    set background=light
+
+    hi NonText ctermbg=bg ctermfg=grey cterm=NONE
+    hi Comment ctermbg=bg ctermfg=gray cterm=NONE
+    hi Conceal ctermbg=bg ctermfg=darkgray cterm=NONE
+    hi Constant ctermbg=bg ctermfg=darkmagenta cterm=NONE
+    hi Identifier ctermbg=bg ctermfg=black cterm=NONE
+    hi Statement ctermbg=bg ctermfg=darkgray cterm=NONE
+    hi Operator ctermbg=bg ctermfg=black cterm=NONE
+    hi PreProc ctermbg=bg ctermfg=darkgray cterm=NONE
+    hi Type ctermbg=bg ctermfg=black cterm=NONE
+    hi Special ctermbg=NONE ctermfg=darkgray cterm=NONE
+    hi Error ctermbg=NONE ctermfg=darkred cterm=NONE
+    hi Warning ctermbg=NONE ctermfg=darkyellow cterm=NONE
+    hi ModeMsg ctermbg=NONE ctermfg=darkgray cterm=NONE
+    hi Todo ctermbg=NONE ctermfg=red cterm=bold
+    hi Underlined ctermbg=NONE ctermfg=black cterm=underline
+    hi StatusLine ctermbg=white ctermfg=darkmagenta cterm=bold
+    hi StatusLineNC ctermbg=white ctermfg=darkgray cterm=NONE
+    hi TabLine ctermbg=grey ctermfg=darkgray cterm=NONE
+    hi TabLineSel ctermbg=white ctermfg=darkmagenta cterm=bold
+    hi WildMenu ctermbg=red ctermfg=white cterm=NONE
+    hi VertSplit ctermbg=white ctermfg=white cterm=NONE
+    hi Title ctermbg=NONE ctermfg=black cterm=bold
+    hi LineNr ctermbg=NONE ctermfg=gray cterm=NONE
+    hi CursorLineNr ctermbg=white ctermfg=darkmagenta cterm=NONE
+    hi Cursor ctermbg=darkmagenta ctermfg=black cterm=NONE
+    hi CursorLine ctermbg=white ctermfg=NONE cterm=NONE
+    hi SignColumn ctermbg=NONE ctermfg=darkgray cterm=NONE
+    hi Visual ctermbg=white ctermfg=NONE cterm=NONE
+    hi VisualNOS ctermbg=grey ctermfg=NONE cterm=NONE
+    hi Pmenu ctermbg=white ctermfg=darkgray cterm=NONE
+    hi PmenuSbar ctermbg=white ctermfg=NONE cterm=NONE
+    hi PmenuSel ctermbg=white ctermfg=darkmagenta cterm=bold
+    hi PmenuThumb ctermbg=red ctermfg=NONE cterm=NONE
+    hi Folded ctermbg=grey ctermfg=darkgray cterm=NONE
+    hi FoldColumn ctermbg=NONE ctermfg=darkyellow cterm=NONE
+    hi SpecialKey ctermbg=NONE ctermfg=darkgray cterm=NONE
+    hi IncSearch ctermbg=red ctermfg=white cterm=NONE
+    hi Search ctermbg=darkmagenta ctermfg=white cterm=NONE
+    hi Directory ctermbg=NONE ctermfg=darkmagenta cterm=NONE
+    hi MatchParen ctermbg=NONE ctermfg=red cterm=bold
+    hi SpellBad ctermbg=NONE ctermfg=darkred cterm=underline
+    hi SpellCap ctermbg=NONE ctermfg=darkgreen cterm=underline
+    hi SpellLocal ctermbg=NONE ctermfg=darkyellow cterm=underline
+    hi QuickFixLine ctermbg=grey ctermfg=NONE cterm=NONE
+    hi DiffAdd ctermbg=white ctermfg=darkgreen cterm=NONE
+    hi DiffChange ctermbg=white ctermfg=NONE cterm=NONE
+    hi DiffDelete ctermbg=white ctermfg=darkred cterm=NONE
+    hi DiffText ctermbg=white ctermfg=darkyellow cterm=NONE
+    hi helpHyperTextJump ctermbg=bg ctermfg=darkmagenta cterm=NONE
+endif
+
+hi! link Character Constant
+hi! link Number Constant
+hi! link Float Number
+hi! link Boolean Constant
+hi! link String Constant
+hi! link Function Identifier
+hi! link Conditonal Statement
+hi! link Repeat Statement
+hi! link Label Statement
+hi! link Keyword Statement
+hi! link Exception Statement
+hi! link Include PreProc
+hi! link Define PreProc
+hi! link Macro PreProc
+hi! link PreCondit PreProc
+hi! link StorageClass Type
+hi! link Structure Type
+hi! link Typedef Type
+hi! link SpecialChar Special
+hi! link Tag Special
+hi! link Delimiter Special
+hi! link SpecialComment Special
+hi! link Debug Special
+hi! link ErrorMsg Error
+hi! link WarningMsg Warning
+hi! link MoreMsg ModeMsg
+hi! link Question ModeMsg
+hi! link Ignore NonText
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link TabLineFill TabLine
+hi! link CursorColumn CursorLine
+hi! link ColorColumn CursorColumn
+hi! link SpellRare SpellLocal
+hi! link diffAdded DiffAdd
+hi! link diffRemoved DiffDelete
+hi! link htmlTag htmlTagName
+hi! link htmlEndTag htmlTag
+hi! link gitcommitSummary Title
+
+if has('nvim')
+    let g:terminal_color_0 = '#303030'
+    let g:terminal_color_1 = '#af0000'
+    let g:terminal_color_2 = '#008700'
+    let g:terminal_color_3 = '#a2734c'
+    let g:terminal_color_4 = '#12488b'
+    let g:terminal_color_5 = '#a347ba'
+    let g:terminal_color_6 = '#2aa1b3'
+    let g:terminal_color_7 = '#949494'
+    let g:terminal_color_8 = '#4e4e4e'
+    let g:terminal_color_9 = '#d75f5f'
+    let g:terminal_color_10 = '#33d17a'
+    let g:terminal_color_11 = '#d75f00'
+    let g:terminal_color_12 = '#2a7bde'
+    let g:terminal_color_13 = '#af5fd7'
+    let g:terminal_color_14 = '#33c7de'
+    let g:terminal_color_15 = '#e4e4e4'
+else
+    let g:terminal_ansi_colors = [
+            \ '#303030',
+            \ '#af0000',
+            \ '#008700',
+            \ '#a2734c',
+            \ '#12488b',
+            \ '#a347ba',
+            \ '#2aa1b3',
+            \ '#949494',
+            \ '#4e4e4e',
+            \ '#d75f5f',
+            \ '#33d17a',
+            \ '#d75f00',
+            \ '#2a7bde',
+            \ '#af5fd7',
+            \ '#33c7de',
+            \ '#e4e4e4',
+            \ ]
+endif
+
+" Generated with RNB (https://github.com/romainl/vim-rnb)

vim/colors/atom-dark-256.vim

@@ -308,7 +308,7 @@ elseif has("gui_running") || (&t_Co == 256 && (&term ==# "xterm" || &term =~# "^
     CSAHi Question term=NONE cterm=bold ctermbg=bg ctermfg=117 gui=bold guibg=bg guifg=#66D9EF
     CSAHi StatusLine term=bold,reverse cterm=NONE ctermbg=231 ctermfg=66 gui=NONE guibg=fg guifg=#455354
     CSAHi StatusLineNC term=reverse cterm=reverse ctermbg=244 ctermfg=232 gui=reverse guibg=#080808 guifg=#808080
-    CSAHi VertSplit term=reverse cterm=reverse ctermbg=244 ctermfg=232 gui=reverse guibg=#080808 guifg=#808080
+    CSAHi VertSplit term=reverse cterm=reverse ctermbg=bg ctermfg=bg gui=reverse guibg=bg guifg=bg
     CSAHi Title term=bold cterm=NONE ctermbg=bg ctermfg=189 gui=NONE guibg=bg guifg=#B6B7EB
     CSAHi Visual term=reverse cterm=NONE ctermbg=59 ctermfg=fg gui=NONE guibg=#403D3D guifg=fg
     CSAHi VisualNOS term=NONE cterm=NONE ctermbg=59 ctermfg=fg gui=NONE guibg=#403D3D guifg=fg
@@ -628,7 +628,7 @@ elseif has("gui_running") || (&t_Co == 256 && (&term ==# "xterm" || &term =~# "^
     CSAHi Question term=NONE cterm=bold ctermbg=bg ctermfg=123 gui=bold guibg=bg guifg=#66D9EF
     CSAHi StatusLine term=bold,reverse cterm=NONE ctermbg=255 ctermfg=102 gui=NONE guibg=fg guifg=#455354
     CSAHi StatusLineNC term=reverse cterm=reverse ctermbg=244 ctermfg=232 gui=reverse guibg=#080808 guifg=#808080
-    CSAHi VertSplit term=reverse cterm=reverse ctermbg=244 ctermfg=232 gui=reverse guibg=#080808 guifg=#808080
+    CSAHi VertSplit term=reverse cterm=reverse ctermbg=bg ctermfg=bg gui=reverse guibg=bg guifg=bg
     CSAHi Title term=bold cterm=NONE ctermbg=bg ctermfg=189 gui=NONE guibg=bg guifg=#B6B7EB
     CSAHi Visual term=reverse cterm=NONE ctermbg=95 ctermfg=fg gui=NONE guibg=#403D3D guifg=fg
     CSAHi VisualNOS term=NONE cterm=NONE ctermbg=95 ctermfg=fg gui=NONE guibg=#403D3D guifg=fg
@@ -948,7 +948,7 @@ elseif has("gui_running") || &t_Co == 256
     CSAHi Question term=NONE cterm=bold ctermbg=bg ctermfg=81 gui=bold guibg=bg guifg=#66D9EF
     CSAHi StatusLine term=bold,reverse cterm=NONE ctermbg=231 ctermfg=59 gui=NONE guibg=fg guifg=#455354
     CSAHi StatusLineNC term=reverse cterm=reverse ctermbg=244 ctermfg=232 gui=reverse guibg=#080808 guifg=#808080
-    CSAHi VertSplit term=reverse cterm=reverse ctermbg=244 ctermfg=232 gui=reverse guibg=#080808 guifg=#808080
+    CSAHi VertSplit term=reverse cterm=reverse ctermbg=bg ctermfg=bg gui=reverse guibg=bg guifg=bg
     CSAHi Title term=bold cterm=NONE ctermbg=bg ctermfg=146 gui=NONE guibg=bg guifg=#B6B7EB
     CSAHi Visual term=reverse cterm=NONE ctermbg=59 ctermfg=fg gui=NONE guibg=#403D3D guifg=fg
     CSAHi VisualNOS term=NONE cterm=NONE ctermbg=59 ctermfg=fg gui=NONE guibg=#403D3D guifg=fg
@@ -1268,7 +1268,7 @@ elseif has("gui_running") || &t_Co == 88
     CSAHi Question term=NONE cterm=bold ctermbg=bg ctermfg=43 gui=bold guibg=bg guifg=#66D9EF
     CSAHi StatusLine term=bold,reverse cterm=NONE ctermbg=79 ctermfg=21 gui=NONE guibg=fg guifg=#455354
     CSAHi StatusLineNC term=reverse cterm=reverse ctermbg=83 ctermfg=16 gui=reverse guibg=#080808 guifg=#808080
-    CSAHi VertSplit term=reverse cterm=reverse ctermbg=83 ctermfg=16 gui=reverse guibg=#080808 guifg=#808080
+    CSAHi VertSplit term=reverse cterm=reverse ctermbg=bg ctermfg=bg gui=reverse guibg=bg guifg=bg
     CSAHi Title term=bold cterm=NONE ctermbg=bg ctermfg=59 gui=NONE guibg=bg guifg=#B6B7EB
     CSAHi Visual term=reverse cterm=NONE ctermbg=80 ctermfg=fg gui=NONE guibg=#403D3D guifg=fg
     CSAHi VisualNOS term=NONE cterm=NONE ctermbg=80 ctermfg=fg gui=NONE guibg=#403D3D guifg=fg
@@ -1293,7 +1293,7 @@ elseif has("gui_running") || &t_Co == 88
     CSAHi LightLineLeft_insert_1_2 term=NONE cterm=NONE ctermbg=21 ctermfg=22 gui=NONE guibg=#005f87 guifg=#0087af
     CSAHi LightLineLeft_insert_1_tabsel term=NONE cterm=NONE ctermbg=80 ctermfg=22 gui=NONE guibg=#262626 guifg=#0087af
     CSAHi LightLineLeft_insert_tabsel_1 term=NONE cterm=NONE ctermbg=22 ctermfg=80 gui=NONE guibg=#0087af guifg=#262626
-    CSAHi LightLineMiddle_insert term=NONE cterm=NONE ctermbg=21 ctermfg=43 gui=NONE guibg=#005f87 guifg=#87dfff
+    CSAHi LightLineMiddle_insert term=NONE cterm=NONE ctermbg=22 ctermfg=43 gui=NONE guibg=#005f87 guifg=#87dfff
     CSAHi LightLineRight_insert_0_1 term=NONE cterm=NONE ctermbg=22 ctermfg=43 gui=NONE guibg=#0087af guifg=#87dfff
     CSAHi vimNormCmds term=NONE cterm=NONE ctermbg=bg ctermfg=fg gui=NONE guibg=bg guifg=fg
     CSAHi Folded term=NONE cterm=NONE ctermbg=16 ctermfg=81 gui=NONE guibg=#000000 guifg=#465457

vim/colors/atom-dark.vim

@@ -1,116 +0,0 @@
-" Vim color file
-"
-" Author: Federico Ramirez
-" https://github.com/gosukiwi/vim-atom-dark
-"
-" Note: Based on the Monokai theme variation by Tomas Restrepo
-" https://github.com/tomasr/molokai
-
-hi clear
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="atom-dark"
-
-hi Boolean         guifg=#99CC99
-hi Character       guifg=#A8FF60
-hi Number          guifg=#99CC99
-hi String          guifg=#A8FF60
-hi Conditional     guifg=#92C5F7               gui=none
-hi Constant        guifg=#99CC99               gui=none
-hi Cursor          guifg=#F1F1F1 guibg=#777777
-hi iCursor         guifg=#F1F1F1 guibg=#777777
-hi Debug           guifg=#BCA3A3               gui=none
-hi Define          guifg=#66D9EF
-hi Delimiter       guifg=#8F8F8F
-hi DiffAdd                       guibg=#13354A
-hi DiffChange      guifg=#89807D guibg=#4C4745
-hi DiffDelete      guifg=#960050 guibg=#1E0010
-hi DiffText                      guibg=#4C4745 gui=none
-
-hi Directory       guifg=#AAAAAA               gui=none
-hi Error           guifg=#A8FF60 guibg=#1E0010
-hi ErrorMsg        guifg=#92C5F7 guibg=#232526 gui=none
-hi Exception       guifg=#DAD085               gui=none
-hi Float           guifg=#99CC99
-hi FoldColumn      guifg=#465457 guibg=#000000
-hi Folded          guifg=#465457 guibg=#000000
-hi Function        guifg=#DAD085
-hi Identifier      guifg=#B6B7EB
-hi Ignore          guifg=#808080 guibg=bg
-hi IncSearch       guifg=#C4BE89 guibg=#000000
-
-hi Keyword         guifg=#92C5F7               gui=none
-hi Label           guifg=#A8FF60               gui=none
-hi Macro           guifg=#C4BE89               gui=none
-hi SpecialKey      guifg=#66D9EF               gui=none
-
-hi MatchParen      guifg=#B7B9B8 guibg=#444444 gui=none
-hi ModeMsg         guifg=#A8FF60
-hi MoreMsg         guifg=#A8FF60
-hi Operator        guifg=#92C5F7
-
-" complete menu
-hi Pmenu           guifg=#66D9EF guibg=#000000
-hi PmenuSel                      guibg=#808080
-hi PmenuSbar                     guibg=#080808
-hi PmenuThumb      guifg=#66D9EF
-
-hi PreCondit       guifg=#DAD085               gui=none
-hi PreProc         guifg=#DAD085
-hi Question        guifg=#66D9EF
-hi Repeat          guifg=#92C5F7               gui=none
-hi Search          guifg=#000000 guibg=#B4EC85
-" marks
-hi SignColumn      guifg=#DAD085 guibg=#232526
-hi SpecialChar     guifg=#92C5F7               gui=none
-hi SpecialComment  guifg=#7C7C7C               gui=none
-hi Special         guifg=#66D9EF guibg=bg      gui=none
-if has("spell")
-    hi SpellBad    guisp=#FF0000 gui=undercurl
-    hi SpellCap    guisp=#7070F0 gui=undercurl
-    hi SpellLocal  guisp=#70F0F0 gui=undercurl
-    hi SpellRare   guisp=#FFFFFF gui=undercurl
-endif
-hi Statement       guifg=#92C5F7               gui=none
-hi StatusLine      guifg=#455354 guibg=fg      gui=none
-hi StatusLineNC    guifg=#808080 guibg=#080808
-hi StorageClass    guifg=#B6B7EB               gui=none
-hi Structure       guifg=#66D9EF
-hi Tag             guifg=#92C5F7               gui=none
-hi Title           guifg=#B6B7EB               gui=none
-hi Todo            guifg=#FFFFFF guibg=bg      gui=none
-
-hi Typedef         guifg=#66D9EF
-hi Type            guifg=#66D9EF               gui=none
-hi Underlined      guifg=#808080               gui=underline
-
-hi VertSplit       guifg=#808080 guibg=#080808
-hi VisualNOS                     guibg=#403D3D
-hi Visual                        guibg=#403D3D
-hi WarningMsg      guifg=#FFFFFF guibg=#333333
-hi WildMenu        guifg=#66D9EF guibg=#000000
-
-hi TabLineFill     guifg=#1D1F21 guibg=#1D1F21
-hi TabLine         guibg=#1D1F21 guifg=#808080 gui=none
-
-hi Normal          guifg=#F8F8F2 guibg=#1D1F21
-hi Comment         guifg=#7C7C7C
-hi CursorLine                    guibg=#293739
-hi CursorLineNr    guifg=#B6B7EB               gui=none
-hi CursorColumn                  guibg=#293739
-hi ColorColumn     guifg=#B62323 guibg=#232526
-hi LineNr          guifg=#465457 guibg=#232526
-hi NonText         guifg=#465457
-hi SpecialKey      guifg=#465457
-
-" Must be at the end, because of ctermbg=234 bug.
-" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
-set background=dark
-

vim/ftplugin/helm.vim

@@ -1,4 +1,3 @@
-filetype plugin indent on
 " show existing tab with 2 spaces width
 set tabstop=2
 " when indenting with '>', use 2 spaces width

vim/vimrc

@@ -3,37 +3,13 @@
 " TODO: create readme file about navigation
 filetype plugin indent on "Включает определение типа файла, загрузку...
 "... соответствующих ему плагинов и файлов отступов
-set encoding=utf-8 "Ставит кодировку UTF-8
+set encoding=utf-8
 syntax enable
-set term=xterm-256color
+set timeoutlen=300 ttimeoutlen=0 " https://www.johnhawthorn.com/2012/09/vi-escape-delays/
-set timeoutlen=200 ttimeoutlen=0 " https://www.johnhawthorn.com/2012/09/vi-escape-delays/
-colorscheme atom-dark-256
 set number relativenumber
 set backspace=indent,eol,start
 filetype plugin indent on
 
-" tabs navigation
-nnoremap <C-S-tab> :tabprevious<CR>
-nnoremap <C-tab>   :tabnext<CR>
-nnoremap <C-t>     :tabnew<CR>
-inoremap <C-S-tab> <Esc>:tabprevious<CR>i
-inoremap <C-tab>   <Esc>:tabnext<CR>i
-inoremap <C-t>     <Esc>:tabnew<CR>i
-nnoremap H gT
-nnoremap L gt
-
-" Changing <leader> key from \ to <space>
-nnoremap <SPACE> <Nop>
-let mapleader=" "
-
-" Folding params
-set foldlevelstart=20
-
-" Hiding unnecessary vertical split lines
-set fillchars+=vert:\ "White space at the end
-highlight VertSplit ctermbg=bg ctermfg=bg
-highlight VertSplit guibg=bg guifg=bg
-
 if empty(glob('~/.vim/autoload/plug.vim')) "Если vim-plug не стоит
   silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs 
     \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim 
@@ -44,6 +20,7 @@ endif
 
 call plug#begin('~/.vim/bundle') "Начать искать плагины в этой директории
   Plug 'vim-airline/vim-airline'
+  Plug 'vim-airline/vim-airline-themes'
   Plug 'Yggdroot/indentLine'
   Plug 'airblade/vim-gitgutter'
   Plug 'jreybert/vimagit'
@@ -53,6 +30,42 @@ call plug#begin('~/.vim/bundle') "Начать искать плагины в э
   Plug 'junegunn/fzf.vim'
 call plug#end() "Перестать это делать
 
+"
+" Colors configuration
+"
+set term=xterm-256color
+colorscheme atom-dark-256
+AirlineTheme dark
+
+function ToggleColors()
+    if (g:colors_name == "atom-dark-256")
+        colorscheme antiphoton
+        AirlineTheme light
+    else
+        colorscheme atom-dark-256
+        AirlineTheme dark
+    endif
+endfunction
+
+nnoremap <C-b> :call ToggleColors()<CR>
+
+" tabs navigation
+nnoremap <C-S-tab> :tabprevious<CR>
+nnoremap <C-tab>   :tabnext<CR>
+nnoremap <C-t>     :tabnew<CR>
+inoremap <C-S-tab> <Esc>:tabprevious<CR>i
+inoremap <C-tab>   <Esc>:tabnext<CR>i
+inoremap <C-t>     <Esc>:tabnew<CR>i
+nnoremap H gT
+nnoremap L gt
+
+
+" Changing <leader> key from \ to <space>
+nnoremap <SPACE> <Nop>
+let mapleader=" "
+
+" Folding params
+set foldlevelstart=20
 "
 " Vim-Airline plugin config
 "
@@ -67,8 +80,8 @@ let g:Powerline_symbols='unicode' " Unicode support
 " Gitgutter plugin config
 "
 let g:gitgutter_override_sign_column_highlight = 1
-highlight SignColumn term=underline cterm=NONE ctermbg=235 ctermfg=66 gui=NONE guibg=#232526 guifg=#465457
 set updatetime=100
+nnoremap <leader>gu :GitGutterUndoHunk<CR> " undo git change under the line
 
 "
 " Magit plugin config
@@ -82,7 +95,6 @@ nnoremap <leader>gp :! git push<CR>  " git Push
 nnoremap <leader>n :NERDTreeFocus<CR>
 nnoremap <C-n> :NERDTree<CR>
 nnoremap <C-t> :NERDTreeToggle<CR>
-highlight VertSplit cterm=none
 let NERDTreeShowHidden=1
 " Exit Vim if NERDTree is the only window remaining in the only tab.
 autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif