From d915a88a8aa8e7cbfcdad77d3f4a8fb62a707c34 Mon Sep 17 00:00:00 2001 From: Dmitry Chumak Date: Sun, 21 Aug 2022 16:41:15 +0300 Subject: [PATCH] [vim] atom dark theme cleaned a bit Vertical splits style moved from main config to theme file --- vim/colors/atom-dark-256.vim | 10 +-- vim/colors/atom-dark.vim | 116 ----------------------------------- vim/vimrc | 7 --- 3 files changed, 5 insertions(+), 128 deletions(-) delete mode 100644 vim/colors/atom-dark.vim diff --git a/vim/colors/atom-dark-256.vim b/vim/colors/atom-dark-256.vim index ddd639a..44a80eb 100644 --- a/vim/colors/atom-dark-256.vim +++ b/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 diff --git a/vim/colors/atom-dark.vim b/vim/colors/atom-dark.vim deleted file mode 100644 index 0e11205..0000000 --- a/vim/colors/atom-dark.vim +++ /dev/null @@ -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 - diff --git a/vim/vimrc b/vim/vimrc index bcfc5db..27caf7c 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -33,11 +33,6 @@ 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 @@ -72,7 +67,6 @@ 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 " @@ -87,7 +81,6 @@ nnoremap gp :! git push " git Push nnoremap n :NERDTreeFocus nnoremap :NERDTree nnoremap :NERDTreeToggle -highlight VertSplit cterm=none " 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