Update dotfiles/.vim/autoload/lightline/colorscheme/Betelgeuse.vim, dotfiles/.local/share/chezmoi/dot_vim/autoload/lightline/colorscheme/Betelgeuse.vim, dotfiles/.local/share/chezmoi/.chezmoiexternal.toml, dotfiles/.local/share/chezmoi/dot_vim/colors/Betelgeuse.vim, dotfiles/.local/share/chezmoi/dot_vim/vimrc

This commit is contained in:
Brian Zalewski 2022-11-22 17:33:42 +00:00
parent 023e8bcc14
commit 3ec44faf2a
5 changed files with 372 additions and 12 deletions

View file

@ -51,6 +51,10 @@
type = "file" type = "file"
url = "https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.zsh" url = "https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.zsh"
refreshPeriod = "{{ $refreshPeriod }}" refreshPeriod = "{{ $refreshPeriod }}"
[".vim/autoload/plug.vim"]
type = "file"
url = "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
refreshPeriod = "{{ $refreshPeriod }}"
### Neovim ### Neovim
[".config/nvim"] [".config/nvim"]

View file

@ -1,8 +1,8 @@
if &background == 'dark' if &background == 'dark'
let s:guishade0 = "#161925" let s:guishade0 = "#161925"
let s:guishade1 = "#2f323e" let s:guishade1 = "#2f323e"
let s:guishade2 = "#474b56" let s:guishade2 = "#474b56"
@ -35,13 +35,13 @@
let s:accent5 = 117 let s:accent5 = 117
let s:accent6 = 188 let s:accent6 = 188
let s:accent7 = 175 let s:accent7 = 175
endif
endif
if &background == 'light' if &background == 'light'
let s:guishade0 = "#ffffff" let s:guishade0 = "#ffffff"
let s:guishade1 = "#e5e6e7" let s:guishade1 = "#e5e6e7"
let s:guishade2 = "#cccdcf" let s:guishade2 = "#cccdcf"
@ -74,9 +74,9 @@
let s:accent5 = 153 let s:accent5 = 153
let s:accent6 = 239 let s:accent6 = 239
let s:accent7 = 211 let s:accent7 = 211
endif endif
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:p.normal.left = [ [ s:guishade1, s:guiaccent5, s:shade1, s:accent5 ], [ s:guishade7, s:guishade2, s:shade7, s:shade2 ] ] let s:p.normal.left = [ [ s:guishade1, s:guiaccent5, s:shade1, s:accent5 ], [ s:guishade7, s:guishade2, s:shade7, s:shade2 ] ]
@ -95,4 +95,4 @@
let s:p.normal.error = [ [ s:guiaccent0, s:guishade0, s:accent0, s:shade0 ] ] let s:p.normal.error = [ [ s:guiaccent0, s:guishade0, s:accent0, s:shade0 ] ]
let s:p.normal.warning = [ [ s:guiaccent2, s:guishade1, s:accent2, s:shade1 ] ] let s:p.normal.warning = [ [ s:guiaccent2, s:guishade1, s:accent2, s:shade1 ] ]
let g:lightline#colorscheme#ThemerVimLightline#palette = lightline#colorscheme#fill(s:p) let g:lightline#colorscheme#Betelgeuse#palette = lightline#colorscheme#fill(s:p)

View file

