]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / vim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 35621af)
Add support for GitSigns
authorStefan Wimmer <wimstefan@gmail.com>
Tue, 1 Jun 2021 07:47:19 +0000 (09:47 +0200)
committerStefan Wimmer <wimstefan@gmail.com>
Tue, 1 Jun 2021 07:47:19 +0000 (09:47 +0200)
colors/artesanal.vim patch | blob | history
doc/artesanal.txt patch | blob | history
templates/_common.colortemplate patch | blob | history

diff --git a/colors/artesanal.vim b/colors/artesanal.vim
index 72a33e542812a3dcf74f98218f82e7078772f2e8..faf2596b2cb5f5d34770ee4bc65bf30eb761073e 100644 (file)
--- a/colors/artesanal.vim
+++ b/colors/artesanal.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Stefan Wimmer <wimstefan@gmail.com>
 " Website:      https://github.com/wimstefan/vim-artesanal
 " License:      Vim License (see `:help license`)
 " Maintainer:   Stefan Wimmer <wimstefan@gmail.com>
 " 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
 
 
 " Generated by Colortemplate v2.1.0
 
@@ -16,9 +16,7 @@ let s:italics = (&t_ZH != '' && &t_ZH != '\e[7m') || has('gui_running') || has('n
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
   if &background ==# 'dark'
 
 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'
     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 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
     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
     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'
   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 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
   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 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
     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 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
   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 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
     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 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
   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 02dea0f18bca4aef5878ccc6eec12a5f5cb64b69..9d1b33c864077f8138b9b0ceb19a2f7c680f3679 100644 (file)
--- 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 <wimstefan@gmail.com>
 
 
                 Artesanal color scheme    by Stefan Wimmer <wimstefan@gmail.com>
diff --git a/templates/_common.colortemplate b/templates/_common.colortemplate
index f67832fa9e4eb42259c9d908899c9ea48aa92624..2fe7cf0fed5ed36c9f33dd4e1618822609b85959 100644 (file)
--- a/templates/_common.colortemplate
+++ b/templates/_common.colortemplate
@@ -159,6 +159,16 @@ CommandMode                      magenta      bg0        reverse
 Warnings                         yellow       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
 ; Terminal colors {{{
 TermCursor                    -> Cursor
 TermCursorNC                     bg1          fg1
vim configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.