From 2a323d1c35fdcaab9567724601afc8c70bca0bdb Mon Sep 17 00:00:00 2001 From: Stefan Wimmer Date: Tue, 1 Jun 2021 09:47:19 +0200 Subject: [PATCH 1/1] Add support for GitSigns --- colors/artesanal.vim | 46 ++++++++++++++++++++++++++++----- doc/artesanal.txt | 2 +- templates/_common.colortemplate | 10 +++++++ 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/colors/artesanal.vim b/colors/artesanal.vim index 72a33e5..faf2596 100644 --- a/colors/artesanal.vim +++ b/colors/artesanal.vim @@ -4,7 +4,7 @@ " Maintainer: Stefan Wimmer " Website: https://github.com/wimstefan/vim-artesanal " License: Vim License (see `:help license`) -" Last Updated: Thu 25 Feb 2021 05:07:02 PM CET +" Last Updated: Mon 31 May 2021 07:16:59 PM CEST " Generated by Colortemplate v2.1.0 @@ -16,9 +16,7 @@ let s:italics = (&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('n if (has('termguicolors') && &termguicolors) || has('gui_running') if &background ==# 'dark' - let g:terminal_ansi_colors = ['#575c66', '#ff616f', '#69f0b9', '#ffff8d', - \ '#90caf9', '#b39ddb', '#80deea', '#ffffff', '#1c313a', '#ef5350', - \ '#15cf83', '#ffeb3b', '#5d99c6', '#9575cd', '#4dd0e1', '#eff1f4'] + let g:terminal_ansi_colors = ['#575c66', '#ff616f', '#69f0b9', '#ffff8d', '#90caf9', '#b39ddb', '#80deea', '#ffffff', '#1c313a', '#ef5350', '#15cf83', '#ffeb3b', '#5d99c6', '#9575cd', '#4dd0e1', '#eff1f4'] if has('nvim') let g:terminal_color_0 = '#575c66' let g:terminal_color_1 = '#ff616f' @@ -176,6 +174,12 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi VisualMode guifg=#ffff8d guibg=#2e3440 gui=reverse cterm=reverse hi CommandMode guifg=#b39ddb guibg=#2e3440 gui=reverse cterm=reverse hi Warnings guifg=#ffff8d guibg=#2e3440 gui=reverse cterm=reverse + hi GitSignsAdd guifg=#69f0b9 guibg=#37474f gui=NONE cterm=NONE + hi! link GitSignsAddNr GitSignsAdd + hi GitSignsChange guifg=#90caf9 guibg=#37474f gui=NONE cterm=NONE + hi! link GitSignsChangeNr GitSignsChange + hi GitSignsDelete guifg=#ff616f guibg=#37474f gui=NONE cterm=NONE + hi! link GitSignsDeleteNr GitSignsDelete if !s:italics hi Folded gui=NONE cterm=NONE hi SpellBad gui=undercurl cterm=underline @@ -191,9 +195,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') finish endif " Light background - let g:terminal_ansi_colors = ['#1c313a', '#99000d', '#0c7047', '#cc6c0b', - \ '#064578', '#5f468a', '#198b9a', '#eff1f4', '#575c66', '#b2000f', - \ '#0e8756', '#ff870e', '#0961a8', '#7a5ab2', '#1d9fb0', '#ffffff'] + let g:terminal_ansi_colors = ['#1c313a', '#99000d', '#0c7047', '#cc6c0b', '#064578', '#5f468a', '#198b9a', '#eff1f4', '#575c66', '#b2000f', '#0e8756', '#ff870e', '#0961a8', '#7a5ab2', '#1d9fb0', '#ffffff'] if has('nvim') let g:terminal_color_0 = '#1c313a' let g:terminal_color_1 = '#99000d' @@ -351,6 +353,12 @@ if (has('termguicolors') && &termguicolors) || has('gui_running') hi VisualMode guifg=#ff870e guibg=#eff1f4 gui=reverse cterm=reverse hi CommandMode guifg=#7a5ab2 guibg=#eff1f4 gui=reverse cterm=reverse hi Warnings guifg=#ff870e guibg=#eff1f4 gui=reverse cterm=reverse + hi GitSignsAdd guifg=#0e8756 guibg=#e4e6eb gui=NONE cterm=NONE + hi! link GitSignsAddNr GitSignsAdd + hi GitSignsChange guifg=#0961a8 guibg=#e4e6eb gui=NONE cterm=NONE + hi! link GitSignsChangeNr GitSignsChange + hi GitSignsDelete guifg=#b2000f guibg=#e4e6eb gui=NONE cterm=NONE + hi! link GitSignsDeleteNr GitSignsDelete if !s:italics hi Folded gui=NONE cterm=NONE hi SpellBad gui=undercurl cterm=underline @@ -516,6 +524,12 @@ if s:t_Co >= 256 hi VisualMode ctermfg=228 ctermbg=236 cterm=reverse hi CommandMode ctermfg=140 ctermbg=236 cterm=reverse hi Warnings ctermfg=228 ctermbg=236 cterm=reverse + hi GitSignsAdd ctermfg=85 ctermbg=238 cterm=NONE + hi! link GitSignsAddNr GitSignsAdd + hi GitSignsChange ctermfg=153 ctermbg=238 cterm=NONE + hi! link GitSignsChangeNr GitSignsChange + hi GitSignsDelete ctermfg=203 ctermbg=238 cterm=NONE + hi! link GitSignsDeleteNr GitSignsDelete if has('nvim') hi! link TermCursor Cursor hi TermCursorNC ctermfg=238 ctermbg=254 cterm=NONE @@ -663,6 +677,12 @@ if s:t_Co >= 256 hi VisualMode ctermfg=208 ctermbg=255 cterm=reverse hi CommandMode ctermfg=97 ctermbg=255 cterm=reverse hi Warnings ctermfg=208 ctermbg=255 cterm=reverse + hi GitSignsAdd ctermfg=29 ctermbg=254 cterm=NONE + hi! link GitSignsAddNr GitSignsAdd + hi GitSignsChange ctermfg=25 ctermbg=254 cterm=NONE + hi! link GitSignsChangeNr GitSignsChange + hi GitSignsDelete ctermfg=124 ctermbg=254 cterm=NONE + hi! link GitSignsDeleteNr GitSignsDelete if has('nvim') hi! link TermCursor Cursor hi TermCursorNC ctermfg=254 ctermbg=238 cterm=NONE @@ -812,6 +832,12 @@ if s:t_Co >= 16 hi VisualMode ctermfg=Yellow ctermbg=Black cterm=reverse hi CommandMode ctermfg=Magenta ctermbg=Black cterm=reverse hi Warnings ctermfg=Yellow ctermbg=Black cterm=reverse + hi GitSignsAdd ctermfg=Green ctermbg=Black cterm=NONE + hi! link GitSignsAddNr GitSignsAdd + hi GitSignsChange ctermfg=Blue ctermbg=Black cterm=NONE + hi! link GitSignsChangeNr GitSignsChange + hi GitSignsDelete ctermfg=Red ctermbg=Black cterm=NONE + hi! link GitSignsDeleteNr GitSignsDelete if has('nvim') hi! link TermCursor Cursor hi TermCursorNC ctermfg=Black ctermbg=White cterm=NONE @@ -959,6 +985,12 @@ if s:t_Co >= 16 hi VisualMode ctermfg=Yellow ctermbg=White cterm=reverse hi CommandMode ctermfg=Magenta ctermbg=White cterm=reverse hi Warnings ctermfg=Yellow ctermbg=White cterm=reverse + hi GitSignsAdd ctermfg=Green ctermbg=White cterm=NONE + hi! link GitSignsAddNr GitSignsAdd + hi GitSignsChange ctermfg=Blue ctermbg=White cterm=NONE + hi! link GitSignsChangeNr GitSignsChange + hi GitSignsDelete ctermfg=Red ctermbg=White cterm=NONE + hi! link GitSignsDeleteNr GitSignsDelete if has('nvim') hi! link TermCursor Cursor hi TermCursorNC ctermfg=White ctermbg=Black cterm=NONE diff --git a/doc/artesanal.txt b/doc/artesanal.txt index 02dea0f..9d1b33c 100644 --- a/doc/artesanal.txt +++ b/doc/artesanal.txt @@ -1,4 +1,4 @@ -*artesanal.txt* For Vim version 8.2 Last change: 2021 Feb 25 +*artesanal.txt* For Vim version 8.2 Last change: 2021 May 31 Artesanal color scheme by Stefan Wimmer diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate index f67832f..2fe7cf0 100644 --- a/templates/_common.colortemplate +++ b/templates/_common.colortemplate @@ -159,6 +159,16 @@ CommandMode magenta bg0 reverse Warnings yellow bg0 reverse ; }}} +; Plugin support {{{ +; GitSigns +GitSignsAdd green bg1 +GitSignsAddNr -> GitSignsAdd +GitSignsChange blue bg1 +GitSignsChangeNr -> GitSignsChange +GitSignsDelete red bg1 +GitSignsDeleteNr -> GitSignsDelete +; }}} + ; Terminal colors {{{ TermCursor -> Cursor TermCursorNC bg1 fg1 -- 2.39.5