@ -0,0 +1,258 @@
if &background == 'dark'
let s:guishade0 = "#161925"
let s:guishade1 = "#2f323e"
let s:guishade2 = "#474b56"
let s:guishade3 = "#60646f"
let s:guishade4 = "#797c87"
let s:guishade5 = "#9295a0"
let s:guishade6 = "#aaaeb8"
let s:guishade7 = "#c3c7d1"
let s:guiaccent0 = "#ed254e"
let s:guiaccent1 = "#dcdfe4"
let s:guiaccent2 = "#f9dc5c"
let s:guiaccent3 = "#71f79f"
let s:guiaccent4 = "#00c1e4"
let s:guiaccent5 = "#7cb7ff"
let s:guiaccent6 = "#c3c7d1"
let s:guiaccent7 = "#c74d89"
let s:ctermshade0 = 234
let s:ctermshade1 = 59
let s:ctermshade2 = 239
let s:ctermshade3 = 102
let s:ctermshade4 = 244
let s:ctermshade5 = 145
let s:ctermshade6 = 249
let s:ctermshade7 = 188
let s:ctermaccent0 = 204
let s:ctermaccent1 = 254
let s:ctermaccent2 = 222
let s:ctermaccent3 = 121
let s:ctermaccent4 = 44
let s:ctermaccent5 = 117
let s:ctermaccent6 = 188
let s:ctermaccent7 = 175
endif
if &background == 'light'
let s:guishade0 = "#ffffff"
let s:guishade1 = "#e5e6e7"
let s:guishade2 = "#cccdcf"
let s:guishade3 = "#b2b4b7"
let s:guishade4 = "#999ba0"
let s:guishade5 = "#7f8288"
let s:guishade6 = "#666970"
let s:guishade7 = "#4c5058"
let s:guiaccent0 = "#ff4972"
let s:guiaccent1 = "#dcdfe4"
let s:guiaccent2 = "#ffff80"
let s:guiaccent3 = "#95ffc3"
let s:guiaccent4 = "#24e5ff"
let s:guiaccent5 = "#a0dbff"
let s:guiaccent6 = "#4c5058"
let s:guiaccent7 = "#eb71ad"
let s:ctermshade0 = 231
let s:ctermshade1 = 254
let s:ctermshade2 = 15
let s:ctermshade3 = 249
let s:ctermshade4 = 247
let s:ctermshade5 = 244
let s:ctermshade6 = 242
let s:ctermshade7 = 239
let s:ctermaccent0 = 204
let s:ctermaccent1 = 254
let s:ctermaccent2 = 229
let s:ctermaccent3 = 158
let s:ctermaccent4 = 81
let s:ctermaccent5 = 153
let s:ctermaccent6 = 239
let s:ctermaccent7 = 211
endif
highlight clear
syntax reset
let g:colors_name = "Betelgeuse"
""""""""""
" Normal "
""""""""""
exec "hi Normal guifg=".s:guishade6." guibg=".s:guishade0
exec "hi Normal ctermfg=".s:ctermshade6." ctermbg=".s:ctermshade0
"""""""""""""""""
" Syntax groups "
"""""""""""""""""
" Default
exec "hi Comment guifg=".s:guishade2
exec "hi Comment ctermfg=".s:ctermshade2
exec "hi Constant guifg=".s:guiaccent3
exec "hi Constant ctermfg=".s:ctermaccent3
exec "hi Character guifg=".s:guiaccent4
exec "hi Character ctermfg=".s:ctermaccent4
exec "hi Identifier guifg=".s:guiaccent2." gui=none"
exec "hi Identifier ctermfg=".s:ctermaccent2." cterm=none"
exec "hi Statement guifg=".s:guiaccent5
exec "hi Statement ctermfg=".s:ctermaccent5
exec "hi PreProc guifg=".s:guiaccent6
exec "hi PreProc ctermfg=".s:ctermaccent6
exec "hi Type guifg=".s:guiaccent7
exec "hi Type ctermfg=".s:ctermaccent7
exec "hi Special guifg=".s:guiaccent4
exec "hi Special ctermfg=".s:ctermaccent4
exec "hi Underlined guifg=".s:guiaccent5
exec "hi Underlined ctermfg=".s:ctermaccent5
exec "hi Error guifg=".s:guiaccent0." guibg=".s:guishade1
exec "hi Error ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade1
exec "hi Todo guifg=".s:guiaccent0." guibg=".s:guishade1
exec "hi Todo ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade1
exec "hi Function guifg=".s:guiaccent1
exec "hi Function ctermfg=".s:ctermaccent1
" GitGutter
exec "hi GitGutterAdd guifg=".s:guiaccent3
exec "hi GitGutterAdd ctermfg=".s:ctermaccent3
exec "hi GitGutterChange guifg=".s:guiaccent2
exec "hi GitGutterChange ctermfg=".s:ctermaccent2
exec "hi GitGutterChangeDelete guifg=".s:guiaccent2
exec "hi GitGutterChangeDelete ctermfg=".s:ctermaccent2
exec "hi GitGutterDelete guifg=".s:guiaccent0
exec "hi GitGutterDelete ctermfg=".s:ctermaccent0
" fugitive
exec "hi gitcommitComment guifg=".s:guishade3
exec "hi gitcommitComment ctermfg=".s:ctermshade3
exec "hi gitcommitOnBranch guifg=".s:guishade3
exec "hi gitcommitOnBranch ctermfg=".s:ctermshade3
exec "hi gitcommitHeader guifg=".s:guishade5
exec "hi gitcommitHeader ctermfg=".s:ctermshade5
exec "hi gitcommitHead guifg=".s:guishade3
exec "hi gitcommitHead ctermfg=".s:ctermshade3
exec "hi gitcommitSelectedType guifg=".s:guiaccent3
exec "hi gitcommitSelectedType ctermfg=".s:ctermaccent3
exec "hi gitcommitSelectedFile guifg=".s:guiaccent3
exec "hi gitcommitSelectedFile ctermfg=".s:ctermaccent3
exec "hi gitcommitDiscardedType guifg=".s:guiaccent2
exec "hi gitcommitDiscardedType ctermfg=".s:ctermaccent2
exec "hi gitcommitDiscardedFile guifg=".s:guiaccent2
exec "hi gitcommitDiscardedFile ctermfg=".s:ctermaccent2
exec "hi gitcommitUntrackedFile guifg=".s:guiaccent0
exec "hi gitcommitUntrackedFile ctermfg=".s:ctermaccent0
"""""""""""""""""""""""
" Highlighting Groups "
"""""""""""""""""""""""
" Default
exec "hi ColorColumn guibg=".s:guishade1
exec "hi ColorColumn ctermbg=".s:ctermshade1
exec "hi Conceal guifg=".s:guishade2
exec "hi Conceal ctermfg=".s:ctermshade2
exec "hi Cursor guifg=".s:guishade0
exec "hi Cursor ctermfg=".s:ctermshade0
exec "hi CursorColumn guibg=".s:guishade1
exec "hi CursorColumn ctermbg=".s:ctermshade1
exec "hi CursorLine guibg=".s:guishade1
exec "hi CursorLine ctermbg=".s:ctermshade1." cterm=none"
exec "hi Directory guifg=".s:guiaccent5
exec "hi Directory ctermfg=".s:ctermaccent5
exec "hi DiffAdd guifg=".s:guiaccent3." guibg=".s:guishade1
exec "hi DiffAdd ctermfg=".s:ctermaccent3." ctermbg=".s:ctermshade1
exec "hi DiffChange guifg=".s:guiaccent2." guibg=".s:guishade1
exec "hi DiffChange ctermfg=".s:ctermaccent2." ctermbg=".s:ctermshade1
exec "hi DiffDelete guifg=".s:guiaccent0." guibg=".s:guishade1
exec "hi DiffDelete ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade1
exec "hi DiffText guifg=".s:guiaccent2." guibg=".s:guishade2
exec "hi DiffText ctermfg=".s:ctermaccent2." ctermbg=".s:ctermshade2
exec "hi ErrorMsg guifg=".s:guishade7." guibg=".s:guiaccent0
exec "hi ErrorMsg ctermfg=".s:ctermshade7." ctermbg=".s:ctermaccent0
exec "hi VertSplit guifg=".s:guishade0." guibg=".s:guishade3
exec "hi VertSplit ctermfg=".s:ctermshade0." ctermbg=".s:ctermshade3
exec "hi Folded guifg=".s:guishade4." guibg=".s:guishade1
exec "hi Folded ctermfg=".s:ctermshade4." ctermbg=".s:ctermshade1
exec "hi FoldColumn guifg=".s:guishade4." guibg=".s:guishade1
exec "hi FoldColumn ctermfg=".s:ctermshade4." ctermbg=".s:ctermshade1
exec "hi SignColumn guibg=".s:guishade0
exec "hi SignColumn ctermbg=".s:ctermshade0
exec "hi IncSearch guifg=".s:guishade0." guibg=".s:guiaccent2
exec "hi IncSearch ctermfg=".s:ctermshade0." ctermbg=".s:ctermaccent2
exec "hi LineNr guifg=".s:guishade2." guibg=".s:guishade0
exec "hi LineNr ctermfg=".s:ctermshade2." ctermbg=".s:ctermshade0
exec "hi CursorLineNr guifg=".s:guishade3." guibg=".s:guishade1
exec "hi CursorLineNr ctermfg=".s:ctermshade3." ctermbg=".s:ctermshade1
exec "hi MatchParen guibg=".s:guishade2
exec "hi MatchParen ctermbg=".s:ctermshade2
exec "hi MoreMsg guifg=".s:guishade0." guibg=".s:guiaccent4
exec "hi MoreMsg ctermfg=".s:ctermshade0." ctermbg=".s:ctermaccent4
exec "hi NonText guifg=".s:guishade2." guibg=".s:guishade0
exec "hi NonText ctermfg=".s:ctermshade2." ctermbg=".s:ctermshade0
exec "hi Pmenu guifg=".s:guishade6." guibg=".s:guishade1
exec "hi Pmenu ctermfg=".s:ctermshade6." ctermbg=".s:ctermshade1
exec "hi PmenuSel guifg=".s:guiaccent4." guibg=".s:guishade1
exec "hi PmenuSel ctermfg=".s:ctermaccent4." ctermbg=".s:ctermshade1
exec "hi PmenuSbar guifg=".s:guiaccent3." guibg=".s:guishade1
exec "hi PmenuSbar ctermfg=".s:ctermaccent3." ctermbg=".s:ctermshade1
exec "hi PmenuThumb guifg=".s:guiaccent0." guibg=".s:guishade2
exec "hi PmenuThumb ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade2
exec "hi Question guifg=".s:guishade7." guibg=".s:guishade1
exec "hi Question ctermfg=".s:ctermshade7." ctermbg=".s:ctermshade1
exec "hi Search guifg=".s:guishade0." guibg=".s:guiaccent2
exec "hi Search ctermfg=".s:ctermshade0." ctermbg=".s:ctermaccent2
exec "hi SpecialKey guifg=".s:guiaccent7." guibg=".s:guishade0
exec "hi SpecialKey ctermfg=".s:ctermaccent7." ctermbg=".s:ctermshade0
exec "hi SpellBad guifg=".s:guiaccent0
exec "hi SpellBad ctermfg=".s:ctermaccent0." ctermbg=NONE cterm=undercurl"
exec "hi SpellCap guifg=".s:guiaccent2
exec "hi SpellCap ctermfg=".s:ctermaccent2." ctermbg=NONE cterm=undercurl"
exec "hi SpellLocal guifg=".s:guiaccent4
exec "hi SpellLocal ctermfg=".s:ctermaccent4
exec "hi SpellRare guifg=".s:guiaccent1
exec "hi SpellRare ctermfg=".s:ctermaccent1
exec "hi StatusLine guifg=".s:guishade4." guibg=".s:guishade1." gui=none"
exec "hi StatusLine ctermfg=".s:ctermshade4." ctermbg=".s:ctermshade1." cterm=none"
exec "hi TabLine guifg=".s:guishade5." guibg=".s:guishade1
exec "hi TabLine ctermfg=".s:ctermshade5." ctermbg=".s:ctermshade1
exec "hi TabLineFill guibg=".s:guishade1
exec "hi TabLineFill ctermbg=".s:ctermshade1
exec "hi TabLineSel guifg=".s:guishade6." guibg=".s:guishade0
exec "hi TabLineSel ctermfg=".s:ctermshade6." ctermbg=".s:ctermshade0
exec "hi Title guifg=".s:guiaccent5
exec "hi Title ctermfg=".s:ctermaccent5
exec "hi Visual guibg=".s:guishade1
exec "hi Visual ctermbg=".s:ctermshade1
exec "hi VisualNOS guifg=".s:guiaccent0." guibg=".s:guishade1
exec "hi VisualNOS ctermfg=".s:ctermaccent0." ctermbg=".s:ctermshade1
exec "hi WarningMsg guifg=".s:guiaccent0
exec "hi WarningMsg ctermfg=".s:ctermaccent0
exec "hi WildMenu guifg=".s:guiaccent4." guibg=".s:guishade1
exec "hi WildMenu ctermfg=".s:ctermaccent4." ctermbg=".s:ctermshade1
" NERDTree
exec "hi NERDTreeExecFile guifg=".s:guiaccent4
exec "hi NERDTreeExecFile ctermfg=".s:ctermaccent4
exec "hi NERDTreeDirSlash guifg=".s:guiaccent5
exec "hi NERDTreeDirSlash ctermfg=".s:ctermaccent5
exec "hi NERDTreeCWD guifg=".s:guiaccent0
exec "hi NERDTreeCWD ctermfg=".s:ctermaccent0
""""""""""""
" Clean up "
""""""""""""
unlet s:guishade0 s:guishade1 s:guishade2 s:guishade3 s:guishade4 s:guishade5 s:guishade6 s:guishade7 s:guiaccent0 s:guiaccent1 s:guiaccent2 s:guiaccent3 s:guiaccent4 s:guiaccent5 s:guiaccent6 s:guiaccent7
unlet s:ctermshade0 s:ctermshade1 s:ctermshade2 s:ctermshade3 s:ctermshade4 s:ctermshade5 s:ctermshade6 s:ctermshade7 s:ctermaccent0 s:ctermaccent1 s:ctermaccent2 s:ctermaccent3 s:ctermaccent4 s:ctermaccent5 s:ctermaccent6 s:ctermaccent7

