Refactor minimalist.vim, preparing for bg=light support

No changes to behavior. This is just refactoring and removing
some bits that don't have any effect.
This commit is contained in:
Tim Smith 2018-06-05 20:40:41 -06:00
parent e5e8071643
commit 40ac2b24f1

View File

@ -1,76 +1,54 @@
" Minimalist Airline - A Material Colorscheme Darker " Minimalist Airline - A Material Color Scheme Darker
" "
" Author: Diki Ananta <diki1aap@gmail.com> " Author: Diki Ananta <diki1aap@gmail.com>
" Repository: https://github.com/dikiaap/minimalist " Repository: https://github.com/dikiaap/minimalist
" Version: 1.4 " Version: 2.0
" License: MIT " License: MIT
" Normal Mode let s:theme = 'minimalist'
let s:N1 = [ '#E4E4E4' , '#3A3A3A' , 254 , 237 ]
let s:N2 = [ '#E4E4E4' , '#4E4E4E' , 254 , 239 ]
let s:N3 = [ '#EEEEEE' , '#262626' , 255 , 235 ]
" Insert Mode function! airline#themes#{s:theme}#refresh()
let s:I1 = [ '#E4E4E4' , '#3A3A3A' , 254 , 237 ] " Normal
let s:I2 = [ '#E4E4E4' , '#4E4E4E' , 254 , 239 ] let N1 = [ '#E4E4E4', '#3A3A3A', 254, 237 ]
let s:I3 = [ '#EEEEEE' , '#262626' , 255 , 235 ] let N2 = [ '#E4E4E4', '#4E4E4E', 254, 239 ]
let N3 = [ '#EEEEEE', '#262626', 255, 235 ]
" Visual Mode " Inactive
let s:V1 = [ '#E4E4E4' , '#3A3A3A' , 254 , 237 ] let IA = [ '#666666', N3[1], 242, N3[3] ]
let s:V2 = [ '#E4E4E4' , '#4E4E4E' , 254 , 239 ]
let s:V3 = [ '#EEEEEE' , '#262626' , 255 , 235 ]
" Replace Mode " Error
let s:R1 = [ '#E4E4E4' , '#3A3A3A' , 254 , 237 ] let ER = [ '#1C1C1C', '#D75F5F', 234, 167 ]
let s:R2 = [ '#E4E4E4' , '#4E4E4E' , 254 , 239 ]
let s:R3 = [ '#EEEEEE' , '#262626' , 255 , 235 ]
" Inactive Mode " Warning
let s:IA = [ '#666666' , '#262626' , 242 , 235 , '' ] let WI = [ ER[0], '#FFAF5F', ER[2], 215 ]
let g:airline#themes#minimalist#palette = {} " Terminal
let g:airline#themes#minimalist#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) let TE = [ ER[0], N1[1], N1[2], N1[3] ]
let g:airline#themes#minimalist#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
let g:airline#themes#minimalist#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
let g:airline#themes#minimalist#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
let g:airline#themes#minimalist#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
" Warning Mode " Reverse
let s:WI = [ '#1C1C1C' , '#FFAF5F' , 234 , 215 , '' ] let NR = [ N2[1], N2[0], N2[3], N2[2], 'bold' ]
let g:airline#themes#minimalist#palette.normal.airline_warning = [
\ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
\ ]
let g:airline#themes#minimalist#palette.insert.airline_warning = g:airline#themes#minimalist#palette.normal.airline_warning
let g:airline#themes#minimalist#palette.visual.airline_warning = g:airline#themes#minimalist#palette.normal.airline_warning
let g:airline#themes#minimalist#palette.replace.airline_warning = g:airline#themes#minimalist#palette.normal.airline_warning
" Error Mode
let s:ER = [ '#1C1C1C' , '#D75F5F' , 234 , 167 , '' ]
let g:airline#themes#minimalist#palette.normal.airline_error = [
\ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
\ ]
let g:airline#themes#minimalist#palette.insert.airline_error = g:airline#themes#minimalist#palette.normal.airline_error
let g:airline#themes#minimalist#palette.visual.airline_error = g:airline#themes#minimalist#palette.normal.airline_error
let g:airline#themes#minimalist#palette.replace.airline_error = g:airline#themes#minimalist#palette.normal.airline_error
" Terminal let palette = {}
let s:TE = [ '#1C1C1C' , '#3A3A3A' , 254 , 237 , '' ]
let g:airline#themes#minimalist#palette.normal.airline_term = [
\ s:TE[0], s:TE[1], s:TE[2], s:TE[3]
\ ]
let g:airline#themes#minimalist#palette.insert.airline_term = g:airline#themes#minimalist#palette.normal.airline_term
let g:airline#themes#minimalist#palette.visual.airline_term = g:airline#themes#minimalist#palette.normal.airline_term
let g:airline#themes#minimalist#palette.replace.airline_term = g:airline#themes#minimalist#palette.normal.airline_term
" Accents let palette.normal = airline#themes#generate_color_map(N1, N2, N3)
let g:airline#themes#minimalist#palette.accents = { let palette.normal.airline_error = ER
\ 'red': [ '#D75F5F' , '' , 167 , '' ] let palette.normal.airline_warning = WI
\ } let palette.normal.airline_term = TE
" CtrlP let palette.inactive = airline#themes#generate_color_map(IA, IA, IA)
if get(g:, 'loaded_ctrlp', 0)
let g:airline#themes#minimalist#palette.ctrlp = airline#extensions#ctrlp#generate_color_map( " Accents
\ [ '#E4E4E4' , '#262626' , 254 , 235 , '' ], let palette.accents = {
\ [ '#E4E4E4' , '#4E4E4E' , 254 , 239 , '' ], \ 'red': [ ER[1], '', ER[3], '' ]
\ [ '#585858' , '#E4E4E4' , 240 , 254 , 'bold' ]) \ }
endif
" CtrlP
if get(g:, 'loaded_ctrlp', 0)
let palette.ctrlp = airline#extensions#ctrlp#generate_color_map(N3, N2, NR)
endif
let g:airline#themes#{s:theme}#palette = palette
endfunction
call airline#themes#{s:theme}#refresh()