diff options
Diffstat (limited to 'colors')
124 files changed, 3864 insertions, 132 deletions
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim index ed1a3c4..bd10fdb 100644 --- a/colors/base16-3024.vim +++ b/colors/base16-3024.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-3024" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim index 8622d37..a1772e5 100644 --- a/colors/base16-apathy.vim +++ b/colors/base16-apathy.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-apathy" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim index 20beab8..ee7c332 100644 --- a/colors/base16-ashes.vim +++ b/colors/base16-ashes.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-ashes" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim index 7ac6bac..21caf87 100644 --- a/colors/base16-atelier-cave-light.vim +++ b/colors/base16-atelier-cave-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-cave-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim index b69e3c0..8f60a8d 100644 --- a/colors/base16-atelier-cave.vim +++ b/colors/base16-atelier-cave.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-cave" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim index d21150a..d6fe852 100644 --- a/colors/base16-atelier-dune-light.vim +++ b/colors/base16-atelier-dune-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-dune-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim index b0c71f7..9c7db5e 100644 --- a/colors/base16-atelier-dune.vim +++ b/colors/base16-atelier-dune.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-dune" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim index 0ecbfb8..c226136 100644 --- a/colors/base16-atelier-estuary-light.vim +++ b/colors/base16-atelier-estuary-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-estuary-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim index 43f65f0..45c88ef 100644 --- a/colors/base16-atelier-estuary.vim +++ b/colors/base16-atelier-estuary.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-estuary" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim index 0615f59..41ee30f 100644 --- a/colors/base16-atelier-forest-light.vim +++ b/colors/base16-atelier-forest-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-forest-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim index 8857182..02f2f03 100644 --- a/colors/base16-atelier-forest.vim +++ b/colors/base16-atelier-forest.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-forest" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim index 21f5a3a..478a7a3 100644 --- a/colors/base16-atelier-heath-light.vim +++ b/colors/base16-atelier-heath-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-heath-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim index 408aeae..09c466c 100644 --- a/colors/base16-atelier-heath.vim +++ b/colors/base16-atelier-heath.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-heath" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim index 9629c3f..055138d 100644 --- a/colors/base16-atelier-lakeside-light.vim +++ b/colors/base16-atelier-lakeside-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-lakeside-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim index 2d2371a..1097ada 100644 --- a/colors/base16-atelier-lakeside.vim +++ b/colors/base16-atelier-lakeside.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-lakeside" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim index eb15557..60a0ab1 100644 --- a/colors/base16-atelier-plateau-light.vim +++ b/colors/base16-atelier-plateau-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-plateau-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim index cef26b7..6df7a37 100644 --- a/colors/base16-atelier-plateau.vim +++ b/colors/base16-atelier-plateau.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-plateau" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim index cf831f8..ec3a658 100644 --- a/colors/base16-atelier-savanna-light.vim +++ b/colors/base16-atelier-savanna-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-savanna-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim index 49c850a..4adc3ae 100644 --- a/colors/base16-atelier-savanna.vim +++ b/colors/base16-atelier-savanna.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-savanna" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim index 5fd1fdb..268e5b1 100644 --- a/colors/base16-atelier-seaside-light.vim +++ b/colors/base16-atelier-seaside-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-seaside-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim index 716a485..2cfb091 100644 --- a/colors/base16-atelier-seaside.vim +++ b/colors/base16-atelier-seaside.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-seaside" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim index 7a2eb59..60dee50 100644 --- a/colors/base16-atelier-sulphurpool-light.vim +++ b/colors/base16-atelier-sulphurpool-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-sulphurpool-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim index 781851b..f5463b8 100644 --- a/colors/base16-atelier-sulphurpool.vim +++ b/colors/base16-atelier-sulphurpool.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-atelier-sulphurpool" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-atlas.vim b/colors/base16-atlas.vim new file mode 100644 index 0000000..3639a23 --- /dev/null +++ b/colors/base16-atlas.vim @@ -0,0 +1,394 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Atlas scheme by Alex Lende (https://ajlende.com) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-atlas.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "002635" +let g:base16_gui00 = "002635" +let s:gui01 = "00384d" +let g:base16_gui01 = "00384d" +let s:gui02 = "517F8D" +let g:base16_gui02 = "517F8D" +let s:gui03 = "6C8B91" +let g:base16_gui03 = "6C8B91" +let s:gui04 = "869696" +let g:base16_gui04 = "869696" +let s:gui05 = "a1a19a" +let g:base16_gui05 = "a1a19a" +let s:gui06 = "e6e6dc" +let g:base16_gui06 = "e6e6dc" +let s:gui07 = "fafaf8" +let g:base16_gui07 = "fafaf8" +let s:gui08 = "ff5a67" +let g:base16_gui08 = "ff5a67" +let s:gui09 = "f08e48" +let g:base16_gui09 = "f08e48" +let s:gui0A = "ffcc1b" +let g:base16_gui0A = "ffcc1b" +let s:gui0B = "7fc06e" +let g:base16_gui0B = "7fc06e" +let s:gui0C = "14747e" +let g:base16_gui0C = "14747e" +let s:gui0D = "5dd7b9" +let g:base16_gui0D = "5dd7b9" +let s:gui0E = "9a70a4" +let g:base16_gui0E = "9a70a4" +let s:gui0F = "c43060" +let g:base16_gui0F = "c43060" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#002635" + let g:terminal_color_1 = "#ff5a67" + let g:terminal_color_2 = "#7fc06e" + let g:terminal_color_3 = "#ffcc1b" + let g:terminal_color_4 = "#5dd7b9" + let g:terminal_color_5 = "#9a70a4" + let g:terminal_color_6 = "#14747e" + let g:terminal_color_7 = "#a1a19a" + let g:terminal_color_8 = "#6C8B91" + let g:terminal_color_9 = "#ff5a67" + let g:terminal_color_10 = "#7fc06e" + let g:terminal_color_11 = "#ffcc1b" + let g:terminal_color_12 = "#5dd7b9" + let g:terminal_color_13 = "#9a70a4" + let g:terminal_color_14 = "#14747e" + let g:terminal_color_15 = "#fafaf8" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-atlas" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim index 2a860d5..7425bbf 100644 --- a/colors/base16-bespin.vim +++ b/colors/base16-bespin.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-bespin" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-bathory.vim b/colors/base16-black-metal-bathory.vim index 0734c5a..5b897af 100644 --- a/colors/base16-black-metal-bathory.vim +++ b/colors/base16-black-metal-bathory.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-bathory" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-burzum.vim b/colors/base16-black-metal-burzum.vim index 888205d..0650827 100644 --- a/colors/base16-black-metal-burzum.vim +++ b/colors/base16-black-metal-burzum.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-burzum" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-dark-funeral.vim b/colors/base16-black-metal-dark-funeral.vim index c3d8fff..684ea9a 100644 --- a/colors/base16-black-metal-dark-funeral.vim +++ b/colors/base16-black-metal-dark-funeral.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-dark-funeral" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-gorgoroth.vim b/colors/base16-black-metal-gorgoroth.vim index e90c200..8408379 100644 --- a/colors/base16-black-metal-gorgoroth.vim +++ b/colors/base16-black-metal-gorgoroth.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-gorgoroth" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-immortal.vim b/colors/base16-black-metal-immortal.vim index ef425df..9d39e35 100644 --- a/colors/base16-black-metal-immortal.vim +++ b/colors/base16-black-metal-immortal.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-immortal" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-khold.vim b/colors/base16-black-metal-khold.vim index 23f4937..4a31902 100644 --- a/colors/base16-black-metal-khold.vim +++ b/colors/base16-black-metal-khold.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-khold" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-marduk.vim b/colors/base16-black-metal-marduk.vim index 3c73cd2..09f1533 100644 --- a/colors/base16-black-metal-marduk.vim +++ b/colors/base16-black-metal-marduk.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-marduk" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-mayhem.vim b/colors/base16-black-metal-mayhem.vim index 6adc923..4578be4 100644 --- a/colors/base16-black-metal-mayhem.vim +++ b/colors/base16-black-metal-mayhem.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-mayhem" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-nile.vim b/colors/base16-black-metal-nile.vim index 4c8c3ee..fcd2b5b 100644 --- a/colors/base16-black-metal-nile.vim +++ b/colors/base16-black-metal-nile.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-nile" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal-venom.vim b/colors/base16-black-metal-venom.vim index 201d927..2c75a00 100644 --- a/colors/base16-black-metal-venom.vim +++ b/colors/base16-black-metal-venom.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal-venom" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-black-metal.vim b/colors/base16-black-metal.vim index 7428490..9fc51ed 100644 --- a/colors/base16-black-metal.vim +++ b/colors/base16-black-metal.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-black-metal" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim index e557474..b4942cb 100644 --- a/colors/base16-brewer.vim +++ b/colors/base16-brewer.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-brewer" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim index 3811ee1..96b511f 100644 --- a/colors/base16-bright.vim +++ b/colors/base16-bright.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-bright" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-brogrammer.vim b/colors/base16-brogrammer.vim index 58f933c..7a0feb8 100644 --- a/colors/base16-brogrammer.vim +++ b/colors/base16-brogrammer.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-brogrammer" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim index 6a40e4f..409bf53 100644 --- a/colors/base16-brushtrees-dark.vim +++ b/colors/base16-brushtrees-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-brushtrees-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim index a850605..036fef6 100644 --- a/colors/base16-brushtrees.vim +++ b/colors/base16-brushtrees.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-brushtrees" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim index 237e595..cd33fea 100644 --- a/colors/base16-chalk.vim +++ b/colors/base16-chalk.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-chalk" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim index 2aed045..c20b268 100644 --- a/colors/base16-circus.vim +++ b/colors/base16-circus.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-circus" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim index ed7e71d..499de38 100644 --- a/colors/base16-classic-dark.vim +++ b/colors/base16-classic-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-classic-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim index 52687ac..781aec6 100644 --- a/colors/base16-classic-light.vim +++ b/colors/base16-classic-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-classic-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim index c1a3bf8..53b8623 100644 --- a/colors/base16-codeschool.vim +++ b/colors/base16-codeschool.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-codeschool" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim index 4ff2951..94d7dcd 100644 --- a/colors/base16-cupcake.vim +++ b/colors/base16-cupcake.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-cupcake" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim index 038e6a6..35028a0 100644 --- a/colors/base16-cupertino.vim +++ b/colors/base16-cupertino.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-cupertino" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim index 83120cb..fba14c8 100644 --- a/colors/base16-darktooth.vim +++ b/colors/base16-darktooth.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-darktooth" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim index 0db8027..10e4d7c 100644 --- a/colors/base16-default-dark.vim +++ b/colors/base16-default-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-default-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim index 2358a5f..fd9f168 100644 --- a/colors/base16-default-light.vim +++ b/colors/base16-default-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-default-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim index fc394a6..b469194 100644 --- a/colors/base16-dracula.vim +++ b/colors/base16-dracula.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-dracula" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim index 35ebd12..0a8054c 100644 --- a/colors/base16-eighties.vim +++ b/colors/base16-eighties.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-eighties" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim index 6c641e6..7433e8f 100644 --- a/colors/base16-embers.vim +++ b/colors/base16-embers.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-embers" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim index 8b19c4f..aa052f2 100644 --- a/colors/base16-flat.vim +++ b/colors/base16-flat.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-flat" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-fruit-soda.vim b/colors/base16-fruit-soda.vim new file mode 100644 index 0000000..e944063 --- /dev/null +++ b/colors/base16-fruit-soda.vim @@ -0,0 +1,394 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Fruit Soda scheme by jozip + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-fruit-soda.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "f1ecf1" +let g:base16_gui00 = "f1ecf1" +let s:gui01 = "e0dee0" +let g:base16_gui01 = "e0dee0" +let s:gui02 = "d8d5d5" +let g:base16_gui02 = "d8d5d5" +let s:gui03 = "b5b4b6" +let g:base16_gui03 = "b5b4b6" +let s:gui04 = "979598" +let g:base16_gui04 = "979598" +let s:gui05 = "515151" +let g:base16_gui05 = "515151" +let s:gui06 = "474545" +let g:base16_gui06 = "474545" +let s:gui07 = "2d2c2c" +let g:base16_gui07 = "2d2c2c" +let s:gui08 = "fe3e31" +let g:base16_gui08 = "fe3e31" +let s:gui09 = "fe6d08" +let g:base16_gui09 = "fe6d08" +let s:gui0A = "f7e203" +let g:base16_gui0A = "f7e203" +let s:gui0B = "47f74c" +let g:base16_gui0B = "47f74c" +let s:gui0C = "0f9cfd" +let g:base16_gui0C = "0f9cfd" +let s:gui0D = "2931df" +let g:base16_gui0D = "2931df" +let s:gui0E = "611fce" +let g:base16_gui0E = "611fce" +let s:gui0F = "b16f40" +let g:base16_gui0F = "b16f40" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#f1ecf1" + let g:terminal_color_1 = "#fe3e31" + let g:terminal_color_2 = "#47f74c" + let g:terminal_color_3 = "#f7e203" + let g:terminal_color_4 = "#2931df" + let g:terminal_color_5 = "#611fce" + let g:terminal_color_6 = "#0f9cfd" + let g:terminal_color_7 = "#515151" + let g:terminal_color_8 = "#b5b4b6" + let g:terminal_color_9 = "#fe3e31" + let g:terminal_color_10 = "#47f74c" + let g:terminal_color_11 = "#f7e203" + let g:terminal_color_12 = "#2931df" + let g:terminal_color_13 = "#611fce" + let g:terminal_color_14 = "#0f9cfd" + let g:terminal_color_15 = "#2d2c2c" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-fruit-soda" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-github.vim b/colors/base16-github.vim index 57ede19..0caf0e8 100644 --- a/colors/base16-github.vim +++ b/colors/base16-github.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-github" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim index 3442abe..315304d 100644 --- a/colors/base16-google-dark.vim +++ b/colors/base16-google-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-google-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim index 4089c0d..0db63af 100644 --- a/colors/base16-google-light.vim +++ b/colors/base16-google-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-google-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim index ab85b92..8268f94 100644 --- a/colors/base16-grayscale-dark.vim +++ b/colors/base16-grayscale-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-grayscale-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim index 7efdd62..53b7047 100644 --- a/colors/base16-grayscale-light.vim +++ b/colors/base16-grayscale-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-grayscale-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim index 26b766f..ddfc7e9 100644 --- a/colors/base16-greenscreen.vim +++ b/colors/base16-greenscreen.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-greenscreen" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim index 7c5be7a..dbab6d5 100644 --- a/colors/base16-gruvbox-dark-hard.vim +++ b/colors/base16-gruvbox-dark-hard.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-gruvbox-dark-hard" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim index 8fe7f61..dc1404d 100644 --- a/colors/base16-gruvbox-dark-medium.vim +++ b/colors/base16-gruvbox-dark-medium.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-gruvbox-dark-medium" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim index 9448fcc..c0b27ae 100644 --- a/colors/base16-gruvbox-dark-pale.vim +++ b/colors/base16-gruvbox-dark-pale.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-gruvbox-dark-pale" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim index 6a5be4a..f6dd3ed 100644 --- a/colors/base16-gruvbox-dark-soft.vim +++ b/colors/base16-gruvbox-dark-soft.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-gruvbox-dark-soft" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim index d3dd0a4..be821cd 100644 --- a/colors/base16-gruvbox-light-hard.vim +++ b/colors/base16-gruvbox-light-hard.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-gruvbox-light-hard" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim index 18d96cf..47d77e6 100644 --- a/colors/base16-gruvbox-light-medium.vim +++ b/colors/base16-gruvbox-light-medium.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-gruvbox-light-medium" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim index d26a062..3648188 100644 --- a/colors/base16-gruvbox-light-soft.vim +++ b/colors/base16-gruvbox-light-soft.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-gruvbox-light-soft" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim index 61d021c..d4ca8bd 100644 --- a/colors/base16-harmonic-dark.vim +++ b/colors/base16-harmonic-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-harmonic-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim index 3081e61..3548c5b 100644 --- a/colors/base16-harmonic-light.vim +++ b/colors/base16-harmonic-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-harmonic-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-heetch-light.vim b/colors/base16-heetch-light.vim new file mode 100644 index 0000000..1377b93 --- /dev/null +++ b/colors/base16-heetch-light.vim @@ -0,0 +1,394 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Heetch Light scheme by Geoffrey Teale (tealeg@gmail.com) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-heetch-light.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "feffff" +let g:base16_gui00 = "feffff" +let s:gui01 = "392551" +let g:base16_gui01 = "392551" +let s:gui02 = "7b6d8b" +let g:base16_gui02 = "7b6d8b" +let s:gui03 = "9c92a8" +let g:base16_gui03 = "9c92a8" +let s:gui04 = "ddd6e5" +let g:base16_gui04 = "ddd6e5" +let s:gui05 = "5a496e" +let g:base16_gui05 = "5a496e" +let s:gui06 = "470546" +let g:base16_gui06 = "470546" +let s:gui07 = "190134" +let g:base16_gui07 = "190134" +let s:gui08 = "27d9d5" +let g:base16_gui08 = "27d9d5" +let s:gui09 = "bdb6c5" +let g:base16_gui09 = "bdb6c5" +let s:gui0A = "5ba2b6" +let g:base16_gui0A = "5ba2b6" +let s:gui0B = "f80059" +let g:base16_gui0B = "f80059" +let s:gui0C = "c33678" +let g:base16_gui0C = "c33678" +let s:gui0D = "47f9f5" +let g:base16_gui0D = "47f9f5" +let s:gui0E = "bd0152" +let g:base16_gui0E = "bd0152" +let s:gui0F = "dedae2" +let g:base16_gui0F = "dedae2" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#feffff" + let g:terminal_color_1 = "#27d9d5" + let g:terminal_color_2 = "#f80059" + let g:terminal_color_3 = "#5ba2b6" + let g:terminal_color_4 = "#47f9f5" + let g:terminal_color_5 = "#bd0152" + let g:terminal_color_6 = "#c33678" + let g:terminal_color_7 = "#5a496e" + let g:terminal_color_8 = "#9c92a8" + let g:terminal_color_9 = "#27d9d5" + let g:terminal_color_10 = "#f80059" + let g:terminal_color_11 = "#5ba2b6" + let g:terminal_color_12 = "#47f9f5" + let g:terminal_color_13 = "#bd0152" + let g:terminal_color_14 = "#c33678" + let g:terminal_color_15 = "#190134" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-heetch-light" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-heetch.vim b/colors/base16-heetch.vim new file mode 100644 index 0000000..2fc8f5e --- /dev/null +++ b/colors/base16-heetch.vim @@ -0,0 +1,394 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Heetch Dark scheme by Geoffrey Teale (tealeg@gmail.com) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-heetch.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "190134" +let g:base16_gui00 = "190134" +let s:gui01 = "392551" +let g:base16_gui01 = "392551" +let s:gui02 = "5A496E" +let g:base16_gui02 = "5A496E" +let s:gui03 = "7B6D8B" +let g:base16_gui03 = "7B6D8B" +let s:gui04 = "9C92A8" +let g:base16_gui04 = "9C92A8" +let s:gui05 = "BDB6C5" +let g:base16_gui05 = "BDB6C5" +let s:gui06 = "DEDAE2" +let g:base16_gui06 = "DEDAE2" +let s:gui07 = "FEFFFF" +let g:base16_gui07 = "FEFFFF" +let s:gui08 = "27D9D5" +let g:base16_gui08 = "27D9D5" +let s:gui09 = "5BA2B6" +let g:base16_gui09 = "5BA2B6" +let s:gui0A = "8F6C97" +let g:base16_gui0A = "8F6C97" +let s:gui0B = "C33678" +let g:base16_gui0B = "C33678" +let s:gui0C = "F80059" +let g:base16_gui0C = "F80059" +let s:gui0D = "BD0152" +let g:base16_gui0D = "BD0152" +let s:gui0E = "82034C" +let g:base16_gui0E = "82034C" +let s:gui0F = "470546" +let g:base16_gui0F = "470546" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#190134" + let g:terminal_color_1 = "#27D9D5" + let g:terminal_color_2 = "#C33678" + let g:terminal_color_3 = "#8F6C97" + let g:terminal_color_4 = "#BD0152" + let g:terminal_color_5 = "#82034C" + let g:terminal_color_6 = "#F80059" + let g:terminal_color_7 = "#BDB6C5" + let g:terminal_color_8 = "#7B6D8B" + let g:terminal_color_9 = "#27D9D5" + let g:terminal_color_10 = "#C33678" + let g:terminal_color_11 = "#8F6C97" + let g:terminal_color_12 = "#BD0152" + let g:terminal_color_13 = "#82034C" + let g:terminal_color_14 = "#F80059" + let g:terminal_color_15 = "#FEFFFF" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-heetch" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim index 3a77d88..b0ac094 100644 --- a/colors/base16-hopscotch.vim +++ b/colors/base16-hopscotch.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-hopscotch" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-ia-dark.vim b/colors/base16-ia-dark.vim new file mode 100644 index 0000000..7fa7e9d --- /dev/null +++ b/colors/base16-ia-dark.vim @@ -0,0 +1,394 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" iA Dark scheme by iA Inc. (modified by aramisgithub) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-ia-dark.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "1a1a1a" +let g:base16_gui00 = "1a1a1a" +let s:gui01 = "222222" +let g:base16_gui01 = "222222" +let s:gui02 = "1d414d" +let g:base16_gui02 = "1d414d" +let s:gui03 = "767676" +let g:base16_gui03 = "767676" +let s:gui04 = "b8b8b8" +let g:base16_gui04 = "b8b8b8" +let s:gui05 = "cccccc" +let g:base16_gui05 = "cccccc" +let s:gui06 = "e8e8e8" +let g:base16_gui06 = "e8e8e8" +let s:gui07 = "f8f8f8" +let g:base16_gui07 = "f8f8f8" +let s:gui08 = "d88568" +let g:base16_gui08 = "d88568" +let s:gui09 = "d86868" +let g:base16_gui09 = "d86868" +let s:gui0A = "b99353" +let g:base16_gui0A = "b99353" +let s:gui0B = "83a471" +let g:base16_gui0B = "83a471" +let s:gui0C = "7c9cae" +let g:base16_gui0C = "7c9cae" +let s:gui0D = "8eccdd" +let g:base16_gui0D = "8eccdd" +let s:gui0E = "b98eb2" +let g:base16_gui0E = "b98eb2" +let s:gui0F = "8b6c37" +let g:base16_gui0F = "8b6c37" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#1a1a1a" + let g:terminal_color_1 = "#d88568" + let g:terminal_color_2 = "#83a471" + let g:terminal_color_3 = "#b99353" + let g:terminal_color_4 = "#8eccdd" + let g:terminal_color_5 = "#b98eb2" + let g:terminal_color_6 = "#7c9cae" + let g:terminal_color_7 = "#cccccc" + let g:terminal_color_8 = "#767676" + let g:terminal_color_9 = "#d88568" + let g:terminal_color_10 = "#83a471" + let g:terminal_color_11 = "#b99353" + let g:terminal_color_12 = "#8eccdd" + let g:terminal_color_13 = "#b98eb2" + let g:terminal_color_14 = "#7c9cae" + let g:terminal_color_15 = "#f8f8f8" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-ia-dark" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-ia-light.vim b/colors/base16-ia-light.vim new file mode 100644 index 0000000..70d1171 --- /dev/null +++ b/colors/base16-ia-light.vim @@ -0,0 +1,394 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" iA Light scheme by iA Inc. (modified by aramisgithub) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-ia-light.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "f6f6f6" +let g:base16_gui00 = "f6f6f6" +let s:gui01 = "dedede" +let g:base16_gui01 = "dedede" +let s:gui02 = "bde5f2" +let g:base16_gui02 = "bde5f2" +let s:gui03 = "898989" +let g:base16_gui03 = "898989" +let s:gui04 = "767676" +let g:base16_gui04 = "767676" +let s:gui05 = "181818" +let g:base16_gui05 = "181818" +let s:gui06 = "e8e8e8" +let g:base16_gui06 = "e8e8e8" +let s:gui07 = "f8f8f8" +let g:base16_gui07 = "f8f8f8" +let s:gui08 = "9c5a02" +let g:base16_gui08 = "9c5a02" +let s:gui09 = "c43e18" +let g:base16_gui09 = "c43e18" +let s:gui0A = "c48218" +let g:base16_gui0A = "c48218" +let s:gui0B = "38781c" +let g:base16_gui0B = "38781c" +let s:gui0C = "2d6bb1" +let g:base16_gui0C = "2d6bb1" +let s:gui0D = "48bac2" +let g:base16_gui0D = "48bac2" +let s:gui0E = "a94598" +let g:base16_gui0E = "a94598" +let s:gui0F = "8b6c37" +let g:base16_gui0F = "8b6c37" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#f6f6f6" + let g:terminal_color_1 = "#9c5a02" + let g:terminal_color_2 = "#38781c" + let g:terminal_color_3 = "#c48218" + let g:terminal_color_4 = "#48bac2" + let g:terminal_color_5 = "#a94598" + let g:terminal_color_6 = "#2d6bb1" + let g:terminal_color_7 = "#181818" + let g:terminal_color_8 = "#898989" + let g:terminal_color_9 = "#9c5a02" + let g:terminal_color_10 = "#38781c" + let g:terminal_color_11 = "#c48218" + let g:terminal_color_12 = "#48bac2" + let g:terminal_color_13 = "#a94598" + let g:terminal_color_14 = "#2d6bb1" + let g:terminal_color_15 = "#f8f8f8" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-ia-light" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim index 38be18b..8dc21cc 100644 --- a/colors/base16-icy.vim +++ b/colors/base16-icy.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-icy" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim index baa31c9..5da8f86 100644 --- a/colors/base16-irblack.vim +++ b/colors/base16-irblack.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-irblack" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim index 7d68747..857e3bc 100644 --- a/colors/base16-isotope.vim +++ b/colors/base16-isotope.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-isotope" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim index fa8314d..3891d59 100644 --- a/colors/base16-macintosh.vim +++ b/colors/base16-macintosh.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-macintosh" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim index 09711af..9e4b783 100644 --- a/colors/base16-marrakesh.vim +++ b/colors/base16-marrakesh.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-marrakesh" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim index 4a26f01..2afa577 100644 --- a/colors/base16-materia.vim +++ b/colors/base16-materia.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-materia" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim index d16a748..d50e5f4 100644 --- a/colors/base16-material-darker.vim +++ b/colors/base16-material-darker.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-material-darker" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim index a262432..57755be 100644 --- a/colors/base16-material-lighter.vim +++ b/colors/base16-material-lighter.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-material-lighter" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim index 11fb15f..669d823 100644 --- a/colors/base16-material-palenight.vim +++ b/colors/base16-material-palenight.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-material-palenight" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-material-vivid.vim b/colors/base16-material-vivid.vim index 0d7825e..d499e51 100644 --- a/colors/base16-material-vivid.vim +++ b/colors/base16-material-vivid.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-material-vivid" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-material.vim b/colors/base16-material.vim index 462b77b..1a3af61 100644 --- a/colors/base16-material.vim +++ b/colors/base16-material.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-material" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim index 0a8408a..109a8d5 100644 --- a/colors/base16-mellow-purple.vim +++ b/colors/base16-mellow-purple.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-mellow-purple" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim index 87278b8..cc7181b 100644 --- a/colors/base16-mexico-light.vim +++ b/colors/base16-mexico-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-mexico-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim index 008b9a9..b2be3a2 100644 --- a/colors/base16-mocha.vim +++ b/colors/base16-mocha.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-mocha" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim index a5861c3..7781d0d 100644 --- a/colors/base16-monokai.vim +++ b/colors/base16-monokai.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-monokai" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim index 90ffd8d..de96723 100644 --- a/colors/base16-nord.vim +++ b/colors/base16-nord.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-nord" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim index 5ed3127..2af8b3f 100644 --- a/colors/base16-ocean.vim +++ b/colors/base16-ocean.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-ocean" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim index 57a18e9..f3ee18e 100644 --- a/colors/base16-oceanicnext.vim +++ b/colors/base16-oceanicnext.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-oceanicnext" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim index 9d47319..3de0c11 100644 --- a/colors/base16-one-light.vim +++ b/colors/base16-one-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-one-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim index 1bc2736..59cf9dd 100644 --- a/colors/base16-onedark.vim +++ b/colors/base16-onedark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-onedark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-outrun-dark.vim b/colors/base16-outrun-dark.vim index f114822..0c3bb3d 100644 --- a/colors/base16-outrun-dark.vim +++ b/colors/base16-outrun-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-outrun-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-papercolor-dark.vim b/colors/base16-papercolor-dark.vim new file mode 100644 index 0000000..e6a354c --- /dev/null +++ b/colors/base16-papercolor-dark.vim @@ -0,0 +1,394 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" PaperColor Dark scheme by Jon Leopard (http://github.com/jonleopard) based on PaperColor Theme (https://github.com/NLKNguyen/papercolor-theme) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-papercolor-dark.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "1c1c1c" +let g:base16_gui00 = "1c1c1c" +let s:gui01 = "af005f" +let g:base16_gui01 = "af005f" +let s:gui02 = "5faf00" +let g:base16_gui02 = "5faf00" +let s:gui03 = "d7af5f" +let g:base16_gui03 = "d7af5f" +let s:gui04 = "5fafd7" +let g:base16_gui04 = "5fafd7" +let s:gui05 = "808080" +let g:base16_gui05 = "808080" +let s:gui06 = "d7875f" +let g:base16_gui06 = "d7875f" +let s:gui07 = "d0d0d0" +let g:base16_gui07 = "d0d0d0" +let s:gui08 = "585858" +let g:base16_gui08 = "585858" +let s:gui09 = "5faf5f" +let g:base16_gui09 = "5faf5f" +let s:gui0A = "afd700" +let g:base16_gui0A = "afd700" +let s:gui0B = "af87d7" +let g:base16_gui0B = "af87d7" +let s:gui0C = "ffaf00" +let g:base16_gui0C = "ffaf00" +let s:gui0D = "ff5faf" +let g:base16_gui0D = "ff5faf" +let s:gui0E = "00afaf" +let g:base16_gui0E = "00afaf" +let s:gui0F = "5f8787" +let g:base16_gui0F = "5f8787" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#1c1c1c" + let g:terminal_color_1 = "#585858" + let g:terminal_color_2 = "#af87d7" + let g:terminal_color_3 = "#afd700" + let g:terminal_color_4 = "#ff5faf" + let g:terminal_color_5 = "#00afaf" + let g:terminal_color_6 = "#ffaf00" + let g:terminal_color_7 = "#808080" + let g:terminal_color_8 = "#d7af5f" + let g:terminal_color_9 = "#585858" + let g:terminal_color_10 = "#af87d7" + let g:terminal_color_11 = "#afd700" + let g:terminal_color_12 = "#ff5faf" + let g:terminal_color_13 = "#00afaf" + let g:terminal_color_14 = "#ffaf00" + let g:terminal_color_15 = "#d0d0d0" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-papercolor-dark" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-papercolor-light.vim b/colors/base16-papercolor-light.vim new file mode 100644 index 0000000..55a8702 --- /dev/null +++ b/colors/base16-papercolor-light.vim @@ -0,0 +1,394 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" PaperColor Light scheme by Jon Leopard (http://github.com/jonleopard) based on PaperColor Theme (https://github.com/NLKNguyen/papercolor-theme) + +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui_running') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-papercolor-light.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "eeeeee" +let g:base16_gui00 = "eeeeee" +let s:gui01 = "af0000" +let g:base16_gui01 = "af0000" +let s:gui02 = "008700" +let g:base16_gui02 = "008700" +let s:gui03 = "5f8700" +let g:base16_gui03 = "5f8700" +let s:gui04 = "0087af" +let g:base16_gui04 = "0087af" +let s:gui05 = "878787" +let g:base16_gui05 = "878787" +let s:gui06 = "005f87" +let g:base16_gui06 = "005f87" +let s:gui07 = "444444" +let g:base16_gui07 = "444444" +let s:gui08 = "bcbcbc" +let g:base16_gui08 = "bcbcbc" +let s:gui09 = "d70000" +let g:base16_gui09 = "d70000" +let s:gui0A = "d70087" +let g:base16_gui0A = "d70087" +let s:gui0B = "8700af" +let g:base16_gui0B = "8700af" +let s:gui0C = "d75f00" +let g:base16_gui0C = "d75f00" +let s:gui0D = "d75f00" +let g:base16_gui0D = "d75f00" +let s:gui0E = "005faf" +let g:base16_gui0E = "005faf" +let s:gui0F = "005f87" +let g:base16_gui0F = "005f87" + +" Terminal color definitions +let s:cterm00 = "00" +let g:base16_cterm00 = "00" +let s:cterm03 = "08" +let g:base16_cterm03 = "08" +let s:cterm05 = "07" +let g:base16_cterm05 = "07" +let s:cterm07 = "15" +let g:base16_cterm07 = "15" +let s:cterm08 = "01" +let g:base16_cterm08 = "01" +let s:cterm0A = "03" +let g:base16_cterm0A = "03" +let s:cterm0B = "02" +let g:base16_cterm0B = "02" +let s:cterm0C = "06" +let g:base16_cterm0C = "06" +let s:cterm0D = "04" +let g:base16_cterm0D = "04" +let s:cterm0E = "05" +let g:base16_cterm0E = "05" +if exists('base16colorspace') && base16colorspace == "256" + let s:cterm01 = "18" + let g:base16_cterm01 = "18" + let s:cterm02 = "19" + let g:base16_cterm02 = "19" + let s:cterm04 = "20" + let g:base16_cterm04 = "20" + let s:cterm06 = "21" + let g:base16_cterm06 = "21" + let s:cterm09 = "16" + let g:base16_cterm09 = "16" + let s:cterm0F = "17" + let g:base16_cterm0F = "17" +else + let s:cterm01 = "10" + let g:base16_cterm01 = "10" + let s:cterm02 = "11" + let g:base16_cterm02 = "11" + let s:cterm04 = "12" + let g:base16_cterm04 = "12" + let s:cterm06 = "13" + let g:base16_cterm06 = "13" + let s:cterm09 = "09" + let g:base16_cterm09 = "09" + let s:cterm0F = "14" + let g:base16_cterm0F = "14" +endif + +" Neovim terminal colours +if has("nvim") + let g:terminal_color_0 = "#eeeeee" + let g:terminal_color_1 = "#bcbcbc" + let g:terminal_color_2 = "#8700af" + let g:terminal_color_3 = "#d70087" + let g:terminal_color_4 = "#d75f00" + let g:terminal_color_5 = "#005faf" + let g:terminal_color_6 = "#d75f00" + let g:terminal_color_7 = "#878787" + let g:terminal_color_8 = "#5f8700" + let g:terminal_color_9 = "#bcbcbc" + let g:terminal_color_10 = "#8700af" + let g:terminal_color_11 = "#d70087" + let g:terminal_color_12 = "#d75f00" + let g:terminal_color_13 = "#005faf" + let g:terminal_color_14 = "#d75f00" + let g:terminal_color_15 = "#444444" + let g:terminal_color_background = g:terminal_color_0 + let g:terminal_color_foreground = g:terminal_color_5 + if &background == "light" + let g:terminal_color_background = g:terminal_color_7 + let g:terminal_color_foreground = g:terminal_color_2 + endif +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-papercolor-light" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + + if a:guifg != "" + exec "hi " . a:group . " guifg=#" . a:guifg + endif + if a:guibg != "" + exec "hi " . a:group . " guibg=#" . a:guibg + endif + if a:ctermfg != "" + exec "hi " . a:group . " ctermfg=" . a:ctermfg + endif + if a:ctermbg != "" + exec "hi " . a:group . " ctermbg=" . a:ctermbg + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + if a:guisp != "" + exec "hi " . a:group . " guisp=#" . a:guisp + endif +endfunction + + +fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) + call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) +endfun + +" Vim editor colors +call <sid>hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("Bold", "", "", "", "", "bold", "") +call <sid>hi("Debug", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") +call <sid>hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("Exception", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") +call <sid>hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") +call <sid>hi("Italic", "", "", "", "", "none", "") +call <sid>hi("Macro", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") +call <sid>hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Question", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") +call <sid>hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") +call <sid>hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("TooLong", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Underlined", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Visual", "", s:gui02, "", s:cterm02, "", "") +call <sid>hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") +call <sid>hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") +call <sid>hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") +call <sid>hi("NonText", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") +call <sid>hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") +call <sid>hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") +call <sid>hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") +call <sid>hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") +call <sid>hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") +call <sid>hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") +call <sid>hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") + +" Standard syntax highlighting +call <sid>hi("Boolean", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Character", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("Comment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Constant", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") +call <sid>hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Float", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Function", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") +call <sid>hi("Include", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Label", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Number", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("Operator", s:gui05, "", s:cterm05, "", "none", "") +call <sid>hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Special", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("Statement", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("String", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") +call <sid>hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") +call <sid>hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") + +" C highlighting +call <sid>hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") + +" C# highlighting +call <sid>hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csType", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") + +" CSS highlighting +call <sid>hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") + +" Diff highlighting +call <sid>hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") +call <sid>hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") +call <sid>hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") +call <sid>hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") +call <sid>hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") + +" Git highlighting +call <sid>hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") +call <sid>hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") +call <sid>hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") + +" GitGutter highlighting +call <sid>hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") +call <sid>hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") + +" HTML highlighting +call <sid>hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") + +" JavaScript highlighting +call <sid>hi("javaScript", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") +" pangloss/vim-javascript highlighting +call <sid>hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsThis", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") + +" Mail highlighting +call <sid>hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") + +" Markdown highlighting +call <sid>hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") +call <sid>hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") + +" NERDTree highlighting +call <sid>hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") + +" PHP highlighting +call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") + +" Python highlighting +call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") + +" Ruby highlighting +call <sid>hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") +call <sid>hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") +call <sid>hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") +call <sid>hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") + +" SASS highlighting +call <sid>hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") +call <sid>hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") + +" Signify highlighting +call <sid>hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") +call <sid>hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") +call <sid>hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") + +" Spelling highlighting +call <sid>hi("SpellBad", "", "", "", "", "undercurl", s:gui08) +call <sid>hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) +call <sid>hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) +call <sid>hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) + +" Startify highlighting +call <sid>hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") +call <sid>hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") +call <sid>hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") +call <sid>hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") +call <sid>hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") +call <sid>hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") +call <sid>hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") + +" Java highlighting +call <sid>hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") + +" Remove functions +delf <sid>hi + +" Remove color variables +unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F +unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim index 296ffe6..ff043f5 100644 --- a/colors/base16-paraiso.vim +++ b/colors/base16-paraiso.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-paraiso" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim index 58adc0c..f54c9ec 100644 --- a/colors/base16-phd.vim +++ b/colors/base16-phd.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-phd" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim index fb086a4..5303fc8 100644 --- a/colors/base16-pico.vim +++ b/colors/base16-pico.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-pico" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim index f1e1924..19c180e 100644 --- a/colors/base16-pop.vim +++ b/colors/base16-pop.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-pop" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim index 2bdeaa5..8cc6c4a 100644 --- a/colors/base16-porple.vim +++ b/colors/base16-porple.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-porple" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim index 9d16c84..4fe1ca2 100644 --- a/colors/base16-railscasts.vim +++ b/colors/base16-railscasts.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-railscasts" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim index d32f14f..eef26cb 100644 --- a/colors/base16-rebecca.vim +++ b/colors/base16-rebecca.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-rebecca" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim index 42344a9..edb3e86 100644 --- a/colors/base16-seti.vim +++ b/colors/base16-seti.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-seti" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim index f5ab046..a6c09e1 100644 --- a/colors/base16-shapeshifter.vim +++ b/colors/base16-shapeshifter.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-shapeshifter" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-snazzy.vim b/colors/base16-snazzy.vim index 35fafad..11e65c2 100644 --- a/colors/base16-snazzy.vim +++ b/colors/base16-snazzy.vim @@ -15,20 +15,20 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "1e1f29" -let g:base16_gui00 = "1e1f29" +let s:gui00 = "282a36" +let g:base16_gui00 = "282a36" let s:gui01 = "34353e" let g:base16_gui01 = "34353e" -let s:gui02 = "4a4b53" -let g:base16_gui02 = "4a4b53" +let s:gui02 = "43454f" +let g:base16_gui02 = "43454f" let s:gui03 = "78787e" let g:base16_gui03 = "78787e" let s:gui04 = "a5a5a9" let g:base16_gui04 = "a5a5a9" -let s:gui05 = "eff0eb" -let g:base16_gui05 = "eff0eb" -let s:gui06 = "f1f1f0" -let g:base16_gui06 = "f1f1f0" +let s:gui05 = "e2e4e5" +let g:base16_gui05 = "e2e4e5" +let s:gui06 = "eff0eb" +let g:base16_gui06 = "eff0eb" let s:gui07 = "f1f1f0" let g:base16_gui07 = "f1f1f0" let s:gui08 = "ff5c57" @@ -99,14 +99,14 @@ endif " Neovim terminal colours if has("nvim") - let g:terminal_color_0 = "#1e1f29" + let g:terminal_color_0 = "#282a36" let g:terminal_color_1 = "#ff5c57" let g:terminal_color_2 = "#5af78e" let g:terminal_color_3 = "#f3f99d" let g:terminal_color_4 = "#57c7ff" let g:terminal_color_5 = "#ff6ac1" let g:terminal_color_6 = "#9aedfe" - let g:terminal_color_7 = "#eff0eb" + let g:terminal_color_7 = "#e2e4e5" let g:terminal_color_8 = "#78787e" let g:terminal_color_9 = "#ff5c57" let g:terminal_color_10 = "#5af78e" @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-snazzy" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim index 5929169..d015ba8 100644 --- a/colors/base16-solarflare.vim +++ b/colors/base16-solarflare.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-solarflare" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim index 5eae6a6..b8965cf 100644 --- a/colors/base16-solarized-dark.vim +++ b/colors/base16-solarized-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-solarized-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim index e80e62b..ebc8bbc 100644 --- a/colors/base16-solarized-light.vim +++ b/colors/base16-solarized-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-solarized-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim index 9a2a01d..5980b0b 100644 --- a/colors/base16-spacemacs.vim +++ b/colors/base16-spacemacs.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-spacemacs" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim index 58fa855..e3519d7 100644 --- a/colors/base16-summerfruit-dark.vim +++ b/colors/base16-summerfruit-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-summerfruit-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim index 42514ef..e6d1756 100644 --- a/colors/base16-summerfruit-light.vim +++ b/colors/base16-summerfruit-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-summerfruit-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim index d886ee5..5e69fce 100644 --- a/colors/base16-tomorrow-night.vim +++ b/colors/base16-tomorrow-night.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-tomorrow-night" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim index 04bd835..55d6715 100644 --- a/colors/base16-tomorrow.vim +++ b/colors/base16-tomorrow.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-tomorrow" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim index f3a923f..198f19a 100644 --- a/colors/base16-tube.vim +++ b/colors/base16-tube.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-tube" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim index 382374d..4198bf0 100644 --- a/colors/base16-twilight.vim +++ b/colors/base16-twilight.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-twilight" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim index df0586f..ed1292a 100644 --- a/colors/base16-unikitty-dark.vim +++ b/colors/base16-unikitty-dark.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-unikitty-dark" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim index 4f89bb0..2ef03da 100644 --- a/colors/base16-unikitty-light.vim +++ b/colors/base16-unikitty-light.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-unikitty-light" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim index cadc78e..bacab7b 100644 --- a/colors/base16-woodland.vim +++ b/colors/base16-woodland.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-woodland" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim index 167982d..cccdfe5 100644 --- a/colors/base16-xcode-dusk.vim +++ b/colors/base16-xcode-dusk.vim @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-xcode-dusk" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim index f87b9d5..4106f0e 100644 --- a/colors/base16-zenburn.vim +++ b/colors/base16-zenburn.vim @@ -15,14 +15,14 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "3f3f3f" -let g:base16_gui00 = "3f3f3f" +let s:gui00 = "383838" +let g:base16_gui00 = "383838" let s:gui01 = "404040" let g:base16_gui01 = "404040" let s:gui02 = "606060" let g:base16_gui02 = "606060" -let s:gui03 = "4f4f4f" -let g:base16_gui03 = "4f4f4f" +let s:gui03 = "6f6f6f" +let g:base16_gui03 = "6f6f6f" let s:gui04 = "808080" let g:base16_gui04 = "808080" let s:gui05 = "dcdccc" @@ -99,7 +99,7 @@ endif " Neovim terminal colours if has("nvim") - let g:terminal_color_0 = "#3f3f3f" + let g:terminal_color_0 = "#383838" let g:terminal_color_1 = "#dca3a3" let g:terminal_color_2 = "#5f7f5f" let g:terminal_color_3 = "#e0cf9f" @@ -107,7 +107,7 @@ if has("nvim") let g:terminal_color_5 = "#dc8cc3" let g:terminal_color_6 = "#93e0e3" let g:terminal_color_7 = "#dcdccc" - let g:terminal_color_8 = "#4f4f4f" + let g:terminal_color_8 = "#6f6f6f" let g:terminal_color_9 = "#dca3a3" let g:terminal_color_10 = "#5f7f5f" let g:terminal_color_11 = "#e0cf9f" @@ -129,7 +129,11 @@ syntax reset let g:colors_name = "base16-zenburn" " Highlighting function -function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let a:attr = get(a:, 1, "") + let a:guisp = get(a:, 2, "") + if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg endif @@ -333,6 +337,7 @@ call <sid>hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") call <sid>hi("phpParent", s:gui05, "", s:cterm05, "", "", "") +call <sid>hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") " Python highlighting call <sid>hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") |