Revert "Use darcula theme"

This reverts commit 8b2dc277d4.
pull/1/head
Ensar Sarajčić 2021-02-25 16:17:58 +01:00
parent 8b2dc277d4
commit e075f0d7e3
4 changed files with 46 additions and 60 deletions

View File

@ -5,45 +5,45 @@
function s:UpdateColors() function s:UpdateColors()
let ctermbg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'cterm') let ctermbg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'cterm')
let guibg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'gui') let guibg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'gui')
let idguifg1 = synIDattr(synIDtrans(hlID('String')), 'fg', 'gui') let idguifg1 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui')
let idctermfg1 = synIDattr(synIDtrans(hlID('String')), 'fg', 'cterm') let idctermfg1 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'cterm')
" Green in darcula " Green in gruvbox
exec 'hi User1 guifg=' . l:idguifg1 . exec 'hi User1 guifg=' . l:idguifg1 .
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg1 if l:idctermfg1
exec 'hi User1 ctermfg=' . l:idctermfg1 exec 'hi User1 ctermfg=' . l:idctermfg1
endif endif
let idguifg2 = synIDattr(synIDtrans(hlID('ErrorMsg')), 'fg', 'gui') let idguifg2 = synIDattr(synIDtrans(hlID('WarningMsg')), 'fg', 'gui')
let idctermfg2 = synIDattr(synIDtrans(hlID('ErrorMsg')), 'fg', 'cterm') let idctermfg2 = synIDattr(synIDtrans(hlID('WarningMsg')), 'fg', 'cterm')
" Red in darcula " Red in gruvbox
exec 'hi User2 guifg=' . l:idguifg2 . exec 'hi User2 guifg=' . l:idguifg2 .
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg2 if l:idctermfg2
exec 'hi User2 ctermfg=' . l:idctermfg2 exec 'hi User2 ctermfg=' . l:idctermfg2
endif endif
let idguifg3 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui') let idguifg3 = synIDattr(synIDtrans(hlID('MoreMsg')), 'fg', 'gui')
let idctermfg3 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'cterm') let idctermfg3 = synIDattr(synIDtrans(hlID('MoreMsg')), 'fg', 'cterm')
" Yellow in darcula " Yellow in gruvbox
exec 'hi User3 guifg=' . l:idguifg3 . exec 'hi User3 guifg=' . l:idguifg3 .
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg3 if l:idctermfg3
exec 'hi User3 ctermfg=' . l:idctermfg3 exec 'hi User3 ctermfg=' . l:idctermfg3
endif endif
let idguifg4 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'gui') let idguifg4 = synIDattr(synIDtrans(hlID('Identifier')), 'fg', 'gui')
let idctermfg4 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'cterm') let idctermfg4 = synIDattr(synIDtrans(hlID('Identifier')), 'fg', 'cterm')
" Blue in darcula " Blue in gruvbox
exec 'hi User4 guifg=' . l:idguifg4 exec 'hi User4 guifg=' . l:idguifg4
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg4 if l:idctermfg4
exec 'hi User4 ctermfg=' . l:idctermfg4 exec 'hi User4 ctermfg=' . l:idctermfg4
endif endif
let idguifg5 = synIDattr(synIDtrans(hlID('Constant')), 'fg', 'gui') let idguifg5 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'gui')
let idctermfg5 = synIDattr(synIDtrans(hlID('Constant')), 'fg', 'cterm') let idctermfg5 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'cterm')
" Purple in darcula " Blue in gruvbox
exec 'hi User5 guifg=' . l:idguifg5 . exec 'hi User5 guifg=' . l:idguifg5 .
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'

View File

