Remove color files & add additional completion sources
This commit is contained in:
parent
10469b1d42
commit
4dba4f2bb0
11 changed files with 35 additions and 8264 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,268 +0,0 @@
|
|||
" Initialisation:"{{{
|
||||
" ----------------------------------------------------------------------------
|
||||
hi clear
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
|
||||
let s:style = get(g:, 'ayucolor', 'dark')
|
||||
let g:colors_name = "ayu"
|
||||
"}}}
|
||||
|
||||
" Palettes:"{{{
|
||||
" ----------------------------------------------------------------------------
|
||||
|
||||
let s:palette = {}
|
||||
|
||||
let s:palette.bg = {'dark': "#0F1419", 'light': "#FAFAFA", 'mirage': "#212733"}
|
||||
|
||||
let s:palette.comment = {'dark': "#5C6773", 'light': "#ABB0B6", 'mirage': "#5C6773"}
|
||||
let s:palette.markup = {'dark': "#F07178", 'light': "#F07178", 'mirage': "#F07178"}
|
||||
let s:palette.constant = {'dark': "#FFEE99", 'light': "#A37ACC", 'mirage': "#D4BFFF"}
|
||||
let s:palette.operator = {'dark': "#E7C547", 'light': "#E7C547", 'mirage': "#80D4FF"}
|
||||
let s:palette.tag = {'dark': "#36A3D9", 'light': "#36A3D9", 'mirage': "#5CCFE6"}
|
||||
let s:palette.regexp = {'dark': "#95E6CB", 'light': "#4CBF99", 'mirage': "#95E6CB"}
|
||||
let s:palette.string = {'dark': "#B8CC52", 'light': "#86B300", 'mirage': "#BBE67E"}
|
||||
let s:palette.function = {'dark': "#FFB454", 'light': "#F29718", 'mirage': "#FFD57F"}
|
||||
let s:palette.special = {'dark': "#E6B673", 'light': "#E6B673", 'mirage': "#FFC44C"}
|
||||
let s:palette.keyword = {'dark': "#FF7733", 'light': "#FF7733", 'mirage': "#FFAE57"}
|
||||
|
||||
let s:palette.error = {'dark': "#FF3333", 'light': "#FF3333", 'mirage': "#FF3333"}
|
||||
let s:palette.accent = {'dark': "#F29718", 'light': "#FF6A00", 'mirage': "#FFCC66"}
|
||||
let s:palette.panel = {'dark': "#14191F", 'light': "#FFFFFF", 'mirage': "#272D38"}
|
||||
let s:palette.guide = {'dark': "#2D3640", 'light': "#D9D8D7", 'mirage': "#3D4751"}
|
||||
let s:palette.line = {'dark': "#151A1E", 'light': "#F3F3F3", 'mirage': "#242B38"}
|
||||
let s:palette.selection = {'dark': "#253340", 'light': "#F0EEE4", 'mirage': "#343F4C"}
|
||||
let s:palette.fg = {'dark': "#E6E1CF", 'light': "#5C6773", 'mirage': "#D9D7CE"}
|
||||
let s:palette.fg_idle = {'dark': "#3E4B59", 'light': "#828C99", 'mirage': "#607080"}
|
||||
|
||||
"}}}
|
||||
|
||||
" Highlighting Primitives:"{{{
|
||||
" ----------------------------------------------------------------------------
|
||||
|
||||
function! s:build_prim(hi_elem, field)
|
||||
let l:vname = "s:" . a:hi_elem . "_" . a:field " s:bg_gray
|
||||
let l:gui_assign = "gui".a:hi_elem."=".s:palette[a:field][s:style] " guibg=...
|
||||
exe "let " . l:vname . " = ' " . l:gui_assign . "'"
|
||||
endfunction
|
||||
|
||||
let s:bg_none = ' guibg=NONE ctermbg=NONE'
|
||||
let s:fg_none = ' guifg=NONE ctermfg=NONE'
|
||||
for [key_name, d_value] in items(s:palette)
|
||||
call s:build_prim('bg', key_name)
|
||||
call s:build_prim('fg', key_name)
|
||||
endfor
|
||||
" }}}
|
||||
|
||||
" Formatting Options:"{{{
|
||||
" ----------------------------------------------------------------------------
|
||||
let s:none = "NONE"
|
||||
let s:t_none = "NONE"
|
||||
let s:n = "NONE"
|
||||
let s:c = ",undercurl"
|
||||
let s:r = ",reverse"
|
||||
let s:s = ",standout"
|
||||
let s:b = ",bold"
|
||||
let s:u = ",underline"
|
||||
let s:i = ",italic"
|
||||
|
||||
exe "let s:fmt_none = ' gui=NONE". " cterm=NONE". " term=NONE" ."'"
|
||||
exe "let s:fmt_bold = ' gui=NONE".s:b. " cterm=NONE".s:b. " term=NONE".s:b ."'"
|
||||
exe "let s:fmt_bldi = ' gui=NONE".s:b. " cterm=NONE".s:b. " term=NONE".s:b ."'"
|
||||
exe "let s:fmt_undr = ' gui=NONE".s:u. " cterm=NONE".s:u. " term=NONE".s:u ."'"
|
||||
exe "let s:fmt_undb = ' gui=NONE".s:u.s:b. " cterm=NONE".s:u.s:b. " term=NONE".s:u.s:b."'"
|
||||
exe "let s:fmt_undi = ' gui=NONE".s:u. " cterm=NONE".s:u. " term=NONE".s:u ."'"
|
||||
exe "let s:fmt_curl = ' gui=NONE".s:c. " cterm=NONE".s:c. " term=NONE".s:c ."'"
|
||||
exe "let s:fmt_ital = ' gui=NONE".s:i. " cterm=NONE".s:i. " term=NONE".s:i ."'"
|
||||
exe "let s:fmt_stnd = ' gui=NONE".s:s. " cterm=NONE".s:s. " term=NONE".s:s ."'"
|
||||
exe "let s:fmt_revr = ' gui=NONE".s:r. " cterm=NONE".s:r. " term=NONE".s:r ."'"
|
||||
exe "let s:fmt_revb = ' gui=NONE".s:r.s:b. " cterm=NONE".s:r.s:b. " term=NONE".s:r.s:b."'"
|
||||
"}}}
|
||||
|
||||
|
||||
" Vim Highlighting: (see :help highlight-groups)"{{{
|
||||
" ----------------------------------------------------------------------------
|
||||
exe "hi! Normal" .s:fg_fg .s:bg_bg .s:fmt_none
|
||||
exe "hi! ColorColumn" .s:fg_none .s:bg_line .s:fmt_none
|
||||
" Conceal, Cursor, CursorIM
|
||||
exe "hi! CursorColumn" .s:fg_none .s:bg_line .s:fmt_none
|
||||
exe "hi! CursorLine" .s:fg_none .s:bg_line .s:fmt_none
|
||||
exe "hi! CursorLineNr" .s:fg_accent .s:bg_line .s:fmt_none
|
||||
exe "hi! LineNr" .s:fg_guide .s:bg_none .s:fmt_none
|
||||
|
||||
exe "hi! Directory" .s:fg_fg_idle .s:bg_none .s:fmt_none
|
||||
exe "hi! DiffAdd" .s:fg_string .s:bg_panel .s:fmt_none
|
||||
exe "hi! DiffChange" .s:fg_tag .s:bg_panel .s:fmt_none
|
||||
exe "hi! DiffText" .s:fg_fg .s:bg_panel .s:fmt_none
|
||||
exe "hi! ErrorMsg" .s:fg_fg .s:bg_error .s:fmt_stnd
|
||||
exe "hi! VertSplit" .s:fg_bg .s:bg_none .s:fmt_none
|
||||
exe "hi! Folded" .s:fg_fg_idle .s:bg_panel .s:fmt_none
|
||||
exe "hi! FoldColumn" .s:fg_none .s:bg_panel .s:fmt_none
|
||||
exe "hi! SignColumn" .s:fg_none .s:bg_panel .s:fmt_none
|
||||
" Incsearch"
|
||||
|
||||
exe "hi! MatchParen" .s:fg_fg .s:bg_bg .s:fmt_undr
|
||||
exe "hi! ModeMsg" .s:fg_string .s:bg_none .s:fmt_none
|
||||
exe "hi! MoreMsg" .s:fg_string .s:bg_none .s:fmt_none
|
||||
exe "hi! NonText" .s:fg_bg .s:bg_none .s:fmt_none
|
||||
exe "hi! Pmenu" .s:fg_fg .s:bg_selection .s:fmt_none
|
||||
exe "hi! PmenuSel" .s:fg_fg .s:bg_selection .s:fmt_revr
|
||||
" PmenuSbar"
|
||||
" PmenuThumb"
|
||||
exe "hi! Question" .s:fg_string .s:bg_none .s:fmt_none
|
||||
exe "hi! Search" .s:fg_bg .s:bg_constant .s:fmt_none
|
||||
exe "hi! SpecialKey" .s:fg_selection .s:bg_none .s:fmt_none
|
||||
exe "hi! SpellCap" .s:fg_tag .s:bg_none .s:fmt_undr
|
||||
exe "hi! SpellLocal" .s:fg_keyword .s:bg_none .s:fmt_undr
|
||||
exe "hi! SpellBad" .s:fg_error .s:bg_none .s:fmt_undr
|
||||
exe "hi! SpellRare" .s:fg_regexp .s:bg_none .s:fmt_undr
|
||||
exe "hi! StatusLine" .s:fg_fg .s:bg_panel .s:fmt_none
|
||||
exe "hi! StatusLineNC" .s:fg_fg_idle .s:bg_panel .s:fmt_none
|
||||
exe "hi! WildMenu" .s:fg_bg .s:bg_markup .s:fmt_none
|
||||
exe "hi! TabLine" .s:fg_fg .s:bg_panel .s:fmt_revr
|
||||
" TabLineFill"
|
||||
" TabLineSel"
|
||||
exe "hi! Title" .s:fg_keyword .s:bg_none .s:fmt_none
|
||||
exe "hi! Visual" .s:fg_none .s:bg_selection .s:fmt_none
|
||||
" VisualNos"
|
||||
exe "hi! WarningMsg" .s:fg_error .s:bg_none .s:fmt_none
|
||||
|
||||
" TODO LongLineWarning to use variables instead of hardcoding
|
||||
hi LongLineWarning guifg=NONE guibg=#371F1C gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
|
||||
" WildMenu"
|
||||
|
||||
"}}}
|
||||
|
||||
" Generic Syntax Highlighting: (see :help group-name)"{{{
|
||||
" ----------------------------------------------------------------------------
|
||||
exe "hi! Comment" .s:fg_comment .s:bg_none .s:fmt_none
|
||||
|
||||
exe "hi! Constant" .s:fg_constant .s:bg_none .s:fmt_none
|
||||
exe "hi! String" .s:fg_string .s:bg_none .s:fmt_none
|
||||
" Character"
|
||||
" Number"
|
||||
" Boolean"
|
||||
" Float"
|
||||
|
||||
exe "hi! Identifier" .s:fg_tag .s:bg_none .s:fmt_none
|
||||
exe "hi! Function" .s:fg_function .s:bg_none .s:fmt_none
|
||||
|
||||
exe "hi! Statement" .s:fg_keyword .s:bg_none .s:fmt_none
|
||||
" Conditional"
|
||||
" Repeat"
|
||||
" Label"
|
||||
exe "hi! Operator" .s:fg_operator .s:bg_none .s:fmt_none
|
||||
" Keyword"
|
||||
" Exception"
|
||||
|
||||
exe "hi! PreProc" .s:fg_special .s:bg_none .s:fmt_none
|
||||
" Include"
|
||||
" Define"
|
||||
" Macro"
|
||||
" PreCondit"
|
||||
|
||||
exe "hi! Type" .s:fg_tag .s:bg_none .s:fmt_none
|
||||
" StorageClass"
|
||||
exe "hi! Structure" .s:fg_special .s:bg_none .s:fmt_none
|
||||
" Typedef"
|
||||
|
||||
exe "hi! Special" .s:fg_special .s:bg_none .s:fmt_none
|
||||
" SpecialChar"
|
||||
" Tag"
|
||||
" Delimiter"
|
||||
" SpecialComment"
|
||||
" Debug"
|
||||
"
|
||||
exe "hi! Underlined" .s:fg_tag .s:bg_none .s:fmt_undr
|
||||
|
||||
exe "hi! Ignore" .s:fg_none .s:bg_none .s:fmt_none
|
||||
|
||||
exe "hi! Error" .s:fg_fg .s:bg_error .s:fmt_none
|
||||
|
||||
exe "hi! Todo" .s:fg_markup .s:bg_none .s:fmt_none
|
||||
|
||||
" Quickfix window highlighting
|
||||
exe "hi! qfLineNr" .s:fg_keyword .s:bg_none .s:fmt_none
|
||||
" qfFileName"
|
||||
" qfLineNr"
|
||||
" qfError"
|
||||
|
||||
exe "hi! Conceal" .s:fg_guide .s:bg_none .s:fmt_none
|
||||
exe "hi! CursorLineConceal" .s:fg_guide .s:bg_line .s:fmt_none
|
||||
|
||||
|
||||
" Terminal in NVIM
|
||||
" ---------
|
||||
if has("nvim")
|
||||
let g:terminal_color_0 = s:palette.bg[s:style]
|
||||
let g:terminal_color_1 = s:palette.markup[s:style]
|
||||
let g:terminal_color_2 = s:palette.string[s:style]
|
||||
let g:terminal_color_3 = s:palette.accent[s:style]
|
||||
let g:terminal_color_4 = s:palette.tag[s:style]
|
||||
let g:terminal_color_5 = s:palette.constant[s:style]
|
||||
let g:terminal_color_6 = s:palette.regexp[s:style]
|
||||
let g:terminal_color_7 = "#FFFFFF"
|
||||
let g:terminal_color_8 = s:palette.fg_idle[s:style]
|
||||
let g:terminal_color_9 = s:palette.error[s:style]
|
||||
let g:terminal_color_10 = s:palette.string[s:style]
|
||||
let g:terminal_color_11 = s:palette.accent[s:style]
|
||||
let g:terminal_color_12 = s:palette.tag[s:style]
|
||||
let g:terminal_color_13 = s:palette.constant[s:style]
|
||||
let g:terminal_color_14 = s:palette.regexp[s:style]
|
||||
let g:terminal_color_15 = s:palette.comment[s:style]
|
||||
let g:terminal_color_background = g:terminal_color_0
|
||||
let g:terminal_color_foreground = s:palette.fg[s:style]
|
||||
endif
|
||||
|
||||
|
||||
" NerdTree
|
||||
" ---------
|
||||
exe "hi! NERDTreeOpenable" .s:fg_fg_idle .s:bg_none .s:fmt_none
|
||||
exe "hi! NERDTreeClosable" .s:fg_accent .s:bg_none .s:fmt_none
|
||||
" exe "hi! NERDTreeBookmarksHeader" .s:fg_pink .s:bg_none .s:fmt_none
|
||||
" exe "hi! NERDTreeBookmarksLeader" .s:fg_bg .s:bg_none .s:fmt_none
|
||||
" exe "hi! NERDTreeBookmarkName" .s:fg_keyword .s:bg_none .s:fmt_none
|
||||
" exe "hi! NERDTreeCWD" .s:fg_pink .s:bg_none .s:fmt_none
|
||||
exe "hi! NERDTreeUp" .s:fg_fg_idle .s:bg_none .s:fmt_none
|
||||
exe "hi! NERDTreeDir" .s:fg_fg_idle .s:bg_none .s:fmt_none
|
||||
exe "hi! NERDTreeFile" .s:fg_fg_idle .s:bg_none .s:fmt_none
|
||||
exe "hi! NERDTreeDirSlash" .s:fg_guide .s:bg_none .s:fmt_none
|
||||
|
||||
|
||||
" GitGutter
|
||||
" ---------
|
||||
exe "hi! GitGutterAdd" .s:fg_string .s:bg_none .s:fmt_none
|
||||
exe "hi! GitGutterChange" .s:fg_tag .s:bg_none .s:fmt_none
|
||||
exe "hi! GitGutterDelete" .s:fg_markup .s:bg_none .s:fmt_none
|
||||
exe "hi! GitGutterChangeDelete" .s:fg_function .s:bg_none .s:fmt_none
|
||||
|
||||
"}}}
|
||||
|
||||
" Diff Syntax Highlighting:"{{{
|
||||
" ----------------------------------------------------------------------------
|
||||
" Diff
|
||||
" diffOldFile
|
||||
" diffNewFile
|
||||
" diffFile
|
||||
" diffOnly
|
||||
" diffIdentical
|
||||
" diffDiffer
|
||||
" diffBDiffer
|
||||
" diffIsA
|
||||
" diffNoEOL
|
||||
" diffCommon
|
||||
hi! link diffRemoved Constant
|
||||
" diffChanged
|
||||
hi! link diffAdded String
|
||||
" diffLine
|
||||
" diffSubname
|
||||
" diffComment
|
||||
|
||||
"}}}
|
||||
"
|
||||
" This is needed for some reason: {{{
|
||||
|
||||
let &background = s:style
|
||||
|
||||
" }}}
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
highlight clear
|
||||
if exists('syntax_on')
|
||||
syntax reset
|
||||
endif
|
||||
|
||||
let g:colors_name = 'breezy'
|
||||
|
||||
|
||||
|
||||
" Background Font color
|
||||
hi LineNr guibg=#31363b guifg=#7a7c7d gui=NONE
|
||||
hi FoldColumn guibg=#31363b guifg=#7a7c7d gui=NONE
|
||||
hi Folded guibg=#31363b guifg=#7a7c7d gui=NONE
|
||||
hi MatchParen guibg=#8e44ad guifg=#cfcfc2 gui=NONE
|
||||
hi signColumn guibg=#31363b guifg=#7a7c7d gui=NONE
|
||||
|
||||
hi Comment guibg=NONE guifg=#7a7c7d gui=NONE
|
||||
hi Conceal guibg=NONE guifg=#cfcfc2 gui=NONE
|
||||
hi Constant guibg=NONE guifg=#f67400 gui=NONE
|
||||
hi Boolean guibg=NONE guifg=#27aeae gui=NONE
|
||||
hi Debug guibg=NONE guifg=#a5a6a8 gui=bold
|
||||
hi Error guibg=#4d1f24 guifg=#95da4c gui=bold
|
||||
hi Identifier guibg=NONE guifg=#9b44ad gui=NONE
|
||||
hi Ignore guibg=NONE guifg=NONE gui=NONE
|
||||
hi Operator guibg=NONE guifg=NONE gui=bold
|
||||
hi PreProc guibg=NONE guifg=#27ae85 gui=NONE
|
||||
hi Special guibg=NONE guifg=#3daee9 gui=NONE
|
||||
hi SpecialComment guibg=NONE guifg=#a5a6a8 gui=NONE
|
||||
hi Statement guibg=NONE guifg=#fdbc4b gui=bold
|
||||
hi String guibg=NONE guifg=#27ae60 gui=NONE
|
||||
hi Todo guibg=#451e1a guifg=#ca9219 gui=NONE
|
||||
hi Type guibg=NONE guifg=#2980b9 gui=NONE
|
||||
hi Underlined guibg=NONE guifg=#27ae60 gui=underline
|
||||
|
||||
hi NonText guibg=NONE guifg=#7a7c7d gui=NONE
|
||||
|
||||
hi Pmenu guibg=#31363b guifg=#cfcfc2 gui=NONE
|
||||
hi PmenuSbar guibg=#606365 guifg=NONE gui=NONE
|
||||
hi PmenuSel guibg=#2d5c76 guifg=#cfcfc2 gui=NONE
|
||||
hi PmenuThumb guibg=#a8a9ab guifg=#a8a9ab gui=NONE
|
||||
|
||||
hi ErrorMsg guibg=#4d1f24 guifg=#95da4c gui=bold
|
||||
hi ModeMsg guibg=NONE guifg=NONE gui=bold
|
||||
hi MoreMsg guibg=NONE guifg=#fdbc4b gui=bold
|
||||
hi Question guibg=NONE guifg=#fdbc4b gui=bold
|
||||
hi WarningMsg guibg=NONE guifg=#ffffff gui=NONE
|
||||
|
||||
hi TabLine guibg=#31363b guifg=#7a7c7d gui=NONE
|
||||
hi TabLineFill guibg=#31363b guifg=#31363b gui=NONE
|
||||
hi TabLineSel guibg=#2d5c76 guifg=NONE gui=NONE
|
||||
|
||||
hi Cursor guibg=NONE guifg=NONE gui=reverse
|
||||
hi CursorColumn guibg=#2a2e32 guifg=NONE gui=NONE
|
||||
hi CursorLineNr guibg=#31363b guifg=#a5a6a8 gui=NONE
|
||||
hi CursorLine guibg=#2a2e32 guifg=NONE gui=NONE cterm=NONE
|
||||
|
||||
hi helpLeadBlank guibg=NONE guifg=NONE gui=NONE
|
||||
hi helpNormal guibg=NONE guifg=NONE gui=NONE
|
||||
|
||||
hi StatusLine guibg=#7a7c7d guifg=#2a2e32 gui=NONE
|
||||
hi StatusLineNC guibg=#7a7c7d guifg=#2a2e32 gui=NONE
|
||||
|
||||
hi Visual guibg=#2d5c76 guifg=NONE gui=NONE
|
||||
hi VisualNOS guibg=NONE guifg=NONE gui=underline
|
||||
|
||||
hi VertSplit guibg=#2d5c76 guifg=#2d5c76 gui=NONE
|
||||
hi WildMenu guibg=NONE guifg=NONE gui=NONE
|
||||
|
||||
hi SpecialKey guibg=NONE guifg=#7a7c7d gui=NONE
|
||||
hi Title guibg=NONE guifg=#ffffff gui=NONE
|
||||
|
||||
hi DiffAdd guibg=#123723 guifg=NONE gui=NONE
|
||||
hi DiffChange guibg=#424218 guifg=NONE gui=NONE
|
||||
hi DiffDelete guibg=#4d1f24 guifg=NONE gui=NONE
|
||||
hi DiffText guibg=NONE guifg=NONE gui=reverse
|
||||
|
||||
hi IncSearch guibg=#808021 guifg=#cfcfc2 gui=NONE
|
||||
hi Search guibg=#218058 guifg=#cfcfc2 gui=NONE
|
||||
|
||||
hi Directory guibg=NONE guifg=#ffffff gui=NONE
|
||||
|
||||
hi SpellBad guibg=NONE guifg=NONE gui=undercurl
|
||||
hi SpellCap guibg=NONE guifg=NONE gui=undercurl
|
||||
hi SpellLocal guibg=NONE guifg=NONE gui=undercurl
|
||||
hi SpellRare guibg=NONE guifg=NONE gui=undercurl
|
||||
|
||||
hi ColorColumn guibg=#2a2e32 guifg=NONE gui=NONE
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,234 +0,0 @@
|
|||
" -----------------------------------------------------------------------------
|
||||
" File: vim-material.vim
|
||||
" Description: equinusocio's Material Theme porting
|
||||
" Porting From: https://github.com/equinusocio/vsc-material-theme
|
||||
" Author: hzchris <hzchirs@gmail.com>
|
||||
" Source: https://github.com/hzchirs/vim-material
|
||||
" Last Modified: 10 February 2019
|
||||
" -----------------------------------------------------------------------------
|
||||
|
||||
if version > 580
|
||||
highlight clear
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
endif
|
||||
|
||||
let g:colors_name = "vim-material"
|
||||
|
||||
let s:gui = {}
|
||||
let s:cterm = {}
|
||||
|
||||
let s:gui.background = { 'dark': '#263238', 'light': '#FAFAFA', 'palenight': '#292D3E', 'oceanic': '#0F111A' }
|
||||
let s:gui.foreground = { 'dark': '#ECEFF1', 'light': '#666666', 'palenight': '#A6ACCD', 'oceanic': '#A6ACCD' }
|
||||
let s:gui.none = { 'dark': 'NONE', 'light': 'NONE', 'palenight': 'NONE' , 'oceanic': 'NONE' }
|
||||
let s:gui.selection = { 'dark': '#455A64', 'light': '#CCEAE7', 'palenight': '#434A6C', 'oceanic': '#292D3E' }
|
||||
let s:gui.line = { 'dark': '#212121', 'light': '#EAEFF0', 'palenight': '#191919', 'oceanic': '#191919' }
|
||||
let s:gui.comment = { 'dark': '#5D818E', 'light': '#90A4AE', 'palenight': '#676E95', 'oceanic': '#525975' }
|
||||
|
||||
let s:gui.red = { 'dark': '#FF5370', 'light': '#E53935', 'palenight': '#FF5370', 'oceanic': '#FF5370' }
|
||||
let s:gui.dark_red = { 'dark': '#B71C1C', 'light': '#E53935', 'palenight': '#FF5370', 'oceanic': '#FF5370' }
|
||||
let s:gui.pink = { 'dark': '#F07178', 'light': '#FF5370', 'palenight': '#F07178', 'oceanic': '#F07178' }
|
||||
let s:gui.orange = { 'dark': '#F78C6C', 'light': '#F76D47', 'palenight': '#F78C6C', 'oceanic': '#F78C6C' }
|
||||
let s:gui.light_yellow = { 'dark': '#FFE57F', 'light': '#FFAD13', 'palenight': '#FFE57F', 'oceanic': '#FFE57F' }
|
||||
let s:gui.yellow = { 'dark': '#FFCB6B', 'light': '#FFAD13', 'palenight': '#FFCB6B', 'oceanic': '#FFCB6B' }
|
||||
let s:gui.green = { 'dark': '#C3E88D', 'light': '#82A550', 'palenight': '#C3E88D', 'oceanic': '#C3E88D' }
|
||||
let s:gui.teal = { 'dark': '#004D40', 'light': '#CCEAE7', 'palenight': '#004D40', 'oceanic': '#004D40' }
|
||||
let s:gui.light_teal = { 'dark': '#69F0AE', 'light': '#73B6B0', 'palenight': '#69F0AE', 'oceanic': '#69F0AE' }
|
||||
let s:gui.pale_blue = { 'dark': '#B2CCD6', 'light': '#8796B0', 'palenight': '#B2CCD6', 'oceanic': '#B2CCD6' }
|
||||
let s:gui.cyan = { 'dark': '#89DDFF', 'light': '#39ADB5', 'palenight': '#89DDFF', 'oceanic': '#89DDFF' }
|
||||
let s:gui.blue = { 'dark': '#82AAFF', 'light': '#6182B8', 'palenight': '#82AAFF', 'oceanic': '#82AAFF' }
|
||||
let s:gui.purple = { 'dark': '#C792EA', 'light': '#7C4DFF', 'palenight': '#C792EA', 'oceanic': '#C792EA' }
|
||||
let s:gui.violet = { 'dark': '#BB80B3', 'light': '#945EB8', 'palenight': '#BB80B3', 'oceanic': '#BB80B3' }
|
||||
let s:gui.brown = { 'dark': '#AB7967', 'light': '#AB7967', 'palenight': '#C17E70', 'oceanic': '#C17E70' }
|
||||
|
||||
if !exists('g:material_style')
|
||||
let g:material_style='default'
|
||||
endif
|
||||
|
||||
function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr)
|
||||
if s:gui(a:guifg) != ""
|
||||
exec "hi " . a:group . " guifg=" . s:gui(a:guifg)
|
||||
endif
|
||||
if s:gui(a:guibg) != ""
|
||||
exec "hi " . a:group . " guibg=" . s:gui(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 a:attr != ""
|
||||
exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
|
||||
endif
|
||||
endfunction
|
||||
|
||||
function! s:gui(color)
|
||||
if &background == "light"
|
||||
return a:color['light']
|
||||
else
|
||||
if g:material_style == 'default'
|
||||
return a:color['dark']
|
||||
else
|
||||
return a:color[g:material_style]
|
||||
endif
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" Neovim Terminal colors
|
||||
if has("nvim")
|
||||
let g:terminal_color_0 = s:gui(s:gui.background)
|
||||
let g:terminal_color_1 = s:gui(s:gui.red)
|
||||
let g:terminal_color_2 = s:gui(s:gui.green)
|
||||
let g:terminal_color_3 = s:gui(s:gui.light_yellow)
|
||||
let g:terminal_color_4 = s:gui(s:gui.blue)
|
||||
let g:terminal_color_5 = s:gui(s:gui.pink)
|
||||
let g:terminal_color_6 = s:gui(s:gui.light_teal)
|
||||
let g:terminal_color_7 = s:gui(s:gui.pale_blue)
|
||||
let g:terminal_color_8 = s:gui(s:gui.selection)
|
||||
let g:terminal_color_9 = s:gui(s:gui.red)
|
||||
let g:terminal_color_10 = s:gui(s:gui.green)
|
||||
let g:terminal_color_11 = s:gui(s:gui.light_yellow)
|
||||
let g:terminal_color_12 = s:gui(s:gui.cyan)
|
||||
let g:terminal_color_13 = s:gui(s:gui.purple)
|
||||
let g:terminal_color_14 = s:gui(s:gui.cyan)
|
||||
let g:terminal_color_15 = s:gui(s:gui.foreground)
|
||||
endif
|
||||
|
||||
" Editor colors
|
||||
call s:hi("ColorColumn", s:gui.none, s:gui.line, "", "", "")
|
||||
call s:hi("Cursor", s:gui.yellow, "", "", "", "")
|
||||
call s:hi("CursorColumn", s:gui.none, s:gui.line, "", "", "")
|
||||
call s:hi("LineNr", s:gui.comment, "", "", "", "")
|
||||
call s:hi("CursorLine", s:gui.none, s:gui.line, "", "", "")
|
||||
call s:hi("CursorLineNr", s:gui.cyan, s:gui.line, "", "", "")
|
||||
call s:hi("Directory", s:gui.blue, "", "", "", "")
|
||||
call s:hi("FoldColumn", "", s:gui.background, "", "", "")
|
||||
call s:hi("Folded", s:gui.comment, s:gui.line, "", "", "")
|
||||
call s:hi("PMenu", s:gui.foreground, s:gui.line, "", "", "")
|
||||
call s:hi("PMenuSel", s:gui.cyan, s:gui.selection, "", "", "bold")
|
||||
call s:hi("ErrorMsg", s:gui.red, s:gui.none, "", "", "")
|
||||
call s:hi("Error", s:gui.red, s:gui.none, "", "", "")
|
||||
call s:hi("WarningMsg", s:gui.orange, "", "", "", "")
|
||||
call s:hi("VertSplit", s:gui.background, s:gui.foreground, "", "", "")
|
||||
call s:hi("Conceal", s:gui.comment, s:gui.background, "", "", "")
|
||||
|
||||
call s:hi("DiffAdded", s:gui.green, "", "", "", "")
|
||||
call s:hi("DiffRemoved", s:gui.red, "", "", "", "")
|
||||
|
||||
call s:hi("DiffAdd", "", s:gui.teal, "", "", "")
|
||||
call s:hi("DiffChange", "", s:gui.teal, "", "", "")
|
||||
call s:hi("DiffDelete", s:gui.red, s:gui.background, "", "", "")
|
||||
call s:hi("DiffText", "", s:gui.selection, "", "", "")
|
||||
|
||||
|
||||
call s:hi("NonText", s:gui.comment, "", "", "", "")
|
||||
call s:hi("helpExample", s:gui.blue, "", "", "", "")
|
||||
call s:hi("MatchParen", "", s:gui.selection, "", "", "")
|
||||
call s:hi("Title", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("Comment", s:gui.comment, "", "", "", "italic")
|
||||
call s:hi("String", s:gui.green, "", "", "", "")
|
||||
call s:hi("Normal", s:gui.foreground, s:gui.background, "", "", "")
|
||||
call s:hi("Visual", "", s:gui.selection, "", "", "")
|
||||
call s:hi("Constant", s:gui.pink, "", "", "", "")
|
||||
call s:hi("Type", s:gui.yellow, "", "", "", "none")
|
||||
call s:hi("Define", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("Statement", s:gui.cyan, "", "", "", "none")
|
||||
call s:hi("Function", s:gui.blue, "", "", "", "")
|
||||
call s:hi("Conditional", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("Float", s:gui.orange, "", "", "", "")
|
||||
call s:hi("Noise", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("Number", s:gui.orange, "", "", "", "")
|
||||
call s:hi("Identifier", s:gui.pink, "", "", "", "")
|
||||
call s:hi("Operator", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("PreProc", s:gui.blue, "", "", "", "")
|
||||
call s:hi("Search", s:gui.none, s:gui.none, "", "", "underline")
|
||||
call s:hi("InSearch", s:gui.background, s:gui.foreground, "", "", "")
|
||||
call s:hi("Todo", s:gui.red, s:gui.foreground, "", "", "reverse")
|
||||
call s:hi("Special", s:gui.orange, "", "", "", "")
|
||||
|
||||
|
||||
" Ruby colors
|
||||
call s:hi("rubyClassName", s:gui.yellow, "", "", "", "bold")
|
||||
call s:hi("rubyConstant", s:gui.yellow, "", "", "", "")
|
||||
call s:hi("rubyKeywordAsMethod", s:gui.blue, "", "", "", "")
|
||||
call s:hi("rubyOperator", s:gui.purple, "", "", "", "")
|
||||
call s:hi("rubyPseudoVariable", s:gui.red, "", "", "", "italic")
|
||||
call s:hi("rubySymbol", s:gui.orange, "", "", "", "")
|
||||
call s:hi("rubySymbolDelimiter", s:gui.cyan, "", "", "", "")
|
||||
|
||||
"eRuby colors
|
||||
call s:hi("eRubyDelimiter", s:gui.cyan, "", "", "", "")
|
||||
|
||||
" Elixir colors
|
||||
call s:hi("elixirKeyword", s:gui.blue, "", "", "", "")
|
||||
|
||||
" Javascript colors
|
||||
" yajs
|
||||
call s:hi("javascriptArrayMethod", s:gui.blue, "", "", "", "")
|
||||
call s:hi("javascriptBlock", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("javascriptBraces", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("javascriptBrackets", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("javascriptClassName", s:gui.yellow, "", "", "", "bold")
|
||||
call s:hi("javascriptClassSuperName", s:gui.yellow, "", "", "", "")
|
||||
call s:hi("javascriptExport", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("javascriptFuncKeyword", s:gui.purple, "", "", "", "")
|
||||
call s:hi("javascriptIdentifierName", s:gui.foreground, "", "", "", "")
|
||||
call s:hi("javascriptLabel", s:gui.foreground, "", "", "", "")
|
||||
call s:hi("javascriptMethod", s:gui.blue, "", "", "", "")
|
||||
call s:hi("javascriptObjectLabel", s:gui.foreground, "", "", "", "")
|
||||
call s:hi("javascriptObjectLabelColon", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("javascriptObjectMethodName", s:gui.blue, "", "", "", "")
|
||||
call s:hi("javascriptOperator", s:gui.purple, "", "", "", "")
|
||||
call s:hi("javascriptProperty", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("javascriptStringMethod", s:gui.blue, "", "", "", "")
|
||||
call s:hi("javascriptVariable", s:gui.purple, "", "", "", "")
|
||||
|
||||
" vim-javascript
|
||||
call s:hi("jsArrowFuncArgs", s:gui.red, "", "", "", "")
|
||||
call s:hi("jsArrowFunction", s:gui.purple, "", "", "", "")
|
||||
call s:hi("jsBooleanFalse", s:gui.orange, "", "", "", "")
|
||||
call s:hi("jsBooleanTrue", s:gui.orange, "", "", "", "")
|
||||
call s:hi("jsClassBraces", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("jsClassDefinition", s:gui.yellow, "", "", "", "")
|
||||
call s:hi("jsClassKeyword", s:gui.purple, "", "", "", "")
|
||||
call s:hi("jsConditional", s:gui.cyan, "", "", "", "italic")
|
||||
call s:hi("jsFuncArgs", s:gui.red, "", "", "", "")
|
||||
call s:hi("jsFuncBraces", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("jsFuncCall", s:gui.blue, "", "", "", "")
|
||||
call s:hi("jsFuncParens", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("jsFunction", s:gui.purple, "", "", "", "")
|
||||
call s:hi("jsFunctionKey", s:gui.blue, "", "", "", "")
|
||||
call s:hi("jsGlobalObjects", s:gui.yellow, "", "", "", "")
|
||||
call s:hi("jsNoise", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("jsObjectKey", s:gui.foreground, "", "", "", "")
|
||||
call s:hi("jsOperator", s:gui.purple, "", "", "", "")
|
||||
call s:hi("jsParens", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("jsReturn", s:gui.cyan, "", "", "", "italic")
|
||||
call s:hi("jsStorageClass", s:gui.purple, "", "", "", "")
|
||||
call s:hi("jsThis", s:gui.red, "", "", "", "italic")
|
||||
|
||||
" yats
|
||||
call s:hi("typescriptAccessibilityModifier", s:gui.purple, "", "", "", "")
|
||||
call s:hi("typescriptCall", s:gui.pink, "", "", "", "")
|
||||
call s:hi("typescriptClassName", s:gui.yellow, "", "", "", "")
|
||||
call s:hi("typescriptExport", s:gui.blue, "", "", "", "")
|
||||
call s:hi("typescriptImport", s:gui.blue, "", "", "", "")
|
||||
call s:hi("typescriptInterfaceName", s:gui.yellow, "", "", "", "")
|
||||
call s:hi("typescriptPredefinedType", s:gui.pale_blue, "", "", "", "")
|
||||
call s:hi("typescriptVariable", s:gui.purple, "", "", "", "")
|
||||
call s:hi("typescriptOperator", s:gui.purple, "", "", "", "")
|
||||
|
||||
" HTML colors
|
||||
call s:hi("htmlTag", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("htmlEndTag", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("htmlTagName", s:gui.red, "", "", "", "")
|
||||
call s:hi("htmlSpecialTagName", s:gui.red, "", "", "", "")
|
||||
call s:hi("htmlArg", s:gui.yellow, "", "", "", "")
|
||||
|
||||
" jsx colors
|
||||
call s:hi("xmlTag", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("xmlEndTag", s:gui.cyan, "", "", "", "")
|
||||
call s:hi("xmlTagName", s:gui.red, "", "", "", "")
|
||||
call s:hi("xmlAttrib", s:gui.yellow, "", "", "", "")
|
||||
|
|
@ -62,11 +62,6 @@
|
|||
path: '{{ xdg_data_dir }}/nvim/site/pack/default/start/coc.nvim'
|
||||
state: absent
|
||||
|
||||
- name: setup neovim color files
|
||||
copy:
|
||||
dest: '{{ xdg_data_dir }}/nvim/site/'
|
||||
src: 'files/nvim/colors'
|
||||
|
||||
- name: setup neovim configuration files
|
||||
template:
|
||||
dest: '{{ item.dest }}'
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
-- {{ ansible_managed }}
|
||||
|
||||
--enable this option here as the events are used in this buffer
|
||||
vim.cmd('syntax on')
|
||||
|
||||
vim.api.nvim_create_autocmd('Syntax', {
|
||||
command = [[:normal zR]],
|
||||
desc = 'Open folds by default',
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd('Filetype', {
|
||||
pattern = 'TelescopeResults',
|
||||
command = [[:setlocal nofoldenable]],
|
||||
|
|
|
|||
|
|
@ -6,29 +6,26 @@ local on_attach = function(client, bufnr)
|
|||
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
|
||||
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
|
||||
|
||||
-- enable completion triggered by <c-x><c-o>
|
||||
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- mappings
|
||||
local opts = { buffer = bufnr, noremap = true, silent = true }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
|
||||
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
|
||||
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
|
||||
vim.keymap.set('n', '<space>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, opts)
|
||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
|
||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
|
||||
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
|
||||
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
|
||||
vim.keymap.set('n', '<space>la', vim.lsp.buf.code_action, opts)
|
||||
local opts = { buffer = bufnr, noremap = true, silent = true }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
|
||||
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
|
||||
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
|
||||
vim.keymap.set('n', '<space>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, opts)
|
||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
|
||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
|
||||
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
|
||||
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
|
||||
vim.keymap.set('n', '<space>la', vim.lsp.buf.code_action, opts)
|
||||
|
||||
end
|
||||
|
||||
|
|
@ -112,6 +109,15 @@ local luasnip = require('luasnip')
|
|||
cmp.setup({
|
||||
sources = {
|
||||
{ names = 'nvim_lsp', },
|
||||
{ name = 'buffer' },
|
||||
{ name = 'path' },
|
||||
{ name = 'nvim_lua' },
|
||||
{
|
||||
name = 'omni',
|
||||
option = {
|
||||
disable_omnifuncs = { 'v:lua.vim.lsp.omnifunc' }
|
||||
}
|
||||
},
|
||||
{ names = 'luasnip', }, -- TODO: add snippets
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ vim.o.hidden = true
|
|||
|
||||
-- folding
|
||||
vim.o.foldmethod = 'expr'
|
||||
vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
|
||||
vim.o.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
|
||||
|
||||
-- don't open folds when jumping over one with (, {, [[ or [{
|
||||
vim.opt.foldopen = vim.opt.foldopen - { 'block' }
|
||||
|
|
|
|||
|
|
@ -13,8 +13,12 @@ neovim_plugins:
|
|||
url: 'https://github.com/nvim-tree/nvim-web-devicons', name: 'nvim-tree-icons'
|
||||
}
|
||||
- { url: 'https://github.com/neovim/nvim-lspconfig', name: 'nvim-lspconfig' }
|
||||
- { url: 'https://github.com/hrsh7th/nvim-cmp/', name: 'nvim-cmp' }
|
||||
- { url: 'https://github.com/hrsh7th/cmp-nvim-lsp/', name: 'cmp-nvim-lsp' }
|
||||
- { url: 'https://github.com/hrsh7th/nvim-cmp', name: 'nvim-cmp' }
|
||||
- { url: 'https://github.com/hrsh7th/cmp-buffer', name: 'cmp-buffer' }
|
||||
- { url: 'https://github.com/hrsh7th/cmp-path', name: 'cmp-path' }
|
||||
- { url: 'https://github.com/hrsh7th/cmp-omni', name: 'cmp-omni' }
|
||||
- { url: 'https://github.com/hrsh7th/cmp-nvim-lsp', name: 'cmp-nvim-lsp' }
|
||||
- { url: 'https://github.com/hrsh7th/cmp-nvim-lua', name: 'cmp-nvim-lua' }
|
||||
- { url: 'https://github.com/nvim-treesitter/nvim-treesitter', name: 'nvim-treesitter' }
|
||||
- { url: 'https://github.com/nvim-lua/plenary.nvim', name: 'plenary.nvim' }
|
||||
- {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue