diff --git a/nvim/nvim.symlink/colors/maxbucknell.vim b/nvim/nvim.symlink/colors/maxbucknell.vim deleted file mode 100644 index 92d31b5..0000000 --- a/nvim/nvim.symlink/colors/maxbucknell.vim +++ /dev/null @@ -1,13 +0,0 @@ -hi clear -if exists("syntax_on") - syntax reset -endif - -runtime colors/gruvbox.vim -let g:colors_name = 'maxbucknell' - -hi clear NormalFloat -hi link NormalFloat Normal - -hi ActiveWindow guibg=#282828 ctermbg=235 -hi InactiveWindow guibg=#32302f ctermbg=236 diff --git a/nvim/nvim.symlink/colors/maxbucknell2.vim b/nvim/nvim.symlink/colors/maxbucknell2.vim deleted file mode 100644 index e69de29..0000000 diff --git a/nvim/nvim.symlink/colors/maxbucknell_light.erb b/nvim/nvim.symlink/colors/maxbucknell_dark.erb similarity index 74% rename from nvim/nvim.symlink/colors/maxbucknell_light.erb rename to nvim/nvim.symlink/colors/maxbucknell_dark.erb index 7cc8de0..556bce9 100644 --- a/nvim/nvim.symlink/colors/maxbucknell_light.erb +++ b/nvim/nvim.symlink/colors/maxbucknell_dark.erb @@ -29,51 +29,54 @@ webpage: "https://github.com/maxbucknell/dotfiles" } - # Step 2: colors - # - # black = [ give each color a distinctive name - # "#000000", hexadecimal color used in GVim/MacVim - # 0, integer between 0 and 255 used by terminals supporting 256 colors - # "black" color name used by less capable color terminals, can be "darkred", - # "red", "darkgreen", "green", "darkyellow", "yellow", "darkblue", - # "blue", "darkmagenta", "magenta", "black", "darkgrey", "grey", - # "white" - # ] - # - # If your colors are defined correctly, the resulting colorscheme is guaranteed - # to work in GVim (Windows/Linux), MacVim, and any properly set up terminal emulator. - # - # The colors below are the first 16 colors of the xterm palette. They - # are only here as an example, though. You can get rid of them, I won't be mad. - black = ["#000000", 0, "black"] - darkred = ["#800000", 1, "darkred"] - darkgreen = ["#008000", 2, "darkgreen"] - darkyellow = ["#808000", 3, "darkyellow"] - darkblue = ["#000080", 4, "darkblue"] - darkmagenta = ["#800080", 5, "darkmagenta"] - darkcyan = ["#008080", 6, "darkcyan"] - gray = ["#c0c0c0", 7, "gray"] - darkgray = ["#808080", 8, "darkgray"] - red = ["#ff0000", 9, "red"] - green = ["#00ff00", 10, "green"] - yellow = ["#ffff00", 11, "yellow"] - blue = ["#0000ff", 12, "blue"] - magenta = ["#ff00ff", 13, "magenta"] - cyan = ["#00ffff", 14, "cyan"] - white = ["#ffffff", 15, "white"] + # ANSI Dark colours, picked with hue, 80% saturation, 80% brightness + # ANSI Light colours, picked with hue, 20% saturation, 93% brightness + darkred = ["#CC4129", 1, "darkred"] # 9º + red = ["#ECC4BD", 9, "red"] - background = ["#F7F8FF", 15, "white"] - blurred_background = ["#D8DAE8", 15, "white"] - light_background = ["#F0F1FF", 7, "gray"] - extra_light_background = ["#F2F4FF", 7, "gray"] - search_highlight = ["#B6BDF0", 10, "green"] - symbol_highlight = ["#F0D1EA", 15, "white"] - error_highlight = ["#E0ABAB", 15, "white"] - warning_highlight = ["#E0DDAB", 15, "white"] - info_highlight = warning_highlight - paren_highlight = symbol_highlight + darkgreen = ["#4FCC29", 2, "darkgreen"] # 106º + green = ["#C8ECBD", 10, "green"] - foreground = ["#16182B", 0, "black"] + # Actually orange + darkorange = ["#CC7229", 3, "darkyellow"] # 27º + orange = ["#EDD3BE", 15, "white"] + + darkyellow = ["#CCC129", 3, "darkyellow"] # 56º + yellow = ["#EDEABE", 15, "white"] + + darkblue = ["#29A1CC", 4, "darkblue"] # 196º + blue = ["#BEE0EC", 15, "white"] + + darkmagenta = ["#CC29C9", 5, "darkmagenta"] # 301º + magenta = ["#ECBCEB", 15, "white"] + + darkcyan = ["#29CCBA", 6, "darkcyan"] # 173º + cyan = ["#ADD3BE", 14, "cyan"] + + grey = [ + ["#ECE9ED", 15, "white"], + ["#DFDDE0", 15, "white"], + ["#D2CFD3", 15, "white"], + ["#C6C3C7", 15, "white"], + ["#B7AFB9", 15, "white"], + ["#9E92A1", 15, "white"], + ["#806D87", 15, "white"], + ["#67556E", 15, "white"], + ["#4D3A54", 15, "white"], + ["#331E3B", 15, "white"], + ["#1A0821", 15, "white"], + ] + + background = grey[10] + foreground = grey[0] + + error = red + warning = yellow + info = orange + hint = blue + + search = green + symbol = magenta # Step 3: highlights # @@ -111,16 +114,25 @@ highlights = [ [ "Normal", background, foreground, "NONE" ], [ "NormalFloat", background, foreground, "NONE" ], - [ "NormalNC", blurred_background, foreground, "NONE"], + [ "NormalNC", grey[8], foreground, "NONE"], [ "NonText", "NONE", "NONE", "NONE" ], [ "Comment", "NONE", "NONE", "bold" ], [ "Constant", "NONE", "NONE", "NONE" ], [ "Error", "NONE", "NONE", "NONE" ], - [ "CocErrorHighlight", error_highlight, "NONE", "NONE" ], - [ "CocWarningHighlight", warning_highlight, "NONE", "NONE" ], - [ "CocInfoHighlight", info_highlight, "NONE", "NONE" ], - [ "CocHintHighlight", info_highlight, "NONE", "NONE" ], - [ "CocHighlightText", symbol_highlight, "NONE", "NONE" ], + [ "CocErrorHighlight", darkred, error, "NONE" ], + [ "CocErrorSign", darkred, red, "NONE" ], + [ "CocWarningSign", darkyellow, yellow, "NONE" ], + [ "CocHintSign", darkblue, blue, "NONE" ], + [ "CocInfoSign", darkorange, orange, "NONE" ], + [ "CocErrorVirtualText", "NONE", darkred, "NONE" ], + [ "CocWarningVirtualText", "NONE", darkyellow, "NONE" ], + [ "CocHintVirtualText", "NONE", darkblue, "NONE" ], + [ "CocInfoVirtualText", "NONE", darkorange, "NONE" ], + [ "CocWarningHighlight", darkyellow, warning, "NONE" ], + [ "CocInfoHighlight", darkorange, info, "NONE" ], + [ "CocHintHighlight", darkblue, hint, "NONE" ], + [ "CocHighlightText", darkmagenta, symbol, "NONE" ], + [ "CocCodeLens", "NONE", grey[7] ], [ "Identifier", "NONE", "NONE", "NONE" ], [ "Ignore", "NONE", "NONE", "NONE" ], [ "PreProc", "NONE", "NONE", "NONE" ], @@ -128,26 +140,26 @@ [ "Statement", "NONE", "NONE", "NONE" ], [ "String", "Constant" ], [ "Number", "Constant" ], - [ "Todo", "NONE", "NONE", "NONE" ], + [ "Todo", "NONE", "NONE" "NONE" ], [ "Type", "NONE", "NONE", "NONE" ], [ "Underlined", "NONE", "NONE", "NONE" ], - [ "StatusLine", light_background, "NONE", "NONE" ], - [ "StatusLineNC", light_background, "NONE", "NONE" ], - [ "VertSplit", "NONE", light_background, "NONE" ], + [ "StatusLine", grey[9], "NONE", "NONE" ], + [ "StatusLineNC", grey[7], "NONE", "NONE" ], + [ "VertSplit", "NONE", grey[3], "NONE" ], [ "TabLine", "NONE", "NONE", "NONE" ], [ "TabLineFill", "NONE", "NONE", "NONE" ], [ "TabLineSel", "NONE", "NONE", "NONE" ], [ "Title", "NONE", "NONE", "NONE" ], - [ "CursorLine", extra_light_background, "NONE", "NONE" ], - [ "LineNr", light_background, "NONE", "NONE" ], - [ "CursorLineNr", foreground, light_background, "NONE" ], + [ "CursorLine", grey[9], "NONE", "NONE" ], + [ "LineNr", "NONE", "NONE", "NONE" ], + [ "CursorLineNr", "NONE", "NONE", "NONE" ], [ "helpLeadBlank", "NONE", "NONE", "NONE" ], [ "helpNormal", "NONE", "NONE", "NONE" ], - [ "Visual", "NONE", "NONE", "NONE" ], - [ "VisualNOS", "NONE", "NONE", "NONE" ], - [ "Pmenu", foreground, background, "NONE" ], + [ "Visual", blue, "NONE", "NONE" ], + [ "VisualNOS", blue, "NONE", "NONE" ], + [ "Pmenu", foreground, darkblue, "NONE" ], [ "PmenuSbar", "NONE", "NONE", "NONE" ], - [ "PmenuSel", red, green, "NONE" ], + [ "PmenuSel", blue, background, "NONE" ], [ "PmenuThumb", "NONE", "NONE", "NONE" ], [ "FoldColumn", "NONE", "NONE", "NONE" ], [ "Folded", "NONE", "NONE", "NONE" ], @@ -157,16 +169,16 @@ [ "DiffChange", "NONE", "NONE", "NONE" ], [ "DiffDelete", "NONE", "NONE", "NONE" ], [ "DiffText", "NONE", "NONE", "NONE" ], - [ "IncSearch", search_highlight, "NONE", "bold" ], - [ "Search", search_highlight, "NONE", "NONE" ], + [ "IncSearch", "NONE", green, "bold" ], + [ "Search", darkgreen, green, "NONE" ], [ "Directory", "NONE", "NONE", "NONE" ], - [ "MatchParen", paren_highlight, "NONE", "NONE" ], - [ "SpellBad", "NONE", "NONE", "NONE", red ], - [ "SpellCap", "NONE", "NONE", "NONE", blue ], - [ "SpellLocal", "NONE", "NONE", "NONE", magenta ], - [ "SpellRare", "NONE", "NONE", "NONE", cyan ], + [ "MatchParen", darkmagenta, magenta, "NONE" ], + [ "SpellBad", "NONE", "NONE", "NONE"], + [ "SpellCap", "NONE", "NONE", "NONE"], + [ "SpellLocal", "NONE", "NONE", "NONE"], + [ "SpellRare", "NONE", "NONE", "NONE"], [ "ColorColumn", "NONE", "NONE", "NONE" ], - [ "SignColumn", light_background, "NONE", "NONE" ], + [ "SignColumn", grey[9], "NONE", "NONE" ], [ "ErrorMsg", "NONE", "NONE", "NONE" ], [ "ModeMsg", "NONE", "NONE", "NONE" ], [ "MoreMsg", "NONE", "NONE", "NONE" ], @@ -175,8 +187,16 @@ [ "Cursor", "NONE", "NONE", "NONE" ], [ "CursorColumn", "NONE", "NONE", "NONE" ], [ "QuickFixLine", "NONE", "NONE", "NONE" ], - [ "StatusLineTerm", light_background, "NONE", "NONE" ], - [ "StatusLineTermNC", light_background, "NONE", "NONE" ] + [ "StatusLineTerm", background, "NONE", "NONE" ], + [ "StatusLineTermNC", background, "NONE", "NONE" ], + [ "RainbowLevel1", grey[1], "NONE", "NONE" ], + [ "RainbowLevel3", grey[1], "NONE", "NONE" ], + [ "RainbowLevel5", grey[1], "NONE", "NONE" ], + [ "RainbowLevel7", grey[1], "NONE", "NONE" ], + [ "RainbowLevel9", grey[1], "NONE", "NONE" ], + [ "RainbowLevel11", grey[1], "NONE", "NONE" ], + [ "RainbowLevel13", grey[1], "NONE", "NONE" ], + [ "RainbowLevel15", grey[1], "NONE", "NONE" ], ] # Define the color palette used by :terminal when in GUI Vim @@ -186,22 +206,22 @@ # # The expected values are colors defined in step 2. terminal_ansi_colors = [ - black, + grey[0], darkred, darkgreen, darkyellow, darkblue, darkmagenta, darkcyan, - gray, - darkgray, + grey[10], + grey[3], red, green, yellow, blue, magenta, cyan, - white + grey[8] ] # Step 4: generation diff --git a/nvim/nvim.symlink/colors/maxbucknell_dark.vim b/nvim/nvim.symlink/colors/maxbucknell_dark.vim new file mode 100644 index 0000000..df09103 --- /dev/null +++ b/nvim/nvim.symlink/colors/maxbucknell_dark.vim @@ -0,0 +1,214 @@ +" maxbucknell_light.vim -- Vim color scheme. +" Author: Max Bucknell (me@maxbucknell.com) +" Webpage: https://github.com/maxbucknell/dotfiles +" Description: My colour scheme, bruh. + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "maxbucknell_light" + +if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") + hi Normal ctermbg=15 ctermfg=15 cterm=NONE guibg=#1A0821 guifg=#ECE9ED gui=NONE + + set background=light + + hi NormalFloat ctermbg=15 ctermfg=15 cterm=NONE guibg=#1A0821 guifg=#ECE9ED gui=NONE + hi NormalNC ctermbg=15 ctermfg=15 cterm=NONE guibg=#4D3A54 guifg=#ECE9ED gui=NONE + hi NonText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Comment ctermbg=NONE ctermfg=NONE cterm=bold guibg=NONE guifg=NONE gui=bold + hi Constant ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Error ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocErrorHighlight ctermbg=1 ctermfg=9 cterm=NONE guibg=#CC4129 guifg=#ECC4BD gui=NONE + hi CocErrorSign ctermbg=1 ctermfg=9 cterm=NONE guibg=#CC4129 guifg=#ECC4BD gui=NONE + hi CocWarningSign ctermbg=3 ctermfg=15 cterm=NONE guibg=#CCC129 guifg=#EDEABE gui=NONE + hi CocHintSign ctermbg=4 ctermfg=15 cterm=NONE guibg=#29A1CC guifg=#BEE0EC gui=NONE + hi CocInfoSign ctermbg=3 ctermfg=15 cterm=NONE guibg=#CC7229 guifg=#EDD3BE gui=NONE + hi CocErrorVirtualText ctermbg=NONE ctermfg=1 cterm=NONE guibg=NONE guifg=#CC4129 gui=NONE + hi CocWarningVirtualText ctermbg=NONE ctermfg=3 cterm=NONE guibg=NONE guifg=#CCC129 gui=NONE + hi CocHintVirtualText ctermbg=NONE ctermfg=4 cterm=NONE guibg=NONE guifg=#29A1CC gui=NONE + hi CocInfoVirtualText ctermbg=NONE ctermfg=3 cterm=NONE guibg=NONE guifg=#CC7229 gui=NONE + hi CocWarningHighlight ctermbg=3 ctermfg=15 cterm=NONE guibg=#CCC129 guifg=#EDEABE gui=NONE + hi CocInfoHighlight ctermbg=3 ctermfg=15 cterm=NONE guibg=#CC7229 guifg=#EDD3BE gui=NONE + hi CocHintHighlight ctermbg=4 ctermfg=15 cterm=NONE guibg=#29A1CC guifg=#BEE0EC gui=NONE + hi CocHighlightText ctermbg=5 ctermfg=15 cterm=NONE guibg=#CC29C9 guifg=#ECBCEB gui=NONE + hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi PreProc ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Special ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Type ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Underlined ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi StatusLine ctermbg=15 ctermfg=NONE cterm=NONE guibg=#331E3B guifg=NONE gui=NONE + hi StatusLineNC ctermbg=15 ctermfg=NONE cterm=NONE guibg=#67556E guifg=NONE gui=NONE + hi VertSplit ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#C6C3C7 gui=NONE + hi TabLine ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi TabLineSel ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Title ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CursorLine ctermbg=15 ctermfg=NONE cterm=NONE guibg=#331E3B guifg=NONE gui=NONE + hi LineNr ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Visual ctermbg=15 ctermfg=NONE cterm=NONE guibg=#BEE0EC guifg=NONE gui=NONE + hi VisualNOS ctermbg=15 ctermfg=NONE cterm=NONE guibg=#BEE0EC guifg=NONE gui=NONE + hi Pmenu ctermbg=15 ctermfg=4 cterm=NONE guibg=#ECE9ED guifg=#29A1CC gui=NONE + hi PmenuSbar ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi PmenuSel ctermbg=15 ctermfg=15 cterm=NONE guibg=#BEE0EC guifg=#1A0821 gui=NONE + hi PmenuThumb ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi FoldColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Folded ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi WildMenu ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi SpecialKey ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi DiffAdd ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi DiffChange ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi DiffDelete ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi IncSearch ctermbg=NONE ctermfg=10 cterm=bold guibg=NONE guifg=#C8ECBD gui=bold + hi Search ctermbg=2 ctermfg=10 cterm=NONE guibg=#4FCC29 guifg=#C8ECBD gui=NONE + hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi MatchParen ctermbg=5 ctermfg=15 cterm=NONE guibg=#CC29C9 guifg=#ECBCEB gui=NONE + hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi ColorColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi SignColumn ctermbg=15 ctermfg=NONE cterm=NONE guibg=#331E3B guifg=NONE gui=NONE + hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi MoreMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Question ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Cursor ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CursorColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi QuickFixLine ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi StatusLineTerm ctermbg=15 ctermfg=NONE cterm=NONE guibg=#1A0821 guifg=NONE gui=NONE + hi StatusLineTermNC ctermbg=15 ctermfg=NONE cterm=NONE guibg=#1A0821 guifg=NONE gui=NONE + hi RainbowLevel1 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE + hi RainbowLevel3 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE + hi RainbowLevel5 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE + hi RainbowLevel7 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE + hi RainbowLevel9 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE + hi RainbowLevel11 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE + hi RainbowLevel13 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE + hi RainbowLevel15 ctermbg=15 ctermfg=NONE cterm=NONE guibg=#DFDDE0 guifg=NONE gui=NONE + +elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 + set t_Co=16 + + hi Normal ctermbg=white ctermfg=white cterm=NONE + + set background=light + + hi NormalFloat ctermbg=white ctermfg=white cterm=NONE + hi NormalNC ctermbg=white ctermfg=white cterm=NONE + hi NonText ctermbg=NONE ctermfg=NONE cterm=NONE + hi Comment ctermbg=NONE ctermfg=NONE cterm=bold + hi Constant ctermbg=NONE ctermfg=NONE cterm=NONE + hi Error ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocErrorHighlight ctermbg=darkred ctermfg=red cterm=NONE + hi CocErrorSign ctermbg=darkred ctermfg=red cterm=NONE + hi CocWarningSign ctermbg=darkyellow ctermfg=white cterm=NONE + hi CocHintSign ctermbg=darkblue ctermfg=white cterm=NONE + hi CocInfoSign ctermbg=darkyellow ctermfg=white cterm=NONE + hi CocErrorVirtualText ctermbg=NONE ctermfg=darkred cterm=NONE + hi CocWarningVirtualText ctermbg=NONE ctermfg=darkyellow cterm=NONE + hi CocHintVirtualText ctermbg=NONE ctermfg=darkblue cterm=NONE + hi CocInfoVirtualText ctermbg=NONE ctermfg=darkyellow cterm=NONE + hi CocWarningHighlight ctermbg=darkyellow ctermfg=white cterm=NONE + hi CocInfoHighlight ctermbg=darkyellow ctermfg=white cterm=NONE + hi CocHintHighlight ctermbg=darkblue ctermfg=white cterm=NONE + hi CocHighlightText ctermbg=darkmagenta ctermfg=white cterm=NONE + hi CocCodeLens ctermbg=NONE ctermfg=white cterm= + hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE + hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE + hi PreProc ctermbg=NONE ctermfg=NONE cterm=NONE + hi Special ctermbg=NONE ctermfg=NONE cterm=NONE + hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE + hi Todo ctermbg=NONE ctermfg=NONENONE cterm= + hi Type ctermbg=NONE ctermfg=NONE cterm=NONE + hi Underlined ctermbg=NONE ctermfg=NONE cterm=NONE + hi StatusLine ctermbg=white ctermfg=NONE cterm=NONE + hi StatusLineNC ctermbg=white ctermfg=NONE cterm=NONE + hi VertSplit ctermbg=NONE ctermfg=white cterm=NONE + hi TabLine ctermbg=NONE ctermfg=NONE cterm=NONE + hi TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE + hi TabLineSel ctermbg=NONE ctermfg=NONE cterm=NONE + hi Title ctermbg=NONE ctermfg=NONE cterm=NONE + hi CursorLine ctermbg=white ctermfg=NONE cterm=NONE + hi LineNr ctermbg=NONE ctermfg=NONE cterm=NONE + hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE + hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE + hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE + hi Visual ctermbg=white ctermfg=NONE cterm=NONE + hi VisualNOS ctermbg=white ctermfg=NONE cterm=NONE + hi Pmenu ctermbg=white ctermfg=darkblue cterm=NONE + hi PmenuSbar ctermbg=NONE ctermfg=NONE cterm=NONE + hi PmenuSel ctermbg=white ctermfg=white cterm=NONE + hi PmenuThumb ctermbg=NONE ctermfg=NONE cterm=NONE + hi FoldColumn ctermbg=NONE ctermfg=NONE cterm=NONE + hi Folded ctermbg=NONE ctermfg=NONE cterm=NONE + hi WildMenu ctermbg=NONE ctermfg=NONE cterm=NONE + hi SpecialKey ctermbg=NONE ctermfg=NONE cterm=NONE + hi DiffAdd ctermbg=NONE ctermfg=NONE cterm=NONE + hi DiffChange ctermbg=NONE ctermfg=NONE cterm=NONE + hi DiffDelete ctermbg=NONE ctermfg=NONE cterm=NONE + hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE + hi IncSearch ctermbg=NONE ctermfg=green cterm=bold + hi Search ctermbg=darkgreen ctermfg=green cterm=NONE + hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE + hi MatchParen ctermbg=darkmagenta ctermfg=white cterm=NONE + hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE + hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE + hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE + hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE + hi ColorColumn ctermbg=NONE ctermfg=NONE cterm=NONE + hi SignColumn ctermbg=white ctermfg=NONE cterm=NONE + hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE + hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE + hi MoreMsg ctermbg=NONE ctermfg=NONE cterm=NONE + hi Question ctermbg=NONE ctermfg=NONE cterm=NONE + hi Cursor ctermbg=NONE ctermfg=NONE cterm=NONE + hi CursorColumn ctermbg=NONE ctermfg=NONE cterm=NONE + hi QuickFixLine ctermbg=NONE ctermfg=NONE cterm=NONE + hi StatusLineTerm ctermbg=white ctermfg=NONE cterm=NONE + hi StatusLineTermNC ctermbg=white ctermfg=NONE cterm=NONE + hi RainbowLevel1 ctermbg=white ctermfg=NONE cterm=NONE + hi RainbowLevel3 ctermbg=white ctermfg=NONE cterm=NONE + hi RainbowLevel5 ctermbg=white ctermfg=NONE cterm=NONE + hi RainbowLevel7 ctermbg=white ctermfg=NONE cterm=NONE + hi RainbowLevel9 ctermbg=white ctermfg=NONE cterm=NONE + hi RainbowLevel11 ctermbg=white ctermfg=NONE cterm=NONE + hi RainbowLevel13 ctermbg=white ctermfg=NONE cterm=NONE + hi RainbowLevel15 ctermbg=white ctermfg=NONE cterm=NONE +endif + +hi link String Constant +hi link Number Constant +hi link WarningMsg Error + +let g:terminal_ansi_colors = [ + \ '#ECE9ED', + \ '#CC4129', + \ '#4FCC29', + \ '#CCC129', + \ '#29A1CC', + \ '#CC29C9', + \ '#29CCBA', + \ '#1A0821', + \ '#C6C3C7', + \ '#ECC4BD', + \ '#C8ECBD', + \ '#EDEABE', + \ '#BEE0EC', + \ '#ECBCEB', + \ '#ADD3BE', + \ '#4D3A54', + \ ] + + + +" Generated with RNB (https://gist.github.com/romainl/5cd2f4ec222805f49eca) diff --git a/nvim/nvim.symlink/colors/maxbucknell_neo.erb b/nvim/nvim.symlink/colors/maxbucknell_neo.erb new file mode 100644 index 0000000..b2b65f8 --- /dev/null +++ b/nvim/nvim.symlink/colors/maxbucknell_neo.erb @@ -0,0 +1,280 @@ +<% + # RNB, A VIM COLORSCHEME TEMPLATE + # Author: Romain Lafourcade (https://github.com/romainl) + # Canonical URL: https://gist.github.com/romainl/5cd2f4ec222805f49eca + + # This template is designed to help vimmers create their own colorschemes + # without much effort. + # + # You will need Ruby to generate your colorscheme but Ruby knowledge is + # not needed at all. + # + # The process is divided in four steps: + # 1. start by editing your colorscheme's information, + # 2. define your colors, + # 3. define your highlight groups and links, + # 4. and generate your colorscheme. + + # Step 1: information + # + # Make sure the name of your colorscheme is unique and attractive. + # The description should fit in a single line with no linefeed. + # 'background' can be "light" or "dark". + information = { + author: "Max Bucknell", + email: "me@maxbucknell.com", + name: "maxbucknell_neo", + description: "My colour scheme, bruh.", + background: "light", + webpage: "https://github.com/maxbucknell/dotfiles" + } + + def grey(v) + hex = v.to_s(16).rjust(2, '0') + color = "#" + hex * 3 + + return [color, 15, "white"] + end + + def color(r, g, b) + hex = [r, g, b].map { |v| v.to_s(16).rjust(2, '0') }.join("") + + return ["#" + hex, 15, "white"] + end + + background = 255 - 32 + foreground = 31 + + background_float = background + 6 + background_nc = background - 6 + + gutter = background - 12 + + trail = foreground + 48 + virtual = background - 48 + + cursor_line = background + 12 + + pmenu_background = background - 54 + pmenu_foreground = foreground + 36 + pmenu_background_selected = background - 36 + pmenu_foreground_selected = foreground + 24 + + highlights = [ + [ "Normal", grey(background), grey(foreground), "NONE" ], + [ "NormalFloat", grey(background_float), grey(foreground), "NONE" ], + [ "NormalNC", grey(background_nc), grey(foreground), "NONE"], + [ "NonText", "NONE", trail, "NONE" ], + [ "Comment", "NONE", "NONE", "bold" ], + [ "Constant", "NONE", "NONE", "NONE" ], + [ "Error", "NONE", "NONE", "NONE" ], + [ "CocErrorSign", "NONE", "NONE", "NONE" ], + [ "CocWarningSign", "NONE", "NONE", "NONE" ], + [ "CocHintSign", "NONE", "NONE", "NONE" ], + [ "CocInfoSign", "NONE", "NONE", "NONE" ], + [ "CocErrorVirtualText", "NONE", grey(virtual), "NONE" ], + [ "CocWarningVirtualText", "NONE", grey(virtual), "NONE" ], + [ "CocHintVirtualText", "NONE", grey(virtual), "NONE" ], + [ "CocInfoVirtualText", "NONE", grey(virtual), "NONE" ], + [ "CocErrorHighlight", "NONE", "NONE", "NONE" ], + [ "CocWarningHighlight", "NONE", "NONE", "NONE" ], + [ "CocInfoHighlight", "NONE", "NONE", "NONE" ], + [ "CocHintHighlight", "NONE", "NONE", "NONE" ], + [ "CocHighlightText", "NONE", "NONE", "NONE" ], + [ "Identifier", "NONE", "NONE", "NONE" ], + [ "Ignore", "NONE", "NONE", "NONE" ], + [ "PreProc", "NONE", "NONE", "NONE" ], + [ "Special", "NONE", "NONE", "NONE" ], + [ "Statement", "NONE", "NONE", "NONE" ], + [ "String", "Constant" ], + [ "Number", "Constant" ], + [ "Todo", "NONE", "NONE" "NONE" ], + [ "Type", "NONE", "NONE", "NONE" ], + [ "Underlined", "NONE", "NONE", "NONE" ], + [ "StatusLine", grey(background), grey(foreground), "NONE" ], + [ "StatusLineNC", grey(background_nc), grey(foreground), "NONE" ], + [ "VertSplit", "NONE", grey(foreground), "NONE" ], + [ "TabLine", "NONE", "NONE", "NONE" ], + [ "TabLineFill", "NONE", "NONE", "NONE" ], + [ "TabLineSel", "NONE", "NONE", "NONE" ], + [ "Title", "NONE", "NONE", "NONE" ], + [ "CursorLine", cursor_line, "NONE", "NONE" ], + [ "LineNr", grey(gutter), "NONE", "NONE" ], + [ "CursorLineNr", "NONE", "NONE", "NONE" ], + [ "helpLeadBlank", "NONE", "NONE", "NONE" ], + [ "helpNormal", "NONE", "NONE", "NONE" ], + [ "Visual", grey(foreground), grey(background), "NONE" ], + [ "VisualNOS", "NONE", "NONE", "NONE" ], + [ "Pmenu", grey(pmenu_background), grey(pmenu_foreground), "NONE" ], + [ "PmenuSbar", "NONE", "NONE", "NONE" ], + [ "PmenuSel", grey(pmenu_background_selected), grey(pmenu_foreground_selected), "NONE" ], + [ "PmenuThumb", "NONE", "NONE", "NONE" ], + [ "FoldColumn", "NONE", "NONE", "NONE" ], + [ "Folded", "NONE", "NONE", "NONE" ], + [ "WildMenu", "NONE", "NONE", "NONE" ], + [ "SpecialKey", "NONE", "NONE", "NONE" ], + [ "DiffAdd", "NONE", "NONE", "NONE" ], + [ "DiffChange", "NONE", "NONE", "NONE" ], + [ "DiffDelete", "NONE", "NONE", "NONE" ], + [ "DiffText", "NONE", "NONE", "NONE" ], + [ "IncSearch", "NONE", "NONE", "underline" ], + [ "Search", "NONE", "NONE", "underline" ], + [ "Directory", "NONE", "NONE", "NONE" ], + [ "MatchParen", grey(background + 18), "NONE", "NONE" ], + [ "SpellBad", "NONE", "NONE", "NONE"], + [ "SpellCap", "NONE", "NONE", "NONE"], + [ "SpellLocal", "NONE", "NONE", "NONE"], + [ "SpellRare", "NONE", "NONE", "NONE"], + [ "ColorColumn", "NONE", "NONE", "NONE" ], + [ "SignColumn", grey(gutter), "NONE", "NONE" ], + [ "ErrorMsg", "NONE", "NONE", "NONE" ], + [ "ModeMsg", "NONE", "NONE", "NONE" ], + [ "MoreMsg", "NONE", "NONE", "NONE" ], + [ "Question", "NONE", "NONE", "NONE" ], + [ "WarningMsg", "Error" ], + [ "Cursor", "NONE", "NONE", "NONE" ], + [ "CursorColumn", "NONE", "NONE", "NONE" ], + [ "QuickFixLine", "NONE", "NONE", "NONE" ], + [ "StatusLineTerm", "NONE", "NONE", "NONE" ], + [ "StatusLineTermNC", "NONE", "NONE", "NONE" ], + ] + + # Define the color palette used by :terminal when in GUI Vim + # or in TUI Vim when 'termguicolors' is enabled. If this list + # is empty or if it doesn't contain exactly 16 items, the corresponding + # Vim variable won't be set. + # + # The expected values are colors defined in step 2. + terminal_ansi_colors = [ + + ] + + # Step 4: generation + # + # From a separate shell: + # + # $ erb -T - bar.erb > bar.vim + # + # From Vim: + # + # :!erb -T - % > %<.vim + + # These online resources can help you design your colorscheme: + # + # * http://upload.wikimedia.org/wikipedia/en/1/15/Xterm_256color_chart.svg + # the xterm palette + # * http://whatcolor.herokuapp.com/ + # play with hexadecimal colors right in the address bar (currently down) + # * http://color.hailpixel.com/ + # similar concept, fuzzier implementation + # * http://colourco.de/ + # similar concept, fancier implementation + # * http://www.colr.org/ + # extract a palette from an image + # * http://colores.manugarri.com/ + # search for 'word', get images and color palettes + # * http://www.colourlovers.com/palettes + # user-created palettes + # * http://www.perbang.dk/color+scheme/ + # a no-nonsense colorscheme generator + # * https://color.adobe.com/ + # Adobe's fancy colorscheme generator + # * http://paletton.com/ + # The classic 'Color Scheme Designer', rebranded + # * http://vrl.cs.brown.edu/color + # A very smart palette generator + # * https://cmcenroe.me/2018/04/03/colour-scheme.html + # "I Made My Own Colour Scheme and You Can Too!" + + # A few general advices: + # + # * The Windows console is limited to the 16 so-called "ANSI" colors but it has + # a few of them interverted which makes numbers impractical. Use color names + # instead of numbers: :help cterm-colors + # * The Windows console (yeah…) doesn't do italics, underlines or bolded text; + # it is limited to normal and reverse. Keep that in mind if you want + # your colorscheme to be usable in as many environments as possible by as many + # people as possible. + # * All of the terminal emulators in use these days allow their users to + # change the 16 so-called "ANSI" colors. It is also possible on some platforms + # to change some or all of the 256 colors in the xterm palette. Don't take + # anything for granted. + # * When used against a light background, strong colors work better than muted + # ones. Light or dark doesn't really matters. Also, it is harder to discriminate + # between two similar colors on a light background. + # * Both strong and muted colors work well against a dark background. It is also + # easier to work with similar colors, but dark colors don't work at all. + # * Use as many text samples as possible. String-heavy languages may look completely + # different than keyword-heavy ones. This can have an impact on the usability + # of your colorscheme. + # * Most terminal emulators and terminal multiplexers currently in use on unix-like + # systems support 256 colors but they almost always default to a '$TERM' that tells + # Vim otherwise. Your users will need to make sure their terminal emulator/multiplexer + # is correctly set up if they want to enjoy the best possible experience. + + # Many thanks to Barry Arthur (https://github.com/dahu) for the original idea. + + # You don't need to edit anything beyond this line. +-%> +" <%= information[:name] %>.vim -- Vim color scheme. +" Author: <%= information[:author] %> (<%= information[:email] %>) +" Webpage: <%= information[:webpage] %> +" Description: <%= information[:description] %> + +hi clear + +if exists("syntax_on") + syntax reset +endif + +let colors_name = "<%= information[:name].downcase %>" + +if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") +<% for highlight in highlights -%> +<% if highlight.length == 4 -%> + hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][1] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][1] %> cterm=<%= highlight[3] %> guibg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][0] %> guifg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][0] %> gui=<%= highlight[3] %> +<% if highlight[0] == "Normal" -%> +<%= '' %> + set background=<%= information[:background] %> +<%= '' %> +<% end -%> +<% elsif highlight.length > 4 -%> + hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][1] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][1] %> cterm=<%= highlight[3] %> guibg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][0] %> guifg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][0] %> gui=<%= highlight[3] %> guisp=<%= highlight[4].kind_of?(String) ? highlight[4] : highlight[4][0] %> +<% end -%> +<% end -%> + +elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 + set t_Co=16 +<%= '' %> +<% for highlight in highlights -%> +<% if highlight.length > 2 -%> + hi <%= highlight[0] %> ctermbg=<%= highlight[1].kind_of?(String) ? highlight[1] : highlight[1][2] %> ctermfg=<%= highlight[2].kind_of?(String) ? highlight[2] : highlight[2][2] %> cterm=<%= highlight[3] %> +<% if highlight[0] == "Normal" -%> +<%= '' %> + set background=<%= information[:background] %> +<%= '' %> +<% end -%> +<% end -%> +<% end -%> +endif +<% links = highlights.select do |highlight| -%> +<% highlight.length == 2 -%> +<% end -%> +<% if links.length > 0 -%> +<%= '' %> +<% for link in links -%> +hi link <%= link[0] %> <%= link[1] %> +<% end -%> +<% end -%> +<% if terminal_ansi_colors.length == 16 -%> +<%= '' %> +let g:terminal_ansi_colors = [ +<% for color in terminal_ansi_colors -%> + \ '<%= color[0] %>', +<% end -%> + \ ] +<% end -%> + + + +" Generated with RNB (https://gist.github.com/romainl/5cd2f4ec222805f49eca) diff --git a/nvim/nvim.symlink/colors/maxbucknell_light.vim b/nvim/nvim.symlink/colors/maxbucknell_neo.vim similarity index 56% rename from nvim/nvim.symlink/colors/maxbucknell_light.vim rename to nvim/nvim.symlink/colors/maxbucknell_neo.vim index dc00518..60725a5 100644 --- a/nvim/nvim.symlink/colors/maxbucknell_light.vim +++ b/nvim/nvim.symlink/colors/maxbucknell_neo.vim @@ -1,4 +1,4 @@ -" maxbucknell_light.vim -- Vim color scheme. +" maxbucknell_neo.vim -- Vim color scheme. " Author: Max Bucknell (me@maxbucknell.com) " Webpage: https://github.com/maxbucknell/dotfiles " Description: My colour scheme, bruh. @@ -9,49 +9,56 @@ if exists("syntax_on") syntax reset endif -let colors_name = "maxbucknell_light" +let colors_name = "maxbucknell_neo" if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") - hi Normal ctermbg=15 ctermfg=0 cterm=NONE guibg=#F7F8FF guifg=#16182B gui=NONE + hi Normal ctermbg=15 ctermfg=15 cterm=NONE guibg=#dfdfdf guifg=#1f1f1f gui=NONE set background=light - hi NormalFloat ctermbg=15 ctermfg=0 cterm=NONE guibg=#F7F8FF guifg=#16182B gui=NONE - hi NormalNC ctermbg=15 ctermfg=0 cterm=NONE guibg=#D8DAE8 guifg=#16182B gui=NONE - hi NonText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi NormalFloat ctermbg=15 ctermfg=15 cterm=NONE guibg=#e5e5e5 guifg=#1f1f1f gui=NONE + hi NormalNC ctermbg=15 ctermfg=15 cterm=NONE guibg=#d9d9d9 guifg=#1f1f1f gui=NONE + hi NonText ctermbg=NONE ctermfg=1 cterm=NONE guibg=NONE guifg=1 gui=NONE hi Comment ctermbg=NONE ctermfg=NONE cterm=bold guibg=NONE guifg=NONE gui=bold hi Constant ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Error ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CocErrorHighlight ctermbg=15 ctermfg=NONE cterm=NONE guibg=#E0ABAB guifg=NONE gui=NONE - hi CocWarningHighlight ctermbg=15 ctermfg=NONE cterm=NONE guibg=#E0DDAB guifg=NONE gui=NONE - hi CocInfoHighlight ctermbg=15 ctermfg=NONE cterm=NONE guibg=#E0DDAB guifg=NONE gui=NONE - hi CocHintHighlight ctermbg=15 ctermfg=NONE cterm=NONE guibg=#E0DDAB guifg=NONE gui=NONE - hi CocHighlightText ctermbg=15 ctermfg=NONE cterm=NONE guibg=#F0D1EA guifg=NONE gui=NONE + hi CocErrorSign ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocWarningSign ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocHintSign ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocInfoSign ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocErrorVirtualText ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE + hi CocWarningVirtualText ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE + hi CocHintVirtualText ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE + hi CocInfoVirtualText ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#afafaf gui=NONE + hi CocErrorHighlight ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocWarningHighlight ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocInfoHighlight ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocHintHighlight ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi CocHighlightText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi PreProc ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Special ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Todo ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Type ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Underlined ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi StatusLine ctermbg=7 ctermfg=NONE cterm=NONE guibg=#F0F1FF guifg=NONE gui=NONE - hi StatusLineNC ctermbg=7 ctermfg=NONE cterm=NONE guibg=#F0F1FF guifg=NONE gui=NONE - hi VertSplit ctermbg=NONE ctermfg=7 cterm=NONE guibg=NONE guifg=#F0F1FF gui=NONE + hi StatusLine ctermbg=15 ctermfg=15 cterm=NONE guibg=#dfdfdf guifg=#1f1f1f gui=NONE + hi StatusLineNC ctermbg=15 ctermfg=15 cterm=NONE guibg=#d9d9d9 guifg=#1f1f1f gui=NONE + hi VertSplit ctermbg=NONE ctermfg=15 cterm=NONE guibg=NONE guifg=#1f1f1f gui=NONE hi TabLine ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi TabLineSel ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Title ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi CursorLine ctermbg=7 ctermfg=NONE cterm=NONE guibg=#F2F4FF guifg=NONE gui=NONE - hi LineNr ctermbg=7 ctermfg=NONE cterm=NONE guibg=#F0F1FF guifg=NONE gui=NONE - hi CursorLineNr ctermbg=0 ctermfg=7 cterm=NONE guibg=#16182B guifg=#F0F1FF gui=NONE + hi CursorLine ctermbg=1 ctermfg=NONE cterm=NONE guibg=1 guifg=NONE gui=NONE + hi LineNr ctermbg=15 ctermfg=NONE cterm=NONE guibg=#d3d3d3 guifg=NONE gui=NONE + hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Visual ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi Visual ctermbg=15 ctermfg=15 cterm=NONE guibg=#1f1f1f guifg=#dfdfdf gui=NONE hi VisualNOS ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi Pmenu ctermbg=0 ctermfg=15 cterm=NONE guibg=#16182B guifg=#F7F8FF gui=NONE + hi Pmenu ctermbg=15 ctermfg=15 cterm=NONE guibg=#a9a9a9 guifg=#434343 gui=NONE hi PmenuSbar ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi PmenuSel ctermbg=9 ctermfg=10 cterm=NONE guibg=#ff0000 guifg=#00ff00 gui=NONE + hi PmenuSel ctermbg=15 ctermfg=15 cterm=NONE guibg=#bbbbbb guifg=#373737 gui=NONE hi PmenuThumb ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi FoldColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi Folded ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE @@ -61,16 +68,16 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi DiffChange ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi DiffDelete ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi IncSearch ctermbg=10 ctermfg=NONE cterm=bold guibg=#B6BDF0 guifg=NONE gui=bold - hi Search ctermbg=10 ctermfg=NONE cterm=NONE guibg=#B6BDF0 guifg=NONE gui=NONE + hi IncSearch ctermbg=NONE ctermfg=NONE cterm=underline guibg=NONE guifg=NONE gui=underline + hi Search ctermbg=NONE ctermfg=NONE cterm=underline guibg=NONE guifg=NONE gui=underline hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi MatchParen ctermbg=15 ctermfg=NONE cterm=NONE guibg=#F0D1EA guifg=NONE gui=NONE - hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE guisp=#ff0000 - hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE guisp=#0000ff - hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE guisp=#ff00ff - hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE guisp=#00ffff + hi MatchParen ctermbg=15 ctermfg=NONE cterm=NONE guibg=#f1f1f1 guifg=NONE gui=NONE + hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi SpellCap ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi ColorColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi SignColumn ctermbg=7 ctermfg=NONE cterm=NONE guibg=#F0F1FF guifg=NONE gui=NONE + hi SignColumn ctermbg=15 ctermfg=NONE cterm=NONE guibg=#d3d3d3 guifg=NONE gui=NONE hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi MoreMsg ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE @@ -78,52 +85,60 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi Cursor ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi CursorColumn ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE hi QuickFixLine ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE - hi StatusLineTerm ctermbg=7 ctermfg=NONE cterm=NONE guibg=#F0F1FF guifg=NONE gui=NONE - hi StatusLineTermNC ctermbg=7 ctermfg=NONE cterm=NONE guibg=#F0F1FF guifg=NONE gui=NONE + hi StatusLineTerm ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE + hi StatusLineTermNC ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=NONE gui=NONE elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 set t_Co=16 - hi Normal ctermbg=white ctermfg=black cterm=NONE + hi Normal ctermbg=white ctermfg=white cterm=NONE set background=light - hi NormalFloat ctermbg=white ctermfg=black cterm=NONE - hi NormalNC ctermbg=white ctermfg=black cterm=NONE - hi NonText ctermbg=NONE ctermfg=NONE cterm=NONE + hi NormalFloat ctermbg=white ctermfg=white cterm=NONE + hi NormalNC ctermbg=white ctermfg=white cterm=NONE + hi NonText ctermbg=NONE ctermfg=1 cterm=NONE hi Comment ctermbg=NONE ctermfg=NONE cterm=bold hi Constant ctermbg=NONE ctermfg=NONE cterm=NONE hi Error ctermbg=NONE ctermfg=NONE cterm=NONE - hi CocErrorHighlight ctermbg=white ctermfg=NONE cterm=NONE - hi CocWarningHighlight ctermbg=white ctermfg=NONE cterm=NONE - hi CocInfoHighlight ctermbg=white ctermfg=NONE cterm=NONE - hi CocHintHighlight ctermbg=white ctermfg=NONE cterm=NONE - hi CocHighlightText ctermbg=white ctermfg=NONE cterm=NONE + hi CocErrorSign ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocWarningSign ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocHintSign ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocInfoSign ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocErrorVirtualText ctermbg=NONE ctermfg=white cterm=NONE + hi CocWarningVirtualText ctermbg=NONE ctermfg=white cterm=NONE + hi CocHintVirtualText ctermbg=NONE ctermfg=white cterm=NONE + hi CocInfoVirtualText ctermbg=NONE ctermfg=white cterm=NONE + hi CocErrorHighlight ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocWarningHighlight ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocInfoHighlight ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocHintHighlight ctermbg=NONE ctermfg=NONE cterm=NONE + hi CocHighlightText ctermbg=NONE ctermfg=NONE cterm=NONE hi Identifier ctermbg=NONE ctermfg=NONE cterm=NONE hi Ignore ctermbg=NONE ctermfg=NONE cterm=NONE hi PreProc ctermbg=NONE ctermfg=NONE cterm=NONE hi Special ctermbg=NONE ctermfg=NONE cterm=NONE hi Statement ctermbg=NONE ctermfg=NONE cterm=NONE - hi Todo ctermbg=NONE ctermfg=NONE cterm=NONE + hi Todo ctermbg=NONE ctermfg=NONENONE cterm= hi Type ctermbg=NONE ctermfg=NONE cterm=NONE hi Underlined ctermbg=NONE ctermfg=NONE cterm=NONE - hi StatusLine ctermbg=gray ctermfg=NONE cterm=NONE - hi StatusLineNC ctermbg=gray ctermfg=NONE cterm=NONE - hi VertSplit ctermbg=NONE ctermfg=gray cterm=NONE + hi StatusLine ctermbg=white ctermfg=white cterm=NONE + hi StatusLineNC ctermbg=white ctermfg=white cterm=NONE + hi VertSplit ctermbg=NONE ctermfg=white cterm=NONE hi TabLine ctermbg=NONE ctermfg=NONE cterm=NONE hi TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE hi TabLineSel ctermbg=NONE ctermfg=NONE cterm=NONE hi Title ctermbg=NONE ctermfg=NONE cterm=NONE - hi CursorLine ctermbg=gray ctermfg=NONE cterm=NONE - hi LineNr ctermbg=gray ctermfg=NONE cterm=NONE - hi CursorLineNr ctermbg=black ctermfg=gray cterm=NONE + hi CursorLine ctermbg=0 ctermfg=NONE cterm=NONE + hi LineNr ctermbg=white ctermfg=NONE cterm=NONE + hi CursorLineNr ctermbg=NONE ctermfg=NONE cterm=NONE hi helpLeadBlank ctermbg=NONE ctermfg=NONE cterm=NONE hi helpNormal ctermbg=NONE ctermfg=NONE cterm=NONE - hi Visual ctermbg=NONE ctermfg=NONE cterm=NONE + hi Visual ctermbg=white ctermfg=white cterm=NONE hi VisualNOS ctermbg=NONE ctermfg=NONE cterm=NONE - hi Pmenu ctermbg=black ctermfg=white cterm=NONE + hi Pmenu ctermbg=white ctermfg=white cterm=NONE hi PmenuSbar ctermbg=NONE ctermfg=NONE cterm=NONE - hi PmenuSel ctermbg=red ctermfg=green cterm=NONE + hi PmenuSel ctermbg=white ctermfg=white cterm=NONE hi PmenuThumb ctermbg=NONE ctermfg=NONE cterm=NONE hi FoldColumn ctermbg=NONE ctermfg=NONE cterm=NONE hi Folded ctermbg=NONE ctermfg=NONE cterm=NONE @@ -133,8 +148,8 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi DiffChange ctermbg=NONE ctermfg=NONE cterm=NONE hi DiffDelete ctermbg=NONE ctermfg=NONE cterm=NONE hi DiffText ctermbg=NONE ctermfg=NONE cterm=NONE - hi IncSearch ctermbg=green ctermfg=NONE cterm=bold - hi Search ctermbg=green ctermfg=NONE cterm=NONE + hi IncSearch ctermbg=NONE ctermfg=NONE cterm=underline + hi Search ctermbg=NONE ctermfg=NONE cterm=underline hi Directory ctermbg=NONE ctermfg=NONE cterm=NONE hi MatchParen ctermbg=white ctermfg=NONE cterm=NONE hi SpellBad ctermbg=NONE ctermfg=NONE cterm=NONE @@ -142,7 +157,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi SpellLocal ctermbg=NONE ctermfg=NONE cterm=NONE hi SpellRare ctermbg=NONE ctermfg=NONE cterm=NONE hi ColorColumn ctermbg=NONE ctermfg=NONE cterm=NONE - hi SignColumn ctermbg=gray ctermfg=NONE cterm=NONE + hi SignColumn ctermbg=white ctermfg=NONE cterm=NONE hi ErrorMsg ctermbg=NONE ctermfg=NONE cterm=NONE hi ModeMsg ctermbg=NONE ctermfg=NONE cterm=NONE hi MoreMsg ctermbg=NONE ctermfg=NONE cterm=NONE @@ -150,33 +165,14 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi Cursor ctermbg=NONE ctermfg=NONE cterm=NONE hi CursorColumn ctermbg=NONE ctermfg=NONE cterm=NONE hi QuickFixLine ctermbg=NONE ctermfg=NONE cterm=NONE - hi StatusLineTerm ctermbg=gray ctermfg=NONE cterm=NONE - hi StatusLineTermNC ctermbg=gray ctermfg=NONE cterm=NONE + hi StatusLineTerm ctermbg=NONE ctermfg=NONE cterm=NONE + hi StatusLineTermNC ctermbg=NONE ctermfg=NONE cterm=NONE endif hi link String Constant hi link Number Constant hi link WarningMsg Error -let g:terminal_ansi_colors = [ - \ '#000000', - \ '#800000', - \ '#008000', - \ '#808000', - \ '#000080', - \ '#800080', - \ '#008080', - \ '#c0c0c0', - \ '#808080', - \ '#ff0000', - \ '#00ff00', - \ '#ffff00', - \ '#0000ff', - \ '#ff00ff', - \ '#00ffff', - \ '#ffffff', - \ ] - " Generated with RNB (https://gist.github.com/romainl/5cd2f4ec222805f49eca) diff --git a/nvim/nvim.symlink/init.vim b/nvim/nvim.symlink/init.vim index 71368a7..32ac45d 100644 --- a/nvim/nvim.symlink/init.vim +++ b/nvim/nvim.symlink/init.vim @@ -157,11 +157,11 @@ filetype plugin indent on let g:is_dark_mode = system("isdark") if g:is_dark_mode == "true\n" - set background=light - colorscheme maxbucknell_light + set background=dark + colorscheme maxbucknell_dark else set background=light - colorscheme maxbucknell_light + colorscheme maxbucknell_neo endif let g:go_def_mapping_enabled = 0