@ -3,61 +3,48 @@
" ----------------------------------------------------------------------------- " -----------------------------------------------------------------------------
function s:UpdateColors() function s:UpdateColors()
let ctermbg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'cterm') let ctermbg = synIDattr(synIDtrans(hlID('StatusLine')), 'fg', 'cterm')
let guibg = synIDattr(synIDtrans(hlID('StatusLine')), 'bg', 'gui') let guibg = synIDattr(synIDtrans(hlID('StatusLine')), 'fg', 'gui')
let idguifg1 = synIDattr(synIDtrans(hlID('String')), 'fg', 'gui') let idguifg1 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui')
let idctermfg1 = synIDattr(synIDtrans(hlID('String')), 'fg', 'cterm') let idctermfg1 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'cterm')
" Green in darcula " Green in gruvbox
exec 'hi User1 guifg=' . l:idguifg1 . exec 'hi User1 guifg=' . l:idguifg1 .
\' ctermfg=' . l:idctermfg1 .
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' ctermbg=' . l:ctermbg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg1 let idguifg2 = synIDattr(synIDtrans(hlID('WarningMsg')), 'fg', 'gui')
exec 'hi User1 ctermfg=' . l:idctermfg1 let idctermfg2 = synIDattr(synIDtrans(hlID('WarningMsg')), 'fg', 'cterm')
endif " Red in gruvbox
let idguifg2 = synIDattr(synIDtrans(hlID('ErrorMsg')), 'fg', 'gui')
let idctermfg2 = synIDattr(synIDtrans(hlID('ErrorMsg')), 'fg', 'cterm')
" Red in darcula
exec 'hi User2 guifg=' . l:idguifg2 . exec 'hi User2 guifg=' . l:idguifg2 .
\' ctermfg=' . l:idctermfg2 .
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' ctermbg=' . l:ctermbg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg2 let idguifg3 = synIDattr(synIDtrans(hlID('MoreMsg')), 'fg', 'gui')
exec 'hi User2 ctermfg=' . l:idctermfg2 let idctermfg3 = synIDattr(synIDtrans(hlID('MoreMsg')), 'fg', 'cterm')
endif " Yellow in gruvbox
let idguifg3 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'gui')
let idctermfg3 = synIDattr(synIDtrans(hlID('Function')), 'fg', 'cterm')
" Yellow in darcula
exec 'hi User3 guifg=' . l:idguifg3 . exec 'hi User3 guifg=' . l:idguifg3 .
\' ctermfg=' . l:idctermfg3 .
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' ctermbg=' . l:ctermbg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg3 let idguifg4 = synIDattr(synIDtrans(hlID('Identifier')), 'fg', 'gui')
exec 'hi User3 ctermfg=' . l:idctermfg3 let idctermfg4 = synIDattr(synIDtrans(hlID('Identifier')), 'fg', 'cterm')
endif " Blue in gruvbox
let idguifg4 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'gui') exec 'hi User4 guifg=' . l:idguifg4 .
let idctermfg4 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'cterm') \' ctermfg=' . l:idctermfg4 .
" Blue in darcula
exec 'hi User4 guifg=' . l:idguifg4
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' ctermbg=' . l:ctermbg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg4 let idguifg5 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'gui')
exec 'hi User4 ctermfg=' . l:idctermfg4 let idctermfg5 = synIDattr(synIDtrans(hlID('Number')), 'fg', 'cterm')
endif " Blue in gruvbox
let idguifg5 = synIDattr(synIDtrans(hlID('Constant')), 'fg', 'gui')
let idctermfg5 = synIDattr(synIDtrans(hlID('Constant')), 'fg', 'cterm')
" Purple in darcula
exec 'hi User5 guifg=' . l:idguifg5 . exec 'hi User5 guifg=' . l:idguifg5 .
\' ctermfg=' . l:idctermfg5 .
\' guibg=' . l:guibg . \' guibg=' . l:guibg .
\' ctermbg=' . l:ctermbg .
\' cterm=bold gui=bold' \' cterm=bold gui=bold'
if l:idctermfg5
exec 'hi User5 ctermfg=' . l:idctermfg5
endif
if l:ctermbg
exec 'hi User1 ctermbg=' . l:ctermbg
exec 'hi User2 ctermbg=' . l:ctermbg
exec 'hi User3 ctermbg=' . l:ctermbg
exec 'hi User4 ctermbg=' . l:ctermbg
exec 'hi User5 ctermbg=' . l:ctermbg
endif
endfunction endfunction
augroup statuslineconf augroup statuslineconf
@ -144,7 +131,7 @@ function! s:LinterStatus() abort
let l:all_errors = l:counts.error + l:counts.style_error let l:all_errors = l:counts.error + l:counts.style_error
let l:all_non_errors = l:counts.total - l:all_errors let l:all_non_errors = l:counts.total - l:all_errors
return l:counts.total == 0 ? '%1*OK%*' : printf( return l:counts.total == 0 ? '%1* OK %*' : printf(
\ '%%3*%dW%%* %%2*%dE%%*', \ '%%3*%dW%%* %%2*%dE%%*',
\ all_non_errors, \ all_non_errors,
\ all_errors \ all_errors

View File

@ -45,7 +45,7 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
Plug 'mhinz/vim-grepper' Plug 'mhinz/vim-grepper'
Plug 'direnv/direnv.vim' Plug 'direnv/direnv.vim'
Plug 'doums/darcula' Plug 'flazz/vim-colorschemes'
Plug 'tpope/vim-speeddating' Plug 'tpope/vim-speeddating'
" ----------------------------------------------------------------------------- " -----------------------------------------------------------------------------

View File

@ -43,8 +43,7 @@ set number
set relativenumber set relativenumber
" This has been killing vim until it was resized " This has been killing vim until it was resized
" set lines=50 columns=100 " set lines=50 columns=100
set termguicolors colorscheme gruvbox
colorscheme darcula
set background=dark set background=dark
set guifont=SauceCodePro\ Nerd\ Font:h12 set guifont=SauceCodePro\ Nerd\ Font:h12