diff options
129 files changed, 2636 insertions, 832 deletions
diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim index af4c137..7271cc6 100644 --- a/colors/base16-3024.vim +++ b/colors/base16-3024.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-3024" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim index 8b54a42..32f7bab 100644 --- a/colors/base16-apathy.vim +++ b/colors/base16-apathy.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-apathy" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim index 6a55b1a..76bef75 100644 --- a/colors/base16-ashes.vim +++ b/colors/base16-ashes.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-ashes" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim index 351de6d..6240dcc 100644 --- a/colors/base16-atelier-cave-light.vim +++ b/colors/base16-atelier-cave-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-cave-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim index 8f56677..dc6886b 100644 --- a/colors/base16-atelier-cave.vim +++ b/colors/base16-atelier-cave.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-cave" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim index b419ab5..bcf2fd4 100644 --- a/colors/base16-atelier-dune-light.vim +++ b/colors/base16-atelier-dune-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-dune-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim index 1821bd9..3fa690c 100644 --- a/colors/base16-atelier-dune.vim +++ b/colors/base16-atelier-dune.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-dune" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim index d029308..a807e0b 100644 --- a/colors/base16-atelier-estuary-light.vim +++ b/colors/base16-atelier-estuary-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-estuary-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim index 7c6f79e..771e3b3 100644 --- a/colors/base16-atelier-estuary.vim +++ b/colors/base16-atelier-estuary.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-estuary" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim index d88c079..9d5a454 100644 --- a/colors/base16-atelier-forest-light.vim +++ b/colors/base16-atelier-forest-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-forest-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim index 4e88645..bb0a978 100644 --- a/colors/base16-atelier-forest.vim +++ b/colors/base16-atelier-forest.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-forest" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim index 66bfa02..ca1c0a6 100644 --- a/colors/base16-atelier-heath-light.vim +++ b/colors/base16-atelier-heath-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-heath-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim index 10f6cd2..8946c2d 100644 --- a/colors/base16-atelier-heath.vim +++ b/colors/base16-atelier-heath.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-heath" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim index 9195691..71bbc1d 100644 --- a/colors/base16-atelier-lakeside-light.vim +++ b/colors/base16-atelier-lakeside-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-lakeside-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim index 4a70e5a..08e6da1 100644 --- a/colors/base16-atelier-lakeside.vim +++ b/colors/base16-atelier-lakeside.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-lakeside" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim index 5e5ad9c..01f1263 100644 --- a/colors/base16-atelier-plateau-light.vim +++ b/colors/base16-atelier-plateau-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-plateau-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim index 19e51c1..e57d296 100644 --- a/colors/base16-atelier-plateau.vim +++ b/colors/base16-atelier-plateau.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-plateau" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim index 4881369..23dd219 100644 --- a/colors/base16-atelier-savanna-light.vim +++ b/colors/base16-atelier-savanna-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-savanna-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim index 7b53838..4da189b 100644 --- a/colors/base16-atelier-savanna.vim +++ b/colors/base16-atelier-savanna.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-savanna" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim index dbba3bc..20f5048 100644 --- a/colors/base16-atelier-seaside-light.vim +++ b/colors/base16-atelier-seaside-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-seaside-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim index 5b842e3..88eb595 100644 --- a/colors/base16-atelier-seaside.vim +++ b/colors/base16-atelier-seaside.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-seaside" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim index 2f1366f..be62827 100644 --- a/colors/base16-atelier-sulphurpool-light.vim +++ b/colors/base16-atelier-sulphurpool-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-sulphurpool-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim index cab13e2..f28477a 100644 --- a/colors/base16-atelier-sulphurpool.vim +++ b/colors/base16-atelier-sulphurpool.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-atelier-sulphurpool" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-atlas.vim b/colors/base16-atlas.vim index 3639a23..b200a12 100644 --- a/colors/base16-atlas.vim +++ b/colors/base16-atlas.vim @@ -121,6 +121,25 @@ if has("nvim") let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 endif +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#002635", + \ "#ff5a67", + \ "#7fc06e", + \ "#ffcc1b", + \ "#5dd7b9", + \ "#9a70a4", + \ "#14747e", + \ "#a1a19a", + \ "#6C8B91", + \ "#ff5a67", + \ "#7fc06e", + \ "#ffcc1b", + \ "#5dd7b9", + \ "#9a70a4", + \ "#14747e", + \ "#fafaf8", + \ ] endif " Theme setup @@ -131,8 +150,8 @@ 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -146,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim index 3780f9a..5738e5d 100644 --- a/colors/base16-bespin.vim +++ b/colors/base16-bespin.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-bespin" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-bathory.vim b/colors/base16-black-metal-bathory.vim index eae7b10..75ed869 100644 --- a/colors/base16-black-metal-bathory.vim +++ b/colors/base16-black-metal-bathory.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-bathory" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-burzum.vim b/colors/base16-black-metal-burzum.vim index f0b89ee..15a884c 100644 --- a/colors/base16-black-metal-burzum.vim +++ b/colors/base16-black-metal-burzum.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-burzum" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-dark-funeral.vim b/colors/base16-black-metal-dark-funeral.vim index e3a16fd..5dc4e63 100644 --- a/colors/base16-black-metal-dark-funeral.vim +++ b/colors/base16-black-metal-dark-funeral.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-dark-funeral" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-gorgoroth.vim b/colors/base16-black-metal-gorgoroth.vim index dac913c..a4e8695 100644 --- a/colors/base16-black-metal-gorgoroth.vim +++ b/colors/base16-black-metal-gorgoroth.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-gorgoroth" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-immortal.vim b/colors/base16-black-metal-immortal.vim index 2286ce5..57ef46f 100644 --- a/colors/base16-black-metal-immortal.vim +++ b/colors/base16-black-metal-immortal.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-immortal" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-khold.vim b/colors/base16-black-metal-khold.vim index 0572ca9..0450a05 100644 --- a/colors/base16-black-metal-khold.vim +++ b/colors/base16-black-metal-khold.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-khold" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-marduk.vim b/colors/base16-black-metal-marduk.vim index 06204ac..ee136f9 100644 --- a/colors/base16-black-metal-marduk.vim +++ b/colors/base16-black-metal-marduk.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-marduk" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-mayhem.vim b/colors/base16-black-metal-mayhem.vim index 9a57f77..3a08b37 100644 --- a/colors/base16-black-metal-mayhem.vim +++ b/colors/base16-black-metal-mayhem.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-mayhem" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-nile.vim b/colors/base16-black-metal-nile.vim index 52ff49b..72f133b 100644 --- a/colors/base16-black-metal-nile.vim +++ b/colors/base16-black-metal-nile.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-nile" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal-venom.vim b/colors/base16-black-metal-venom.vim index 7a805d9..2f9d4c6 100644 --- a/colors/base16-black-metal-venom.vim +++ b/colors/base16-black-metal-venom.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal-venom" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-black-metal.vim b/colors/base16-black-metal.vim index c9f2920..d03a051 100644 --- a/colors/base16-black-metal.vim +++ b/colors/base16-black-metal.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-black-metal" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim index 25a22a3..f957f67 100644 --- a/colors/base16-brewer.vim +++ b/colors/base16-brewer.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-brewer" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim index 9f636dc..8a80f4f 100644 --- a/colors/base16-bright.vim +++ b/colors/base16-bright.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-bright" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-brogrammer.vim b/colors/base16-brogrammer.vim index cd76eab..47ce5f9 100644 --- a/colors/base16-brogrammer.vim +++ b/colors/base16-brogrammer.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-brogrammer" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim index db06de8..ddc643d 100644 --- a/colors/base16-brushtrees-dark.vim +++ b/colors/base16-brushtrees-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-brushtrees-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim index 49d67d1..d974109 100644 --- a/colors/base16-brushtrees.vim +++ b/colors/base16-brushtrees.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-brushtrees" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim index 2868d74..f42e38d 100644 --- a/colors/base16-chalk.vim +++ b/colors/base16-chalk.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-chalk" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim index 6cff6d5..4072517 100644 --- a/colors/base16-circus.vim +++ b/colors/base16-circus.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-circus" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim index 5185855..bc91c66 100644 --- a/colors/base16-classic-dark.vim +++ b/colors/base16-classic-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-classic-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim index 47df509..ebde2f2 100644 --- a/colors/base16-classic-light.vim +++ b/colors/base16-classic-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-classic-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim index 852e6e3..a3b7523 100644 --- a/colors/base16-codeschool.vim +++ b/colors/base16-codeschool.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-codeschool" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim index da16faa..15b9d20 100644 --- a/colors/base16-cupcake.vim +++ b/colors/base16-cupcake.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-cupcake" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim index 29ee13b..1a564d3 100644 --- a/colors/base16-cupertino.vim +++ b/colors/base16-cupertino.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-cupertino" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim index faa276d..9fc4a24 100644 --- a/colors/base16-darktooth.vim +++ b/colors/base16-darktooth.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-darktooth" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim index 2a61da2..fe1fa94 100644 --- a/colors/base16-default-dark.vim +++ b/colors/base16-default-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-default-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim index 98d3a24..9f4f90a 100644 --- a/colors/base16-default-light.vim +++ b/colors/base16-default-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-default-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim index 4b8517a..9f603a1 100644 --- a/colors/base16-dracula.vim +++ b/colors/base16-dracula.vim @@ -19,10 +19,10 @@ let s:gui00 = "282936" let g:base16_gui00 = "282936" let s:gui01 = "3a3c4e" let g:base16_gui01 = "3a3c4e" -let s:gui02 = "626483" -let g:base16_gui02 = "626483" -let s:gui03 = "4d4f68" -let g:base16_gui03 = "4d4f68" +let s:gui02 = "4d4f68" +let g:base16_gui02 = "4d4f68" +let s:gui03 = "626483" +let g:base16_gui03 = "626483" let s:gui04 = "62d6e8" let g:base16_gui04 = "62d6e8" let s:gui05 = "e9e9f4" @@ -35,10 +35,10 @@ let s:gui08 = "ea51b2" let g:base16_gui08 = "ea51b2" let s:gui09 = "b45bcf" let g:base16_gui09 = "b45bcf" -let s:gui0A = "ebff87" -let g:base16_gui0A = "ebff87" -let s:gui0B = "00f769" -let g:base16_gui0B = "00f769" +let s:gui0A = "00f769" +let g:base16_gui0A = "00f769" +let s:gui0B = "ebff87" +let g:base16_gui0B = "ebff87" let s:gui0C = "a1efe4" let g:base16_gui0C = "a1efe4" let s:gui0D = "62d6e8" @@ -101,16 +101,16 @@ endif if has("nvim") let g:terminal_color_0 = "#282936" let g:terminal_color_1 = "#ea51b2" - let g:terminal_color_2 = "#00f769" - let g:terminal_color_3 = "#ebff87" + let g:terminal_color_2 = "#ebff87" + let g:terminal_color_3 = "#00f769" let g:terminal_color_4 = "#62d6e8" let g:terminal_color_5 = "#b45bcf" let g:terminal_color_6 = "#a1efe4" let g:terminal_color_7 = "#e9e9f4" - let g:terminal_color_8 = "#4d4f68" + let g:terminal_color_8 = "#626483" let g:terminal_color_9 = "#ea51b2" - let g:terminal_color_10 = "#00f769" - let g:terminal_color_11 = "#ebff87" + let g:terminal_color_10 = "#ebff87" + let g:terminal_color_11 = "#00f769" let g:terminal_color_12 = "#62d6e8" let g:terminal_color_13 = "#b45bcf" let g:terminal_color_14 = "#a1efe4" @@ -125,16 +125,16 @@ elseif has('terminal') let g:terminal_ansi_colors = [ \ "#282936", \ "#ea51b2", - \ "#00f769", \ "#ebff87", + \ "#00f769", \ "#62d6e8", \ "#b45bcf", \ "#a1efe4", \ "#e9e9f4", - \ "#4d4f68", + \ "#626483", \ "#ea51b2", - \ "#00f769", \ "#ebff87", + \ "#00f769", \ "#62d6e8", \ "#b45bcf", \ "#a1efe4", @@ -150,8 +150,8 @@ let g:colors_name = "base16-dracula" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim index 3807de3..acc15d2 100644 --- a/colors/base16-eighties.vim +++ b/colors/base16-eighties.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-eighties" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim index ca1fc88..a50affc 100644 --- a/colors/base16-embers.vim +++ b/colors/base16-embers.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-embers" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim index ccf0cae..9c297a4 100644 --- a/colors/base16-flat.vim +++ b/colors/base16-flat.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-flat" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-fruit-soda.vim b/colors/base16-fruit-soda.vim index e944063..d3d92ec 100644 --- a/colors/base16-fruit-soda.vim +++ b/colors/base16-fruit-soda.vim @@ -121,6 +121,25 @@ if has("nvim") let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 endif +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#f1ecf1", + \ "#fe3e31", + \ "#47f74c", + \ "#f7e203", + \ "#2931df", + \ "#611fce", + \ "#0f9cfd", + \ "#515151", + \ "#b5b4b6", + \ "#fe3e31", + \ "#47f74c", + \ "#f7e203", + \ "#2931df", + \ "#611fce", + \ "#0f9cfd", + \ "#2d2c2c", + \ ] endif " Theme setup @@ -131,8 +150,8 @@ 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -146,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-github.vim b/colors/base16-github.vim index 7ffc4cb..17be3f9 100644 --- a/colors/base16-github.vim +++ b/colors/base16-github.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-github" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim index dc348e1..5f7dbf3 100644 --- a/colors/base16-google-dark.vim +++ b/colors/base16-google-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-google-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim index 14fd4b9..f7506a9 100644 --- a/colors/base16-google-light.vim +++ b/colors/base16-google-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-google-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim index 3e8abfe..e35be2f 100644 --- a/colors/base16-grayscale-dark.vim +++ b/colors/base16-grayscale-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-grayscale-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim index e45f8fb..5d9e7a6 100644 --- a/colors/base16-grayscale-light.vim +++ b/colors/base16-grayscale-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-grayscale-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim index bc43a9b..b937888 100644 --- a/colors/base16-greenscreen.vim +++ b/colors/base16-greenscreen.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-greenscreen" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim index 5c1a177..21002ad 100644 --- a/colors/base16-gruvbox-dark-hard.vim +++ b/colors/base16-gruvbox-dark-hard.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-gruvbox-dark-hard" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim index 1a44de2..e4dd3e9 100644 --- a/colors/base16-gruvbox-dark-medium.vim +++ b/colors/base16-gruvbox-dark-medium.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-gruvbox-dark-medium" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim index 56ddbb2..111e8d2 100644 --- a/colors/base16-gruvbox-dark-pale.vim +++ b/colors/base16-gruvbox-dark-pale.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-gruvbox-dark-pale" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim index 494c303..b5e0297 100644 --- a/colors/base16-gruvbox-dark-soft.vim +++ b/colors/base16-gruvbox-dark-soft.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-gruvbox-dark-soft" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim index 0f99267..781de8f 100644 --- a/colors/base16-gruvbox-light-hard.vim +++ b/colors/base16-gruvbox-light-hard.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-gruvbox-light-hard" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim index 5f720f4..0d2add4 100644 --- a/colors/base16-gruvbox-light-medium.vim +++ b/colors/base16-gruvbox-light-medium.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-gruvbox-light-medium" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim index 577a971..fa55eff 100644 --- a/colors/base16-gruvbox-light-soft.vim +++ b/colors/base16-gruvbox-light-soft.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-gruvbox-light-soft" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim index e2592ae..90d8e20 100644 --- a/colors/base16-harmonic-dark.vim +++ b/colors/base16-harmonic-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-harmonic-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim index 2fb734b..d527111 100644 --- a/colors/base16-harmonic-light.vim +++ b/colors/base16-harmonic-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-harmonic-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-heetch-light.vim b/colors/base16-heetch-light.vim index 1377b93..7739aac 100644 --- a/colors/base16-heetch-light.vim +++ b/colors/base16-heetch-light.vim @@ -121,6 +121,25 @@ if has("nvim") let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 endif +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#feffff", + \ "#27d9d5", + \ "#f80059", + \ "#5ba2b6", + \ "#47f9f5", + \ "#bd0152", + \ "#c33678", + \ "#5a496e", + \ "#9c92a8", + \ "#27d9d5", + \ "#f80059", + \ "#5ba2b6", + \ "#47f9f5", + \ "#bd0152", + \ "#c33678", + \ "#190134", + \ ] endif " Theme setup @@ -131,8 +150,8 @@ 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -146,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-heetch.vim b/colors/base16-heetch.vim index 2fc8f5e..ee2f967 100644 --- a/colors/base16-heetch.vim +++ b/colors/base16-heetch.vim @@ -121,6 +121,25 @@ if has("nvim") let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 endif +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#190134", + \ "#27D9D5", + \ "#C33678", + \ "#8F6C97", + \ "#BD0152", + \ "#82034C", + \ "#F80059", + \ "#BDB6C5", + \ "#7B6D8B", + \ "#27D9D5", + \ "#C33678", + \ "#8F6C97", + \ "#BD0152", + \ "#82034C", + \ "#F80059", + \ "#FEFFFF", + \ ] endif " Theme setup @@ -131,8 +150,8 @@ 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -146,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-helios.vim b/colors/base16-helios.vim new file mode 100644 index 0000000..6be6c57 --- /dev/null +++ b/colors/base16-helios.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Helios scheme by Alex Meyer (https://github.com/reyemxela) + +" 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-helios.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "1d2021" +let g:base16_gui00 = "1d2021" +let s:gui01 = "383c3e" +let g:base16_gui01 = "383c3e" +let s:gui02 = "53585b" +let g:base16_gui02 = "53585b" +let s:gui03 = "6f7579" +let g:base16_gui03 = "6f7579" +let s:gui04 = "cdcdcd" +let g:base16_gui04 = "cdcdcd" +let s:gui05 = "d5d5d5" +let g:base16_gui05 = "d5d5d5" +let s:gui06 = "dddddd" +let g:base16_gui06 = "dddddd" +let s:gui07 = "e5e5e5" +let g:base16_gui07 = "e5e5e5" +let s:gui08 = "d72638" +let g:base16_gui08 = "d72638" +let s:gui09 = "eb8413" +let g:base16_gui09 = "eb8413" +let s:gui0A = "f19d1a" +let g:base16_gui0A = "f19d1a" +let s:gui0B = "88b92d" +let g:base16_gui0B = "88b92d" +let s:gui0C = "1ba595" +let g:base16_gui0C = "1ba595" +let s:gui0D = "1e8bac" +let g:base16_gui0D = "1e8bac" +let s:gui0E = "be4264" +let g:base16_gui0E = "be4264" +let s:gui0F = "c85e0d" +let g:base16_gui0F = "c85e0d" + +" 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 = "#1d2021" + let g:terminal_color_1 = "#d72638" + let g:terminal_color_2 = "#88b92d" + let g:terminal_color_3 = "#f19d1a" + let g:terminal_color_4 = "#1e8bac" + let g:terminal_color_5 = "#be4264" + let g:terminal_color_6 = "#1ba595" + let g:terminal_color_7 = "#d5d5d5" + let g:terminal_color_8 = "#6f7579" + let g:terminal_color_9 = "#d72638" + let g:terminal_color_10 = "#88b92d" + let g:terminal_color_11 = "#f19d1a" + let g:terminal_color_12 = "#1e8bac" + let g:terminal_color_13 = "#be4264" + let g:terminal_color_14 = "#1ba595" + let g:terminal_color_15 = "#e5e5e5" + 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 +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#1d2021", + \ "#d72638", + \ "#88b92d", + \ "#f19d1a", + \ "#1e8bac", + \ "#be4264", + \ "#1ba595", + \ "#d5d5d5", + \ "#6f7579", + \ "#d72638", + \ "#88b92d", + \ "#f19d1a", + \ "#1e8bac", + \ "#be4264", + \ "#1ba595", + \ "#e5e5e5", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-helios" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l: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 l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l: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 f50362e..443d78f 100644 --- a/colors/base16-hopscotch.vim +++ b/colors/base16-hopscotch.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-hopscotch" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-horizon-dark.vim b/colors/base16-horizon-dark.vim new file mode 100644 index 0000000..7ae9948 --- /dev/null +++ b/colors/base16-horizon-dark.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Horizon Dark scheme by Michaël Ball (http://github.com/michael-ball/) + +" 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-horizon-dark.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "1C1E26" +let g:base16_gui00 = "1C1E26" +let s:gui01 = "232530" +let g:base16_gui01 = "232530" +let s:gui02 = "2E303E" +let g:base16_gui02 = "2E303E" +let s:gui03 = "676A8D" +let g:base16_gui03 = "676A8D" +let s:gui04 = "CED1D0" +let g:base16_gui04 = "CED1D0" +let s:gui05 = "CBCED0" +let g:base16_gui05 = "CBCED0" +let s:gui06 = "DCDFE4" +let g:base16_gui06 = "DCDFE4" +let s:gui07 = "E3E6EE" +let g:base16_gui07 = "E3E6EE" +let s:gui08 = "E93C58" +let g:base16_gui08 = "E93C58" +let s:gui09 = "E58D7D" +let g:base16_gui09 = "E58D7D" +let s:gui0A = "EFB993" +let g:base16_gui0A = "EFB993" +let s:gui0B = "EFAF8E" +let g:base16_gui0B = "EFAF8E" +let s:gui0C = "24A8B4" +let g:base16_gui0C = "24A8B4" +let s:gui0D = "DF5273" +let g:base16_gui0D = "DF5273" +let s:gui0E = "B072D1" +let g:base16_gui0E = "B072D1" +let s:gui0F = "E4A382" +let g:base16_gui0F = "E4A382" + +" 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 = "#1C1E26" + let g:terminal_color_1 = "#E93C58" + let g:terminal_color_2 = "#EFAF8E" + let g:terminal_color_3 = "#EFB993" + let g:terminal_color_4 = "#DF5273" + let g:terminal_color_5 = "#B072D1" + let g:terminal_color_6 = "#24A8B4" + let g:terminal_color_7 = "#CBCED0" + let g:terminal_color_8 = "#676A8D" + let g:terminal_color_9 = "#E93C58" + let g:terminal_color_10 = "#EFAF8E" + let g:terminal_color_11 = "#EFB993" + let g:terminal_color_12 = "#DF5273" + let g:terminal_color_13 = "#B072D1" + let g:terminal_color_14 = "#24A8B4" + let g:terminal_color_15 = "#E3E6EE" + 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 +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#1C1E26", + \ "#E93C58", + \ "#EFAF8E", + \ "#EFB993", + \ "#DF5273", + \ "#B072D1", + \ "#24A8B4", + \ "#CBCED0", + \ "#676A8D", + \ "#E93C58", + \ "#EFAF8E", + \ "#EFB993", + \ "#DF5273", + \ "#B072D1", + \ "#24A8B4", + \ "#E3E6EE", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-horizon-dark" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l: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 l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l: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-dark.vim b/colors/base16-ia-dark.vim index 7fa7e9d..e5747c4 100644 --- a/colors/base16-ia-dark.vim +++ b/colors/base16-ia-dark.vim @@ -121,6 +121,25 @@ if has("nvim") let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 endif +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#1a1a1a", + \ "#d88568", + \ "#83a471", + \ "#b99353", + \ "#8eccdd", + \ "#b98eb2", + \ "#7c9cae", + \ "#cccccc", + \ "#767676", + \ "#d88568", + \ "#83a471", + \ "#b99353", + \ "#8eccdd", + \ "#b98eb2", + \ "#7c9cae", + \ "#f8f8f8", + \ ] endif " Theme setup @@ -131,8 +150,8 @@ 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -146,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-ia-light.vim b/colors/base16-ia-light.vim index 70d1171..2078172 100644 --- a/colors/base16-ia-light.vim +++ b/colors/base16-ia-light.vim @@ -121,6 +121,25 @@ if has("nvim") let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 endif +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#f6f6f6", + \ "#9c5a02", + \ "#38781c", + \ "#c48218", + \ "#48bac2", + \ "#a94598", + \ "#2d6bb1", + \ "#181818", + \ "#898989", + \ "#9c5a02", + \ "#38781c", + \ "#c48218", + \ "#48bac2", + \ "#a94598", + \ "#2d6bb1", + \ "#f8f8f8", + \ ] endif " Theme setup @@ -131,8 +150,8 @@ 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -146,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim index 13a37ca..edeac0e 100644 --- a/colors/base16-icy.vim +++ b/colors/base16-icy.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-icy" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim index dbe2db8..89a2f36 100644 --- a/colors/base16-irblack.vim +++ b/colors/base16-irblack.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-irblack" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim index e043bba..9316d51 100644 --- a/colors/base16-isotope.vim +++ b/colors/base16-isotope.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-isotope" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim index 8a9c446..f30b757 100644 --- a/colors/base16-macintosh.vim +++ b/colors/base16-macintosh.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-macintosh" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim index f121092..7bc8897 100644 --- a/colors/base16-marrakesh.vim +++ b/colors/base16-marrakesh.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-marrakesh" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim index 23768f4..ff9df9f 100644 --- a/colors/base16-materia.vim +++ b/colors/base16-materia.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-materia" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim index 65a457b..a677063 100644 --- a/colors/base16-material-darker.vim +++ b/colors/base16-material-darker.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-material-darker" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim index 3eb7e80..c16f6cf 100644 --- a/colors/base16-material-lighter.vim +++ b/colors/base16-material-lighter.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-material-lighter" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim index 6cb23d7..13f287d 100644 --- a/colors/base16-material-palenight.vim +++ b/colors/base16-material-palenight.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-material-palenight" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-material-vivid.vim b/colors/base16-material-vivid.vim index 985d680..5c8e69e 100644 --- a/colors/base16-material-vivid.vim +++ b/colors/base16-material-vivid.vim @@ -15,38 +15,38 @@ if !has('gui_running') endif " GUI color definitions -let s:gui00 = "263238" -let g:base16_gui00 = "263238" -let s:gui01 = "37474F" -let g:base16_gui01 = "37474F" -let s:gui02 = "455A64" -let g:base16_gui02 = "455A64" -let s:gui03 = "546E7A" -let g:base16_gui03 = "546E7A" -let s:gui04 = "90A4AE" -let g:base16_gui04 = "90A4AE" -let s:gui05 = "B0BEC5" -let g:base16_gui05 = "B0BEC5" -let s:gui06 = "CFD8DC" -let g:base16_gui06 = "CFD8DC" -let s:gui07 = "ECEFF1" -let g:base16_gui07 = "ECEFF1" -let s:gui08 = "FF1744" -let g:base16_gui08 = "FF1744" -let s:gui09 = "FF9100" -let g:base16_gui09 = "FF9100" -let s:gui0A = "FFC400" -let g:base16_gui0A = "FFC400" -let s:gui0B = "00E676" -let g:base16_gui0B = "00E676" -let s:gui0C = "00B0FF" -let g:base16_gui0C = "00B0FF" -let s:gui0D = "2979FF" -let g:base16_gui0D = "2979FF" -let s:gui0E = "651FFF" -let g:base16_gui0E = "651FFF" -let s:gui0F = "8D6E63" -let g:base16_gui0F = "8D6E63" +let s:gui00 = "202124" +let g:base16_gui00 = "202124" +let s:gui01 = "27292c" +let g:base16_gui01 = "27292c" +let s:gui02 = "323639" +let g:base16_gui02 = "323639" +let s:gui03 = "44464d" +let g:base16_gui03 = "44464d" +let s:gui04 = "676c71" +let g:base16_gui04 = "676c71" +let s:gui05 = "80868b" +let g:base16_gui05 = "80868b" +let s:gui06 = "9e9e9e" +let g:base16_gui06 = "9e9e9e" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "f44336" +let g:base16_gui08 = "f44336" +let s:gui09 = "ff9800" +let g:base16_gui09 = "ff9800" +let s:gui0A = "ffeb3b" +let g:base16_gui0A = "ffeb3b" +let s:gui0B = "00e676" +let g:base16_gui0B = "00e676" +let s:gui0C = "00bcd4" +let g:base16_gui0C = "00bcd4" +let s:gui0D = "2196f3" +let g:base16_gui0D = "2196f3" +let s:gui0E = "673ab7" +let g:base16_gui0E = "673ab7" +let s:gui0F = "8d6e63" +let g:base16_gui0F = "8d6e63" " Terminal color definitions let s:cterm00 = "00" @@ -99,22 +99,22 @@ endif " Neovim terminal colours if has("nvim") - let g:terminal_color_0 = "#263238" - let g:terminal_color_1 = "#FF1744" - let g:terminal_color_2 = "#00E676" - let g:terminal_color_3 = "#FFC400" - let g:terminal_color_4 = "#2979FF" - let g:terminal_color_5 = "#651FFF" - let g:terminal_color_6 = "#00B0FF" - let g:terminal_color_7 = "#B0BEC5" - let g:terminal_color_8 = "#546E7A" - let g:terminal_color_9 = "#FF1744" - let g:terminal_color_10 = "#00E676" - let g:terminal_color_11 = "#FFC400" - let g:terminal_color_12 = "#2979FF" - let g:terminal_color_13 = "#651FFF" - let g:terminal_color_14 = "#00B0FF" - let g:terminal_color_15 = "#ECEFF1" + let g:terminal_color_0 = "#202124" + let g:terminal_color_1 = "#f44336" + let g:terminal_color_2 = "#00e676" + let g:terminal_color_3 = "#ffeb3b" + let g:terminal_color_4 = "#2196f3" + let g:terminal_color_5 = "#673ab7" + let g:terminal_color_6 = "#00bcd4" + let g:terminal_color_7 = "#80868b" + let g:terminal_color_8 = "#44464d" + let g:terminal_color_9 = "#f44336" + let g:terminal_color_10 = "#00e676" + let g:terminal_color_11 = "#ffeb3b" + let g:terminal_color_12 = "#2196f3" + let g:terminal_color_13 = "#673ab7" + let g:terminal_color_14 = "#00bcd4" + let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" @@ -123,22 +123,22 @@ if has("nvim") endif elseif has('terminal') let g:terminal_ansi_colors = [ - \ "#263238", - \ "#FF1744", - \ "#00E676", - \ "#FFC400", - \ "#2979FF", - \ "#651FFF", - \ "#00B0FF", - \ "#B0BEC5", - \ "#546E7A", - \ "#FF1744", - \ "#00E676", - \ "#FFC400", - \ "#2979FF", - \ "#651FFF", - \ "#00B0FF", - \ "#ECEFF1", + \ "#202124", + \ "#f44336", + \ "#00e676", + \ "#ffeb3b", + \ "#2196f3", + \ "#673ab7", + \ "#00bcd4", + \ "#80868b", + \ "#44464d", + \ "#f44336", + \ "#00e676", + \ "#ffeb3b", + \ "#2196f3", + \ "#673ab7", + \ "#00bcd4", + \ "#ffffff", \ ] endif @@ -150,8 +150,8 @@ let g:colors_name = "base16-material-vivid" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-material.vim b/colors/base16-material.vim index f4e3f70..26fc9e9 100644 --- a/colors/base16-material.vim +++ b/colors/base16-material.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-material" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim index 5b34274..4ee56e5 100644 --- a/colors/base16-mellow-purple.vim +++ b/colors/base16-mellow-purple.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-mellow-purple" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim index d9eadf5..8543054 100644 --- a/colors/base16-mexico-light.vim +++ b/colors/base16-mexico-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-mexico-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim index 5c9d46e..776b3f5 100644 --- a/colors/base16-mocha.vim +++ b/colors/base16-mocha.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-mocha" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim index de62db1..befdf06 100644 --- a/colors/base16-monokai.vim +++ b/colors/base16-monokai.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-monokai" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim index 4b4f9dc..6bb7f18 100644 --- a/colors/base16-nord.vim +++ b/colors/base16-nord.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-nord" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim index e976d5d..3a8a8ba 100644 --- a/colors/base16-ocean.vim +++ b/colors/base16-ocean.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-ocean" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim index 2125781..a1df172 100644 --- a/colors/base16-oceanicnext.vim +++ b/colors/base16-oceanicnext.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-oceanicnext" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim index 756f3fb..11774a2 100644 --- a/colors/base16-one-light.vim +++ b/colors/base16-one-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-one-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim index 276b88b..7c3436b 100644 --- a/colors/base16-onedark.vim +++ b/colors/base16-onedark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-onedark" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-outrun-dark.vim b/colors/base16-outrun-dark.vim index 49e5b6b..7eaadf5 100644 --- a/colors/base16-outrun-dark.vim +++ b/colors/base16-outrun-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-outrun-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-papercolor-dark.vim b/colors/base16-papercolor-dark.vim index e6a354c..30e4a24 100644 --- a/colors/base16-papercolor-dark.vim +++ b/colors/base16-papercolor-dark.vim @@ -121,6 +121,25 @@ if has("nvim") let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 endif +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#1c1c1c", + \ "#585858", + \ "#af87d7", + \ "#afd700", + \ "#ff5faf", + \ "#00afaf", + \ "#ffaf00", + \ "#808080", + \ "#d7af5f", + \ "#585858", + \ "#af87d7", + \ "#afd700", + \ "#ff5faf", + \ "#00afaf", + \ "#ffaf00", + \ "#d0d0d0", + \ ] endif " Theme setup @@ -131,8 +150,8 @@ 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -146,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-papercolor-light.vim b/colors/base16-papercolor-light.vim index 55a8702..448690d 100644 --- a/colors/base16-papercolor-light.vim +++ b/colors/base16-papercolor-light.vim @@ -121,6 +121,25 @@ if has("nvim") let g:terminal_color_background = g:terminal_color_7 let g:terminal_color_foreground = g:terminal_color_2 endif +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#eeeeee", + \ "#bcbcbc", + \ "#8700af", + \ "#d70087", + \ "#d75f00", + \ "#005faf", + \ "#d75f00", + \ "#878787", + \ "#5f8700", + \ "#bcbcbc", + \ "#8700af", + \ "#d70087", + \ "#d75f00", + \ "#005faf", + \ "#d75f00", + \ "#444444", + \ ] endif " Theme setup @@ -131,8 +150,8 @@ 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -146,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim index bef826c..419e1ed 100644 --- a/colors/base16-paraiso.vim +++ b/colors/base16-paraiso.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-paraiso" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim index 342137d..240bd9d 100644 --- a/colors/base16-phd.vim +++ b/colors/base16-phd.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-phd" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim index dfb0e4b..439bbe1 100644 --- a/colors/base16-pico.vim +++ b/colors/base16-pico.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-pico" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim index a34bd49..7e80416 100644 --- a/colors/base16-pop.vim +++ b/colors/base16-pop.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-pop" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim index a0f2747..3ca1943 100644 --- a/colors/base16-porple.vim +++ b/colors/base16-porple.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-porple" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim index 3bfd12c..e784e25 100644 --- a/colors/base16-railscasts.vim +++ b/colors/base16-railscasts.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-railscasts" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim index 2c4f438..802a3b9 100644 --- a/colors/base16-rebecca.vim +++ b/colors/base16-rebecca.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-rebecca" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim index 63f9c41..5360183 100644 --- a/colors/base16-seti.vim +++ b/colors/base16-seti.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-seti" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim index e0828d1..e70bf0c 100644 --- a/colors/base16-shapeshifter.vim +++ b/colors/base16-shapeshifter.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-shapeshifter" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-snazzy.vim b/colors/base16-snazzy.vim index 190abf1..540478e 100644 --- a/colors/base16-snazzy.vim +++ b/colors/base16-snazzy.vim @@ -123,14 +123,14 @@ if has("nvim") endif elseif has('terminal') let g:terminal_ansi_colors = [ - \ "#1e1f29", + \ "#282a36", \ "#ff5c57", \ "#5af78e", \ "#f3f99d", \ "#57c7ff", \ "#ff6ac1", \ "#9aedfe", - \ "#eff0eb", + \ "#e2e4e5", \ "#78787e", \ "#ff5c57", \ "#5af78e", @@ -150,8 +150,8 @@ let g:colors_name = "base16-snazzy" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim index 2f2f338..08d551e 100644 --- a/colors/base16-solarflare.vim +++ b/colors/base16-solarflare.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-solarflare" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim index 8cb06d6..834506b 100644 --- a/colors/base16-solarized-dark.vim +++ b/colors/base16-solarized-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-solarized-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim index 86dcff9..a31274f 100644 --- a/colors/base16-solarized-light.vim +++ b/colors/base16-solarized-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-solarized-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim index 9bc0dc7..deb4fab 100644 --- a/colors/base16-spacemacs.vim +++ b/colors/base16-spacemacs.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-spacemacs" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim index 777abf4..9aa14c3 100644 --- a/colors/base16-summerfruit-dark.vim +++ b/colors/base16-summerfruit-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-summerfruit-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim index 91ef76a..d25333f 100644 --- a/colors/base16-summerfruit-light.vim +++ b/colors/base16-summerfruit-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-summerfruit-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-synth-midnight-dark.vim b/colors/base16-synth-midnight-dark.vim new file mode 100644 index 0000000..894c3cb --- /dev/null +++ b/colors/base16-synth-midnight-dark.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Synth Midnight Dark scheme by Michaël Ball (http://github.com/michael-ball/) + +" 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-synth-midnight-dark.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "040404" +let g:base16_gui00 = "040404" +let s:gui01 = "141414" +let g:base16_gui01 = "141414" +let s:gui02 = "242424" +let g:base16_gui02 = "242424" +let s:gui03 = "61507A" +let g:base16_gui03 = "61507A" +let s:gui04 = "BFBBBF" +let g:base16_gui04 = "BFBBBF" +let s:gui05 = "DFDBDF" +let g:base16_gui05 = "DFDBDF" +let s:gui06 = "EFEBEF" +let g:base16_gui06 = "EFEBEF" +let s:gui07 = "FFFBFF" +let g:base16_gui07 = "FFFBFF" +let s:gui08 = "B53B50" +let g:base16_gui08 = "B53B50" +let s:gui09 = "E4600E" +let g:base16_gui09 = "E4600E" +let s:gui0A = "DAE84D" +let g:base16_gui0A = "DAE84D" +let s:gui0B = "06EA61" +let g:base16_gui0B = "06EA61" +let s:gui0C = "7CEDE9" +let g:base16_gui0C = "7CEDE9" +let s:gui0D = "03AEFF" +let g:base16_gui0D = "03AEFF" +let s:gui0E = "EA5CE2" +let g:base16_gui0E = "EA5CE2" +let s:gui0F = "9D4D0E" +let g:base16_gui0F = "9D4D0E" + +" 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 = "#040404" + let g:terminal_color_1 = "#B53B50" + let g:terminal_color_2 = "#06EA61" + let g:terminal_color_3 = "#DAE84D" + let g:terminal_color_4 = "#03AEFF" + let g:terminal_color_5 = "#EA5CE2" + let g:terminal_color_6 = "#7CEDE9" + let g:terminal_color_7 = "#DFDBDF" + let g:terminal_color_8 = "#61507A" + let g:terminal_color_9 = "#B53B50" + let g:terminal_color_10 = "#06EA61" + let g:terminal_color_11 = "#DAE84D" + let g:terminal_color_12 = "#03AEFF" + let g:terminal_color_13 = "#EA5CE2" + let g:terminal_color_14 = "#7CEDE9" + let g:terminal_color_15 = "#FFFBFF" + 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 +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#040404", + \ "#B53B50", + \ "#06EA61", + \ "#DAE84D", + \ "#03AEFF", + \ "#EA5CE2", + \ "#7CEDE9", + \ "#DFDBDF", + \ "#61507A", + \ "#B53B50", + \ "#06EA61", + \ "#DAE84D", + \ "#03AEFF", + \ "#EA5CE2", + \ "#7CEDE9", + \ "#FFFBFF", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-synth-midnight-dark" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l: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 l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l: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-tomorrow-night-eighties.vim b/colors/base16-tomorrow-night-eighties.vim new file mode 100644 index 0000000..3f21a6b --- /dev/null +++ b/colors/base16-tomorrow-night-eighties.vim @@ -0,0 +1,413 @@ +" vi:syntax=vim + +" base16-vim (https://github.com/chriskempson/base16-vim) +" by Chris Kempson (http://chriskempson.com) +" Tomorrow Night scheme by Chris Kempson (http://chriskempson.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-tomorrow-night-eighties.sh" + endif +endif + +" GUI color definitions +let s:gui00 = "2d2d2d" +let g:base16_gui00 = "2d2d2d" +let s:gui01 = "393939" +let g:base16_gui01 = "393939" +let s:gui02 = "515151" +let g:base16_gui02 = "515151" +let s:gui03 = "999999" +let g:base16_gui03 = "999999" +let s:gui04 = "b4b7b4" +let g:base16_gui04 = "b4b7b4" +let s:gui05 = "cccccc" +let g:base16_gui05 = "cccccc" +let s:gui06 = "e0e0e0" +let g:base16_gui06 = "e0e0e0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "f2777a" +let g:base16_gui08 = "f2777a" +let s:gui09 = "f99157" +let g:base16_gui09 = "f99157" +let s:gui0A = "ffcc66" +let g:base16_gui0A = "ffcc66" +let s:gui0B = "99cc99" +let g:base16_gui0B = "99cc99" +let s:gui0C = "66cccc" +let g:base16_gui0C = "66cccc" +let s:gui0D = "6699cc" +let g:base16_gui0D = "6699cc" +let s:gui0E = "cc99cc" +let g:base16_gui0E = "cc99cc" +let s:gui0F = "a3685a" +let g:base16_gui0F = "a3685a" + +" 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 = "#2d2d2d" + let g:terminal_color_1 = "#f2777a" + let g:terminal_color_2 = "#99cc99" + let g:terminal_color_3 = "#ffcc66" + let g:terminal_color_4 = "#6699cc" + let g:terminal_color_5 = "#cc99cc" + let g:terminal_color_6 = "#66cccc" + let g:terminal_color_7 = "#cccccc" + let g:terminal_color_8 = "#999999" + let g:terminal_color_9 = "#f2777a" + let g:terminal_color_10 = "#99cc99" + let g:terminal_color_11 = "#ffcc66" + let g:terminal_color_12 = "#6699cc" + let g:terminal_color_13 = "#cc99cc" + let g:terminal_color_14 = "#66cccc" + let g:terminal_color_15 = "#ffffff" + 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 +elseif has('terminal') + let g:terminal_ansi_colors = [ + \ "#2d2d2d", + \ "#f2777a", + \ "#99cc99", + \ "#ffcc66", + \ "#6699cc", + \ "#cc99cc", + \ "#66cccc", + \ "#cccccc", + \ "#999999", + \ "#f2777a", + \ "#99cc99", + \ "#ffcc66", + \ "#6699cc", + \ "#cc99cc", + \ "#66cccc", + \ "#ffffff", + \ ] +endif + +" Theme setup +hi clear +syntax reset +let g:colors_name = "base16-tomorrow-night-eighties" + +" Highlighting function +" Optional variables are attributes and guisp +function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) + let l:attr = get(a:, 1, "") + let l: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 l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr + endif + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l: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-tomorrow-night.vim b/colors/base16-tomorrow-night.vim index b969491..033d47e 100644 --- a/colors/base16-tomorrow-night.vim +++ b/colors/base16-tomorrow-night.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-tomorrow-night" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim index 4f6a04a..443ada0 100644 --- a/colors/base16-tomorrow.vim +++ b/colors/base16-tomorrow.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-tomorrow" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim index 0b7b105..26dcb56 100644 --- a/colors/base16-tube.vim +++ b/colors/base16-tube.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-tube" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim index ef0096c..77bedf4 100644 --- a/colors/base16-twilight.vim +++ b/colors/base16-twilight.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-twilight" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim index 17656c7..5fee945 100644 --- a/colors/base16-unikitty-dark.vim +++ b/colors/base16-unikitty-dark.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-unikitty-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim index fb3fc04..c777210 100644 --- a/colors/base16-unikitty-light.vim +++ b/colors/base16-unikitty-light.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-unikitty-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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim index 8061a52..64cb615 100644 --- a/colors/base16-woodland.vim +++ b/colors/base16-woodland.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-woodland" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim index fee62d6..7cd046a 100644 --- a/colors/base16-xcode-dusk.vim +++ b/colors/base16-xcode-dusk.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-xcode-dusk" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim index 1ede04f..8379430 100644 --- a/colors/base16-zenburn.vim +++ b/colors/base16-zenburn.vim @@ -150,8 +150,8 @@ let g:colors_name = "base16-zenburn" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction diff --git a/templates/default.mustache b/templates/default.mustache index e6f8a92..e0b612c 100644 --- a/templates/default.mustache +++ b/templates/default.mustache @@ -150,8 +150,8 @@ let g:colors_name = "base16-{{scheme-slug}}" " 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, "") + let l:attr = get(a:, 1, "") + let l:guisp = get(a:, 2, "") if a:guifg != "" exec "hi " . a:group . " guifg=#" . a:guifg @@ -165,11 +165,11 @@ function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) if a:ctermbg != "" exec "hi " . a:group . " ctermbg=" . a:ctermbg endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + if l:attr != "" + exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr endif - if a:guisp != "" - exec "hi " . a:group . " guisp=#" . a:guisp + if l:guisp != "" + exec "hi " . a:group . " guisp=#" . l:guisp endif endfunction |