diff --git a/colors/koa.lua b/colors/koa.lua new file mode 100644 index 00000000..7b507d00 --- /dev/null +++ b/colors/koa.lua @@ -0,0 +1,19 @@ +vim.api.nvim_command 'hi clear' +if vim.fn.exists 'syntax_on' then + vim.api.nvim_command 'syntax reset' +end + +vim.g.VM_theme_set_by_colorscheme = true -- Required for Visual Multi +vim.o.termguicolors = true +vim.g.colors_name = 'koa' + +-- colors.generate(config.mirage) +-- if config.terminal then +-- set_terminal_colors() +-- end +-- set_groups() + +vim.g.terminal_color_0 = '#000000' +vim.g.terminal_color_background = '#000000' + +vim.api.nvim_set_hl(0, 'Normal', { fg = '#FFFFFF', bg = '#000000' }) diff --git a/colors/mine.vim b/colors/mine.vim new file mode 100644 index 00000000..12f1efe9 --- /dev/null +++ b/colors/mine.vim @@ -0,0 +1,408 @@ +" Name: morning +" Description: Colorscheme with light grey background. +" Author: Original author Bram Moolenaar +" Maintainer: Original maintainer Bram Moolenaar +" Website: https://github.com/vim/colorschemes +" License: Same as Vim +" Last Updated: Fri 15 Dec 2023 20:05:37 + +" Generated by Colortemplate v2.2.3 + +set background=light + +" hi clear +source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme +let g:colors_name = 'morning' + +let s:t_Co = &t_Co + +if (has('termguicolors') && &termguicolors) || has('gui_running') + let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000'] + " Nvim uses g:terminal_color_{0-15} instead + for i in range(g:terminal_ansi_colors->len()) + let g:terminal_color_{i} = g:terminal_ansi_colors[i] + endfor +endif +hi! link Terminal Normal +hi! link LineNrAbove LineNr +hi! link LineNrBelow LineNr +hi! link CurSearch Search +hi! link CursorLineFold CursorLine +hi! link CursorLineSign CursorLine +hi! link StatuslineTerm Statusline +hi! link StatuslineTermNC StatuslineNC +hi! link MessageWindow Pmenu +hi! link PopupNotification Todo +hi Normal guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE +hi EndOfBuffer guifg=#0000ff guibg=#cccccc gui=bold cterm=bold +hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE +hi CursorLine guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE +hi CursorColumn guifg=NONE guibg=#d3d3d3 gui=NONE cterm=NONE +hi CursorLineNr guifg=#a52a2a guibg=NONE gui=bold cterm=bold +hi QuickFixLine guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE +hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=bold +hi StatusLineNC guifg=#bcbcbc guibg=#000000 gui=NONE cterm=NONE +hi VertSplit guifg=#bcbcbc guibg=#000000 gui=NONE cterm=NONE +hi Pmenu guifg=#000000 guibg=#b2b2b2 gui=NONE cterm=NONE +hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE +hi PmenuSbar guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE +hi PmenuThumb guifg=NONE guibg=#000000 gui=NONE cterm=NONE +hi TabLine guifg=#000000 guibg=#bcbcbc gui=underline cterm=underline +hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse +hi TabLineSel guifg=#000000 guibg=#e4e4e4 gui=bold cterm=bold +hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE +hi ToolbarButton guifg=NONE guibg=#bcbcbc gui=bold cterm=bold +hi NonText guifg=#0000ff guibg=#bcbcbc gui=bold cterm=bold +hi SpecialKey guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE +hi Visual guifg=NONE guibg=#d0d0d0 gui=NONE cterm=NONE +hi VisualNOS guifg=NONE guibg=#0000ff gui=NONE cterm=NONE +hi LineNr guifg=#a52a2a guibg=NONE gui=NONE cterm=NONE +hi FoldColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE +hi SignColumn guifg=#00008b guibg=NONE gui=NONE cterm=NONE +hi Underlined guifg=#6a5acd guibg=NONE gui=underline cterm=underline +hi Error guifg=#ff0000 guibg=#e4e4e4 gui=reverse cterm=reverse +hi ErrorMsg guifg=#ff0000 guibg=#e4e4e4 gui=reverse cterm=reverse +hi WarningMsg guifg=#6a0dad guibg=NONE gui=bold cterm=bold +hi MoreMsg guifg=#2e8b57 guibg=NONE gui=bold cterm=bold +hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold +hi Question guifg=#008787 guibg=NONE gui=bold cterm=bold +hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE +hi MatchParen guifg=#e4e4e4 guibg=#6a5acd gui=NONE cterm=NONE +hi Search guifg=#e4e4e4 guibg=#6a0dad gui=NONE cterm=NONE +hi IncSearch guifg=#2e8b57 guibg=NONE gui=reverse cterm=reverse +hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold +hi ColorColumn guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE +hi Cursor guifg=#e4e4e4 guibg=#2e8b57 gui=NONE cterm=NONE +hi lCursor guifg=#e4e4e4 guibg=#a52a2a gui=NONE cterm=NONE +hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline +hi SpellCap guifg=#00d700 guibg=NONE guisp=#00d700 gui=undercurl cterm=underline +hi SpellLocal guifg=#a52a2a guibg=NONE guisp=#a52a2a gui=undercurl cterm=underline +hi SpellRare guifg=#2e8b57 guibg=NONE guisp=#2e8b57 gui=undercurl cterm=underline +hi Comment guifg=#0000ff guibg=NONE gui=NONE cterm=NONE +hi Constant guifg=#ff00ff guibg=#eeeeee gui=NONE cterm=NONE +hi Identifier guifg=#008787 guibg=NONE gui=NONE cterm=NONE +hi Statement guifg=#a52a2a guibg=NONE gui=bold cterm=bold +hi PreProc guifg=#6a0dad guibg=NONE gui=NONE cterm=NONE +hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold +hi Special guifg=#6a5acd guibg=NONE gui=NONE cterm=NONE +hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE +hi Directory guifg=#008787 guibg=NONE gui=bold cterm=bold +hi Conceal guifg=#0000ff guibg=NONE gui=NONE cterm=NONE +hi Title guifg=#a52a2a guibg=NONE gui=bold cterm=bold +hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE +hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE +hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE +hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE + +if s:t_Co >= 256 + hi! link Terminal Normal + hi! link LineNrAbove LineNr + hi! link LineNrBelow LineNr + hi! link CurSearch Search + hi! link CursorLineFold CursorLine + hi! link CursorLineSign CursorLine + hi! link StatuslineTerm Statusline + hi! link StatuslineTermNC StatuslineNC + hi! link MessageWindow Pmenu + hi! link PopupNotification Todo + hi Normal ctermfg=16 ctermbg=254 cterm=NONE + hi EndOfBuffer ctermfg=21 ctermbg=252 cterm=bold + hi Folded ctermfg=18 ctermbg=252 cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=252 cterm=NONE + hi CursorColumn ctermfg=NONE ctermbg=252 cterm=NONE + hi CursorLineNr ctermfg=124 ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=16 ctermbg=226 cterm=NONE + hi StatusLine ctermfg=255 ctermbg=16 cterm=bold + hi StatusLineNC ctermfg=250 ctermbg=16 cterm=NONE + hi VertSplit ctermfg=250 ctermbg=16 cterm=NONE + hi Pmenu ctermfg=16 ctermbg=249 cterm=NONE + hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=254 cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=16 cterm=NONE + hi TabLine ctermfg=16 ctermbg=250 cterm=underline + hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse + hi TabLineSel ctermfg=16 ctermbg=254 cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=NONE ctermbg=250 cterm=bold + hi NonText ctermfg=21 ctermbg=250 cterm=bold + hi SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE + hi Visual ctermfg=NONE ctermbg=252 cterm=NONE + hi VisualNOS ctermfg=NONE ctermbg=21 cterm=NONE + hi LineNr ctermfg=124 ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=18 ctermbg=NONE cterm=NONE + hi SignColumn ctermfg=18 ctermbg=NONE cterm=NONE + hi Underlined ctermfg=62 ctermbg=NONE cterm=underline + hi Error ctermfg=196 ctermbg=254 cterm=reverse + hi ErrorMsg ctermfg=196 ctermbg=254 cterm=reverse + hi WarningMsg ctermfg=55 ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=29 ctermbg=NONE cterm=bold + hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold + hi Question ctermfg=30 ctermbg=NONE cterm=bold + hi Todo ctermfg=16 ctermbg=226 cterm=NONE + hi MatchParen ctermfg=254 ctermbg=62 cterm=NONE + hi Search ctermfg=254 ctermbg=55 cterm=NONE + hi IncSearch ctermfg=29 ctermbg=NONE cterm=reverse + hi WildMenu ctermfg=16 ctermbg=226 cterm=bold + hi ColorColumn ctermfg=16 ctermbg=231 cterm=NONE + hi Cursor ctermfg=254 ctermbg=29 cterm=NONE + hi lCursor ctermfg=254 ctermbg=124 cterm=NONE + hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline + hi SpellCap ctermfg=40 ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=124 ctermbg=NONE cterm=underline + hi SpellRare ctermfg=29 ctermbg=NONE cterm=underline + hi Comment ctermfg=21 ctermbg=NONE cterm=NONE + hi Constant ctermfg=201 ctermbg=255 cterm=NONE + hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE + hi Statement ctermfg=124 ctermbg=NONE cterm=bold + hi PreProc ctermfg=55 ctermbg=NONE cterm=NONE + hi Type ctermfg=29 ctermbg=NONE cterm=bold + hi Special ctermfg=62 ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Directory ctermfg=30 ctermbg=NONE cterm=bold + hi Conceal ctermfg=21 ctermbg=NONE cterm=NONE + hi Title ctermfg=124 ctermbg=NONE cterm=bold + hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE + hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE + hi DiffText ctermfg=16 ctermbg=251 cterm=NONE + hi DiffDelete ctermfg=231 ctermbg=133 cterm=NONE + unlet s:t_Co + finish +endif + +if s:t_Co >= 16 + hi Normal ctermfg=black ctermbg=grey cterm=NONE + hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorLineNr ctermfg=darkred ctermbg=NONE cterm=underline + hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE + hi StatusLine ctermfg=white ctermbg=black cterm=bold + hi StatusLineNC ctermfg=darkgrey ctermbg=black cterm=NONE + hi VertSplit ctermfg=darkgrey ctermbg=black cterm=NONE + hi Pmenu ctermfg=black ctermbg=white cterm=NONE + hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE + hi TabLine ctermfg=black ctermbg=white cterm=underline + hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse + hi TabLineSel ctermfg=black ctermbg=grey cterm=bold + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=NONE ctermbg=white cterm=bold + hi NonText ctermfg=blue ctermbg=white cterm=bold + hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE + hi Visual ctermfg=NONE ctermbg=white cterm=NONE + hi VisualNOS ctermfg=NONE ctermbg=blue cterm=NONE + hi LineNr ctermfg=darkred ctermbg=NONE cterm=NONE + hi FoldColumn ctermfg=darkblue ctermbg=NONE cterm=NONE + hi SignColumn ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Underlined ctermfg=darkblue ctermbg=NONE cterm=underline + hi Error ctermfg=red ctermbg=grey cterm=reverse + hi ErrorMsg ctermfg=red ctermbg=grey cterm=reverse + hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=bold + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold + hi ModeMsg ctermfg=black ctermbg=NONE cterm=bold + hi Question ctermfg=darkcyan ctermbg=NONE cterm=bold + hi Todo ctermfg=black ctermbg=yellow cterm=NONE + hi MatchParen ctermfg=grey ctermbg=darkblue cterm=NONE + hi Search ctermfg=grey ctermbg=darkmagenta cterm=NONE + hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse + hi WildMenu ctermfg=black ctermbg=yellow cterm=bold + hi ColorColumn ctermfg=black ctermbg=white cterm=NONE + hi Cursor ctermfg=grey ctermbg=darkgreen cterm=NONE + hi lCursor ctermfg=grey ctermbg=darkred cterm=NONE + hi SpellBad ctermfg=red ctermbg=NONE cterm=underline + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=darkred ctermbg=NONE cterm=underline + hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=underline + hi Comment ctermfg=blue ctermbg=NONE cterm=NONE + hi Constant ctermfg=magenta ctermbg=white cterm=NONE + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Statement ctermfg=darkred ctermbg=NONE cterm=bold + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold + hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold + hi Conceal ctermfg=blue ctermbg=NONE cterm=NONE + hi Title ctermfg=darkred ctermbg=NONE cterm=bold + hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=white ctermbg=blue cterm=NONE + hi DiffText ctermfg=black ctermbg=grey cterm=NONE + hi DiffDelete ctermfg=white ctermbg=magenta cterm=NONE + unlet s:t_Co + finish +endif + +if s:t_Co >= 8 + hi Normal ctermfg=black ctermbg=gray cterm=NONE + hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE + hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline + hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold + hi QuickFixLine ctermfg=black ctermbg=darkyellow cterm=NONE + hi StatusLine ctermfg=black ctermbg=gray cterm=bold,reverse + hi StatusLineNC ctermfg=black ctermbg=gray cterm=reverse + hi VertSplit ctermfg=black ctermbg=gray cterm=reverse + hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE + hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE + hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE + hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE + hi TabLine ctermfg=gray ctermbg=black cterm=NONE + hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse + hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE + hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE + hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse + hi NonText ctermfg=darkblue ctermbg=NONE cterm=bold + hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=bold + hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse + hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline + hi LineNr ctermfg=NONE ctermbg=NONE cterm=bold + hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE + hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline + hi Error ctermfg=darkred ctermbg=gray cterm=reverse + hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=reverse + hi WarningMsg ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=NONE + hi Question ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE + hi MatchParen ctermfg=gray ctermbg=darkblue cterm=NONE + hi Search ctermfg=gray ctermbg=darkmagenta cterm=NONE + hi IncSearch ctermfg=darkgreen ctermbg=NONE cterm=reverse + hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE + hi ColorColumn ctermfg=black ctermbg=darkred cterm=NONE + hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse + hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse + hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=reverse + hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse + hi Comment ctermfg=darkblue ctermbg=NONE cterm=bold + hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=bold + hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE + hi Statement ctermfg=darkred ctermbg=NONE cterm=bold + hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE + hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE + hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE + hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE + hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold + hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE + hi Title ctermfg=darkred ctermbg=NONE cterm=bold + hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE + hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE + hi DiffText ctermfg=black ctermbg=grey cterm=NONE + hi DiffDelete ctermfg=white ctermbg=darkmagenta cterm=NONE + unlet s:t_Co + finish +endif + +if s:t_Co >= 0 + hi Normal term=NONE + hi ColorColumn term=reverse + hi Conceal term=NONE + hi Cursor term=reverse + hi CursorColumn term=NONE + hi CursorLine term=underline + hi CursorLineNr term=bold + hi DiffAdd term=reverse + hi DiffChange term=NONE + hi DiffDelete term=reverse + hi DiffText term=reverse + hi Directory term=NONE + hi EndOfBuffer term=NONE + hi ErrorMsg term=bold,reverse + hi FoldColumn term=NONE + hi Folded term=NONE + hi IncSearch term=bold,reverse,underline + hi LineNr term=NONE + hi MatchParen term=bold,underline + hi ModeMsg term=bold + hi MoreMsg term=NONE + hi NonText term=NONE + hi Pmenu term=reverse + hi PmenuSbar term=reverse + hi PmenuSel term=bold + hi PmenuThumb term=NONE + hi Question term=standout + hi Search term=reverse + hi SignColumn term=reverse + hi SpecialKey term=bold + hi SpellBad term=underline + hi SpellCap term=underline + hi SpellLocal term=underline + hi SpellRare term=underline + hi StatusLine term=bold,reverse + hi StatusLineNC term=bold,underline + hi TabLine term=bold,underline + hi TabLineFill term=NONE + hi Terminal term=NONE + hi TabLineSel term=bold,reverse + hi Title term=NONE + hi VertSplit term=NONE + hi Visual term=reverse + hi VisualNOS term=NONE + hi WarningMsg term=standout + hi WildMenu term=bold + hi CursorIM term=NONE + hi ToolbarLine term=reverse + hi ToolbarButton term=bold,reverse + hi CurSearch term=reverse + hi CursorLineFold term=underline + hi CursorLineSign term=underline + hi Comment term=bold + hi Constant term=NONE + hi Error term=bold,reverse + hi Identifier term=NONE + hi Ignore term=NONE + hi PreProc term=NONE + hi Special term=NONE + hi Statement term=NONE + hi Todo term=bold,reverse + hi Type term=NONE + hi Underlined term=underline + unlet s:t_Co + finish +endif + +" Background: light +" Color: comment #0000ff 21 blue +" Color: constant #ff00ff 201 magenta +" Color: identifier #008787 30 darkcyan +" Color: statement #a52a2a 124 darkred +" Color: preproc #6a0dad 55 darkmagenta +" Color: type #2e8b57 29 darkgreen +" Color: special #6a5acd 62 darkblue +" Color: fg0 #000000 16 black +" Color: bg0 #e4e4e4 254 grey +" Color: bg1 #bcbcbc 250 white +" Color: status #bcbcbc 250 darkgrey +" Color: bg2 #eeeeee 255 white +" Color: endofbuffer #cccccc 252 darkgrey +" Color: visual #d0d0d0 252 white +" Color: folded #d3d3d3 252 darkgrey +" Color: folded_fg #00008b 18 darkblue +" Color: pmenu #b2b2b2 249 white +" Color: wildmenu #ffff00 226 yellow +" Color: error #ff0000 196 red +" Color: colorcolumn #ffffff 231 white +" Color: spellcap #00d700 40 green +" Color: black #000000 16 black +" Color: darkred #870000 88 darkred +" Color: darkgreen #008700 28 darkgreen +" Color: darkyellow #878700 100 darkyellow +" Color: darkblue #000087 18 darkblue +" Color: darkmagenta #870087 18 darkmagenta +" Color: darkcyan #008787 30 darkcyan +" Color: gray #878787 102 gray +" Term colors: bg0 statement constant preproc identifier type special bg1 +" Term colors: comment statement constant preproc identifier type special fg0 +" Color: bgDiffA #5F875F 65 darkgreen +" Color: bgDiffC #5F87AF 67 blue +" Color: bgDiffD #AF5FAF 133 magenta +" Color: bgDiffT #C6C6C6 251 grey +" Color: fgDiffW #FFFFFF 231 white +" Color: fgDiffB #000000 16 black +" Color: bgDiffC8 #5F87AF 67 darkblue +" Color: bgDiffD8 #AF5FAF 133 darkmagenta +" vim: et ts=8 sw=2 sts=2 diff --git a/init.lua b/init.lua index 24509e6d..9ef2c7d3 100644 --- a/init.lua +++ b/init.lua @@ -84,6 +84,8 @@ I hope you enjoy your Neovim journey, P.S. You can delete this when you're done too. It's your config now! :) --]] +-- vim.cmd [[colorscheme koa]] + -- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) @@ -169,6 +171,9 @@ vim.keymap.set('n', '', 'nohlsearch') -- Diagnostic keymaps vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) +vim.keymap.set('n', 'td', function() + vim.diagnostic.enable(not vim.diagnostic.is_enabled()) +end, { silent = true, noremap = true, desc = '[T]oggle [D]iagnostics' }) -- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier -- for people to discover. Otherwise, you normally need to press , which @@ -193,6 +198,9 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the right win vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +-- My palette +local palette = require 'custom.palette' + -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -279,7 +287,7 @@ require('lazy').setup({ opts = { -- delay between pressing a key and opening which-key (milliseconds) -- this setting is independent of vim.opt.timeoutlen - delay = 0, + delay = 200, icons = { -- set icon mappings to true if you have a Nerd Font mappings = vim.g.have_nerd_font, @@ -594,14 +602,14 @@ require('lazy').setup({ }) -- Change diagnostic symbols in the sign column (gutter) - -- if vim.g.have_nerd_font then - -- local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' } - -- local diagnostic_signs = {} - -- for type, icon in pairs(signs) do - -- diagnostic_signs[vim.diagnostic.severity[type]] = icon - -- end - -- vim.diagnostic.config { signs = { text = diagnostic_signs } } - -- end + if vim.g.have_nerd_font then + local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' } + local diagnostic_signs = {} + for type, icon in pairs(signs) do + diagnostic_signs[vim.diagnostic.severity[type]] = icon + end + vim.diagnostic.config { signs = { text = diagnostic_signs } } + end -- LSP servers and clients are able to communicate to each other what features they support. -- By default, Neovim doesn't support everything that is in the LSP specification. @@ -669,7 +677,8 @@ require('lazy').setup({ require('mason-tool-installer').setup { ensure_installed = ensure_installed } require('mason-lspconfig').setup { - ensure_installed = { 'ltex' }, + -- ensure_installed = { 'ltex' }, + ensure_installed = {}, automatic_installation = {}, handlers = { function(server_name) @@ -688,7 +697,7 @@ require('lazy').setup({ -- language = 'fr', -- }, -- }, - ---@param client vim.lsp.Client + ---@param client vim.lsp.Client --type annotation of the lsp just on_attach = function(client) -- define new function to change language vim.api.nvim_create_user_command('Ltexlang', function(args) @@ -822,9 +831,9 @@ require('lazy').setup({ -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), - --[''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.confirm { select = true }, + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_prev_item(), -- Manually trigger a completion from nvim-cmp. -- Generally you don't need this, because nvim-cmp will display @@ -878,11 +887,100 @@ require('lazy').setup({ -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'default' - - -- You can configure highlights by doing something like: - vim.cmd.hi 'Comment gui=none' + vim.cmd.colorscheme 'tokyonight' end, + opts = { -- current line number + style = 'night', + -- TODO change color of control characters + -- of buffer window separators + -- change italic text from command + on_colors = function(colors) + colors.bg = palette.black + colors.bg_dark = palette.magenta + colors.bg_dark1 = palette.magenta + colors.bg_float = palette.trunk0 -- floating window (help etc.) + colors.bg_highlight = palette.brown2 -- color of onglet + colors.bg_popup = palette.brown + -- colors.bg_search = palette.yellow + colors.bg_sidebar = palette.trunk0 + colors.bg_statusline = palette.trunk1 + colors.bg_visual = palette.trunk7 + colors.black = palette.magenta + colors.blue = palette.leaf1 -- color of background of Normal mode indicator + colors.blue0 = palette.magenta + colors.blue1 = palette.trunk8 -- color of types + colors.blue2 = palette.magenta + colors.blue5 = palette.trunk5 -- color of punctuation + colors.blue6 = palette.magenta + colors.blue7 = palette.magenta + colors.border = palette.magenta + colors.border_highlight = palette.trunk4 + -- colors.comment = palette.trunk3 + colors.cyan = palette.petal2 -- color of vim lines comment + colors.dark3 = palette.trunk6 -- color of number of results in search + colors.dark5 = palette.fur4 -- color of Snippet text in floating + -- colors.diff = { + -- add = "#283b4d", + -- change = "#1f2231", + -- delete = "#37222c", + -- text = "#394b70" + -- } + colors.errors = palette.magenta + colors.fg = palette.trunk5 -- color of normal text + colors.fg_dark = palette.fur2 -- color of text in status/command line + -- colors.fg_float = palette.fur1 + colors.fg_gutter = palette.trunk7 -- color of line numbers + colors.fg_sidebar = palette.magenta + colors.git = { + add = palette.leaf4, + change = '#6183bb', + delete = '#914c54', + ignore = '#545c7e', + } + colors.green = palette.leaf4 -- strings + colors.green1 = palette.fur2 -- methods or attributes + colors.green2 = palette.magenta + colors.hint = palette.leaf4 -- "#1abc9c", -- NOTE comment + colors.info = palette.cyan --''#0db9d7' -- color of lua logo + colors.magenta = palette.petal2 -- "#bb9af7", -- color of functions and {} + colors.magenta2 = palette.magenta -- "#ff007c" + -- colors.none = "NONE" + colors.orange = palette.fur4 -- "#ff9e64" -- current line number + colors.purple = palette.wine -- "#9d7cd8", -- local, Return... + colors.rainbow = { '#7aa2f7', '#e0af68', '#9ece6a', '#1abc9c', '#bb9af7', '#9d7cd8', '#ff9e64', '#f7768e' } + colors.red = palette.magenta -- "#f7768e", + colors.red1 = palette.magenta -- "#db4b4b", + colors.teal = '#AEDBD9' -- "#1abc9c", -- color of file icon + -- terminal = { + -- black = "#15161e", + -- black_bright = "#414868", + -- blue = "#7aa2f7", + -- blue_bright = "#8db0ff", + -- cyan = "#7dcfff", + -- cyan_bright = "#a4daff", + -- green = "#9ece6a", + -- green_bright = "#9fe044", + -- magenta = "#bb9af7", + -- magenta_bright = "#c7a9ff", + -- red = "#f7768e", + -- red_bright = "#ff899d", + -- white = "#a9b1d6", + -- white_bright = "#c0caf5", + -- yellow = "#e0af68", + -- yellow_bright = "#faba4a" + -- }, + -- terminal_black = "#414868", + -- todo = "#7aa2f7", + -- warning = "#e0af68", + colors.yellow = '#e0af68' + colors.black = palette.black + end, + on_highlights = function(highlights, colors) + -- highlights.comment = colors.teal + -- highlights['@comment'] = { fg = colors.red } + highlights['IblScope'] = { fg = colors.fg_dark, nocombine = true } + end, + }, }, -- Highlight todo, notes, etc in comments @@ -943,6 +1041,15 @@ require('lazy').setup({ additional_vim_regex_highlighting = { 'ruby' }, }, indent = { enable = true, disable = { 'ruby' } }, + incremental_selection = { + enable = true, + keymaps = { + init_selection = 'gnn', + node_incremental = 'grn', + scope_incremental = 'grc', + node_decremental = 'grm', + }, + }, }, -- There are additional nvim-treesitter modules that you can use to interact -- with nvim-treesitter. You should go explore a few and see what interests you: @@ -972,7 +1079,9 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - { import = 'custom.plugins' }, + -- { import = 'custom.plugins' }, + require 'custom.plugins.init', + -- require 'custom.plugins.koa', -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lua/custom/palette.lua b/lua/custom/palette.lua new file mode 100644 index 00000000..3373e907 --- /dev/null +++ b/lua/custom/palette.lua @@ -0,0 +1,33 @@ +---@class Palettepa +local ret = { + black = '#000000', + white = '#FFFFFF', + magenta = '#FF00FF', + brown = '#100A09', + brown2 = '#0f0906', + yellow = '#997a00', + trunk0 = '#0A0501', + trunk6 = '#423D38', + trunk7 = '#34302D', + trunk8 = '#EADDD1', + wine = '#A5697D', + leaf4 = '#5F9B70', + cyan = '#6EBCC9', + -- oak color palette https://github.com/vigoux/oak/blob/master/autoload/oak.vim + trunk1 = '#0E0701', + trunk2 = '#342212', + trunk3 = '#593C22', + trunk4 = '#AC9682', + trunk5 = '#FEEFE1', + fur1 = '#7A5454', + fur2 = '#A58A86', + fur3 = '#E27950', + fur4 = '#D69060', + leaf1 = '#B990D5', + leaf2 = '#2DC7D2', + leaf3 = '#42BD7D', + petal1 = '#FF4D4D', + petal2 = '#F0C54C', +} + +return ret diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index e988821e..e559e87b 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -52,4 +52,15 @@ return { } end, }, + { + 'norcalli/nvim-colorizer.lua', + event = 'VimEnter', + opts = { '*' }, + }, + -- { + -- 'kao.nvim', + -- dev = true, + -- dir = '~/.config/nvim/plugin/', + -- opts = { message = 'Hello' }, + -- }, } diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/kickstart/plugins/indent_line.lua index ed7f2693..8788d941 100644 --- a/lua/kickstart/plugins/indent_line.lua +++ b/lua/kickstart/plugins/indent_line.lua @@ -4,6 +4,9 @@ return { -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help ibl` main = 'ibl', - opts = {}, + opts = { + indent = { char = '▏' }, + scope = { show_start = false }, + }, }, }