Skip to content

Commit

Permalink
vim: update dracula/vim
Browse files Browse the repository at this point in the history
With the merge of dracula/vim#321, my hacks in
after are no longer necessary and can be moved where they belong:
dracula customization. This is better than using g:colors_name directly
in the removed conditionals because the variable is absent during syntax
enable in my vimrc. We also remove the redundant
bk#dracula#should_abort. (Technically the dracula pro changes haven't
been released yet, but I have access to them.)
  • Loading branch information
benknoble committed Apr 14, 2024
1 parent 386bbdd commit a08497c
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 31 deletions.
4 changes: 0 additions & 4 deletions links/vim/after/syntax/clojure.vim
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ syn keyword clojureFunc comp conceal cchar=←

syn keyword clojureMacro and conceal cchar=
syn keyword clojureMacro or conceal cchar=

if ! bk#dracula#should_abort('clojure')
hi link clojureParen DraculaSubtle
endif
4 changes: 0 additions & 4 deletions links/vim/after/syntax/lisp.vim
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,3 @@ syn keyword lispFunc and conceal cchar=∧
syn keyword lispFunc or conceal cchar=
syn keyword lispFunc nil conceal cchar=
syn keyword lispFunc cons conceal cchar=.

if ! bk#dracula#should_abort('lisp')
hi link lispParen DraculaSubtle
endif
3 changes: 0 additions & 3 deletions links/vim/after/syntax/racket-info.vim

This file was deleted.

4 changes: 0 additions & 4 deletions links/vim/after/syntax/racket.vim
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,3 @@ syntax keyword racketFunc compose1 conceal cchar=←

syntax keyword racketSyntax and conceal cchar=
syntax keyword racketSyntax or conceal cchar=

if ! bk#dracula#should_abort('racket')
highlight link racketParen DraculaSubtle
endif
3 changes: 0 additions & 3 deletions links/vim/after/syntax/scheme.vim

This file was deleted.

3 changes: 0 additions & 3 deletions links/vim/after/syntax/scribble.vim

This file was deleted.

5 changes: 0 additions & 5 deletions links/vim/autoload/bk/dracula.vim

This file was deleted.

15 changes: 11 additions & 4 deletions links/vim/vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ command SLShort call s:status_line('short')

SLShort

function! s:set_statusline_colors_to_dracula() abort
function! s:set_colors_to_dracula() abort
" Override statusline
hi clear StatusLine
hi clear StatusLineNC
Expand All @@ -254,9 +254,16 @@ function! s:set_statusline_colors_to_dracula() abort
hi link User3 DraculaCyan
hi link User4 DraculaRed
hi link User5 DraculaOrange

highlight link racketParen DraculaSubtle
highlight link clojureParen DraculaSubtle
highlight link lispParen DraculaSubtle
highlight link infoParen DraculaSubtle
highlight link schemeParentheses DraculaSubtle
highlight link scribbleParen DraculaSubtle
endfunction

function! s:set_statusline_colors_to_flattened() abort
function! s:set_colors_to_flattened() abort
" Override statusline
highlight clear StatusLine
highlight clear StatusLineNC
Expand All @@ -277,8 +284,8 @@ endfunction
if has('autocmd')
augroup status_colors
autocmd!
autocmd ColorScheme dracula* call s:set_statusline_colors_to_dracula()
autocmd ColorScheme flattened_light call s:set_statusline_colors_to_flattened()
autocmd ColorScheme dracula* call s:set_colors_to_dracula()
autocmd ColorScheme flattened_light call s:set_colors_to_flattened()
augroup end
endif
" }}}
Expand Down

0 comments on commit a08497c

Please sign in to comment.