View file

@ -32,8 +32,8 @@ call plug#end()
syntax enable syntax enable
set background=dark set background=dark
colorscheme betelgeuse colorscheme Betelgeuse
" set g:lightline = { 'colorscheme': 'ThemerVimLightline' } " set g:lightline = { 'colorscheme': 'Betelgeuse' }
" Settings for plugin https://github.com/neoclide/coc.nvim.git " Settings for plugin https://github.com/neoclide/coc.nvim.git
autocmd FileType json syntax match Comment +\/\/.\+$+ autocmd FileType json syntax match Comment +\/\/.\+$+

View file

@ -0,0 +1,98 @@
if &background == 'dark'
let s:guishade0 = "#161925"
let s:guishade1 = "#2f323e"
let s:guishade2 = "#474b56"
let s:guishade3 = "#60646f"
let s:guishade4 = "#797c87"
let s:guishade5 = "#9295a0"
let s:guishade6 = "#aaaeb8"
let s:guishade7 = "#c3c7d1"
let s:guiaccent0 = "#ed254e"
let s:guiaccent1 = "#dcdfe4"
let s:guiaccent2 = "#f9dc5c"
let s:guiaccent3 = "#71f79f"
let s:guiaccent4 = "#00c1e4"
let s:guiaccent5 = "#7cb7ff"
let s:guiaccent6 = "#c3c7d1"
let s:guiaccent7 = "#c74d89"
let s:shade0 = 234
let s:shade1 = 59
let s:shade2 = 239
let s:shade3 = 102
let s:shade4 = 244
let s:shade5 = 145
let s:shade6 = 249
let s:shade7 = 188
let s:accent0 = 204
let s:accent1 = 254
let s:accent2 = 222
let s:accent3 = 121
let s:accent4 = 44
let s:accent5 = 117
let s:accent6 = 188
let s:accent7 = 175
endif
if &background == 'light'
let s:guishade0 = "#ffffff"
let s:guishade1 = "#e5e6e7"
let s:guishade2 = "#cccdcf"
let s:guishade3 = "#b2b4b7"
let s:guishade4 = "#999ba0"
let s:guishade5 = "#7f8288"
let s:guishade6 = "#666970"
let s:guishade7 = "#4c5058"
let s:guiaccent0 = "#ff4972"
let s:guiaccent1 = "#dcdfe4"
let s:guiaccent2 = "#ffff80"
let s:guiaccent3 = "#95ffc3"
let s:guiaccent4 = "#24e5ff"
let s:guiaccent5 = "#a0dbff"
let s:guiaccent6 = "#4c5058"
let s:guiaccent7 = "#eb71ad"
let s:shade0 = 231
let s:shade1 = 254
let s:shade2 = 15
let s:shade3 = 249
let s:shade4 = 247
let s:shade5 = 244
let s:shade6 = 242
let s:shade7 = 239
let s:accent0 = 204
let s:accent1 = 254
let s:accent2 = 229
let s:accent3 = 158
let s:accent4 = 81
let s:accent5 = 153
let s:accent6 = 239
let s:accent7 = 211
endif
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:p.normal.left = [ [ s:guishade1, s:guiaccent5, s:shade1, s:accent5 ], [ s:guishade7, s:guishade2, s:shade7, s:shade2 ] ]
let s:p.normal.right = [ [ s:guishade1, s:guishade4, s:shade1, s:shade4 ], [ s:guishade5, s:guishade2, s:shade5, s:shade2 ] ]
let s:p.inactive.right = [ [ s:guishade1, s:guishade3, s:shade1, s:shade3 ], [ s:guishade3, s:guishade1, s:shade3, s:shade1 ] ]
let s:p.inactive.left = [ [ s:guishade4, s:guishade1, s:shade4, s:shade1 ], [ s:guishade3, s:guishade0, s:shade3, s:shade0 ] ]
let s:p.insert.left = [ [ s:guishade1, s:guiaccent3, s:shade1, s:accent3 ], [ s:guishade7, s:guishade2, s:shade7, s:shade2 ] ]
let s:p.replace.left = [ [ s:guishade1, s:guiaccent1, s:shade1, s:accent1 ], [ s:guishade7, s:guishade2, s:shade7, s:shade2 ] ]
let s:p.visual.left = [ [ s:guishade1, s:guiaccent6, s:shade1, s:accent6 ], [ s:guishade7, s:guishade2, s:shade7, s:shade2 ] ]
let s:p.normal.middle = [ [ s:guishade5, s:guishade1, s:shade5, s:shade1 ] ]
let s:p.inactive.middle = [ [ s:guishade4, s:guishade1, s:shade4, s:shade1 ] ]
let s:p.tabline.left = [ [ s:guishade6, s:guishade2, s:shade6, s:shade2 ] ]
let s:p.tabline.tabsel = [ [ s:guishade6, s:guishade0, s:shade6, s:shade0 ] ]
let s:p.tabline.middle = [ [ s:guishade2, s:guishade4, s:shade2, s:shade4 ] ]
let s:p.tabline.right = copy(s:p.normal.right)
let s:p.normal.error = [ [ s:guiaccent0, s:guishade0, s:accent0, s:shade0 ] ]
let s:p.normal.warning = [ [ s:guiaccent2, s:guishade1, s:accent2, s:shade1 ] ]
let g:lightline#colorscheme#Betelgeuse#palette = lightline#colorscheme#fill(s:p)