diff --git a/README.md b/README.md index 6bf90c4..2c04ca4 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,12 @@ A dark Vim/Neovim color scheme for the GUI and 16/256/true-color terminals, base ![Color Reference](https://raw.githubusercontent.com/joshdick/onedark.vim/master/img/color_reference.png) +## Breaking Changes + +[Pull request #271](https://github.com/joshdick/onedark.vim/pull/271), merged July 11, 2021, contained several breaking changes, especially for 16-color users. + +If you are an existing onedark.vim user that is suddenly having issues after this PR was merged, see the [PR description](https://github.com/joshdick/onedark.vim/pull/271) for details. + ## Supported Plugins onedark.vim includes support for the following Vim and Neovim plugins: diff --git a/autoload/airline/themes/onedark.vim b/autoload/airline/themes/onedark.vim index bd01234..65181dd 100644 --- a/autoload/airline/themes/onedark.vim +++ b/autoload/airline/themes/onedark.vim @@ -14,8 +14,8 @@ function! airline#themes#onedark#refresh() let s:term_blue = s:colors.blue.cterm16 let s:term_purple = s:colors.purple.cterm16 let s:term_white = s:colors.white.cterm16 - let s:term_black = s:colors.black.cterm16 - let s:term_grey = s:colors.cursor_grey.cterm16 + let s:term_cursor_grey = s:colors.cursor_grey.cterm16 + let s:term_visual_grey = s:colors.visual_grey.cterm16 else let s:term_red = s:colors.red.cterm let s:term_green = s:colors.green.cterm @@ -23,8 +23,8 @@ function! airline#themes#onedark#refresh() let s:term_blue = s:colors.blue.cterm let s:term_purple = s:colors.purple.cterm let s:term_white = s:colors.white.cterm - let s:term_black = s:colors.black.cterm - let s:term_grey = s:colors.cursor_grey.cterm + let s:term_cursor_grey = s:colors.cursor_grey.cterm + let s:term_visual_grey = s:colors.visual_grey.cterm endif let g:airline#themes#onedark#palette = {} @@ -33,9 +33,9 @@ function! airline#themes#onedark#refresh() \ 'red': [ s:colors.red.gui, '', s:term_red, 0 ] \ } - let s:N1 = [ s:colors.black.gui, s:colors.green.gui, s:term_black, s:term_green ] - let s:N2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_grey ] - let s:N3 = [ s:colors.green.gui, s:colors.black.gui, s:term_green, '' ] + let s:N1 = [ s:colors.cursor_grey.gui, s:colors.green.gui, s:term_cursor_grey, s:term_green ] + let s:N2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_visual_grey ] + let s:N3 = [ s:colors.green.gui, s:colors.cursor_grey.gui, s:term_green, s:term_cursor_grey ] let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) let group = airline#themes#get_highlight('vimCommand') @@ -43,26 +43,26 @@ function! airline#themes#onedark#refresh() \ 'airline_c': [ group[0], '', group[2], '', '' ] \ } - let s:I1 = [ s:colors.black.gui, s:colors.blue.gui, s:term_black, s:term_blue ] + let s:I1 = [ s:colors.cursor_grey.gui, s:colors.blue.gui, s:term_cursor_grey, s:term_blue ] let s:I2 = s:N2 - let s:I3 = [ s:colors.blue.gui, s:colors.black.gui, s:term_blue, '' ] + let s:I3 = [ s:colors.blue.gui, s:colors.cursor_grey.gui, s:term_blue, '' ] let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified - let s:R1 = [ s:colors.black.gui, s:colors.red.gui, s:term_black, s:term_red ] + let s:R1 = [ s:colors.cursor_grey.gui, s:colors.red.gui, s:term_cursor_grey, s:term_red ] let s:R2 = s:N2 - let s:R3 = [ s:colors.red.gui, s:colors.black.gui, s:term_red, '' ] + let s:R3 = [ s:colors.red.gui, s:colors.cursor_grey.gui, s:term_red, '' ] let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified - let s:V1 = [ s:colors.black.gui, s:colors.purple.gui, s:term_black, s:term_purple ] + let s:V1 = [ s:colors.cursor_grey.gui, s:colors.purple.gui, s:term_cursor_grey, s:term_purple ] let s:V2 = s:N2 - let s:V3 = [ s:colors.purple.gui, s:colors.black.gui, s:term_purple, '' ] + let s:V3 = [ s:colors.purple.gui, s:colors.cursor_grey.gui, s:term_purple, '' ] let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified - let s:IA1 = [ s:colors.black.gui, s:colors.white.gui, s:term_black, s:term_white ] - let s:IA2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_grey ] + let s:IA1 = [ s:colors.cursor_grey.gui, s:colors.white.gui, s:term_cursor_grey, s:term_white ] + let s:IA2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_visual_grey ] let s:IA3 = s:N2 let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3) let g:airline#themes#onedark#palette.inactive_modified = { @@ -72,7 +72,7 @@ function! airline#themes#onedark#refresh() " Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim) " Warnings - let s:WI = [ s:colors.black.gui, s:colors.yellow.gui, s:term_black, s:term_yellow ] + let s:WI = [ s:colors.cursor_grey.gui, s:colors.yellow.gui, s:term_cursor_grey, s:term_yellow ] let g:airline#themes#onedark#palette.normal.airline_warning = [ \ s:WI[0], s:WI[1], s:WI[2], s:WI[3] \ ] @@ -99,7 +99,7 @@ function! airline#themes#onedark#refresh() \ g:airline#themes#onedark#palette.normal.airline_warning " Errors - let s:ER = [ s:colors.black.gui, s:colors.red.gui, s:term_black, s:term_red ] + let s:ER = [ s:colors.cursor_grey.gui, s:colors.red.gui, s:term_cursor_grey, s:term_red ] let g:airline#themes#onedark#palette.normal.airline_error = [ \ s:ER[0], s:ER[1], s:ER[2], s:ER[3] \ ] diff --git a/autoload/lightline/colorscheme/onedark.vim b/autoload/lightline/colorscheme/onedark.vim index 10f9a0b..d04a501 100644 --- a/autoload/lightline/colorscheme/onedark.vim +++ b/autoload/lightline/colorscheme/onedark.vim @@ -12,8 +12,8 @@ if get(g:, 'onedark_termcolors', 256) == 16 let s:term_blue = s:colors.blue.cterm16 let s:term_purple = s:colors.purple.cterm16 let s:term_white = s:colors.white.cterm16 - let s:term_black = s:colors.black.cterm16 - let s:term_grey = s:colors.cursor_grey.cterm16 + let s:term_cursor_grey = s:colors.cursor_grey.cterm16 + let s:term_visual_grey = s:colors.visual_grey.cterm16 else let s:term_red = s:colors.red.cterm let s:term_green = s:colors.green.cterm @@ -21,8 +21,8 @@ else let s:term_blue = s:colors.blue.cterm let s:term_purple = s:colors.purple.cterm let s:term_white = s:colors.white.cterm - let s:term_black = s:colors.black.cterm - let s:term_grey = s:colors.cursor_grey.cterm + let s:term_cursor_grey = s:colors.cursor_grey.cterm + let s:term_visual_grey = s:colors.visual_grey.cterm endif let s:red = [ s:colors.red.gui, s:term_red ] @@ -31,28 +31,28 @@ let s:yellow = [ s:colors.yellow.gui, s:term_yellow ] let s:blue = [ s:colors.blue.gui, s:term_blue ] let s:purple = [ s:colors.purple.gui, s:term_purple ] let s:white = [ s:colors.white.gui, s:term_white ] -let s:black = [ s:colors.black.gui, s:term_black ] -let s:grey = [ s:colors.visual_grey.gui, s:term_grey ] +let s:cursor_grey = [ s:colors.cursor_grey.gui, s:term_cursor_grey ] +let s:visual_grey = [ s:colors.visual_grey.gui, s:term_visual_grey ] let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} -let s:p.normal.left = [ [ s:black, s:green ], [ s:white, s:grey ] ] -let s:p.normal.right = [ [ s:black, s:green ], [ s:white, s:grey ] ] -let s:p.inactive.left = [ [ s:white, s:grey ], [ s:white, s:grey ] ] -let s:p.inactive.right = [ [ s:black, s:white ], [ s:black, s:white ] ] -let s:p.insert.left = [ [ s:black, s:blue ], [ s:white, s:grey ] ] -let s:p.insert.right = [ [ s:black, s:blue ], [ s:white, s:grey ] ] -let s:p.replace.left = [ [ s:black, s:red ], [ s:white, s:grey ] ] -let s:p.replace.right = [ [ s:black, s:red ], [ s:white, s:grey ] ] -let s:p.visual.left = [ [ s:black, s:purple ], [ s:white, s:grey ] ] -let s:p.visual.right = [ [ s:black, s:purple ], [ s:white, s:grey ] ] -let s:p.normal.middle = [ [ s:white, s:black ] ] -let s:p.inactive.middle = [ [ s:white, s:grey ] ] -let s:p.tabline.left = [ [ s:white, s:grey ] ] -let s:p.tabline.tabsel = [ [ s:black, s:white ] ] -let s:p.tabline.middle = [ [ s:white, s:black ] ] -let s:p.tabline.right = [ [ s:white, s:grey ] ] -let s:p.normal.error = [ [ s:black, s:red ] ] -let s:p.normal.warning = [ [ s:black, s:yellow ] ] +let s:p.normal.left = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ] +let s:p.normal.right = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ] +let s:p.inactive.left = [ [ s:white, s:visual_grey ], [ s:white, s:visual_grey ] ] +let s:p.inactive.right = [ [ s:cursor_grey, s:white ], [ s:cursor_grey, s:white ] ] +let s:p.insert.left = [ [ s:cursor_grey, s:blue ], [ s:white, s:visual_grey ] ] +let s:p.insert.right = [ [ s:cursor_grey, s:blue ], [ s:white, s:visual_grey ] ] +let s:p.replace.left = [ [ s:cursor_grey, s:red ], [ s:white, s:visual_grey ] ] +let s:p.replace.right = [ [ s:cursor_grey, s:red ], [ s:white, s:visual_grey ] ] +let s:p.visual.left = [ [ s:cursor_grey, s:purple ], [ s:white, s:visual_grey ] ] +let s:p.visual.right = [ [ s:cursor_grey, s:purple ], [ s:white, s:visual_grey ] ] +let s:p.normal.middle = [ [ s:white, s:cursor_grey ] ] +let s:p.inactive.middle = [ [ s:white, s:visual_grey ] ] +let s:p.tabline.left = [ [ s:white, s:visual_grey ] ] +let s:p.tabline.tabsel = [ [ s:cursor_grey, s:white ] ] +let s:p.tabline.middle = [ [ s:white, s:cursor_grey ] ] +let s:p.tabline.right = [ [ s:white, s:visual_grey ] ] +let s:p.normal.error = [ [ s:cursor_grey, s:red ] ] +let s:p.normal.warning = [ [ s:cursor_grey, s:yellow ] ] let g:lightline#colorscheme#onedark#palette = lightline#colorscheme#flatten(s:p) diff --git a/autoload/onedark.vim b/autoload/onedark.vim index 054a430..4630ff4 100644 --- a/autoload/onedark.vim +++ b/autoload/onedark.vim @@ -11,16 +11,17 @@ let s:colors = { \ "blue": get(s:overrides, "blue", { "gui": "#61AFEF", "cterm": "39", "cterm16": "4" }), \ "purple": get(s:overrides, "purple", { "gui": "#C678DD", "cterm": "170", "cterm16": "5" }), \ "cyan": get(s:overrides, "cyan", { "gui": "#56B6C2", "cterm": "38", "cterm16": "6" }), - \ "white": get(s:overrides, "white", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "7" }), + \ "white": get(s:overrides, "white", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "15" }), \ "black": get(s:overrides, "black", { "gui": "#282C34", "cterm": "235", "cterm16": "0" }), - \ "visual_black": get(s:overrides, "visual_black", { "gui": "NONE", "cterm": "NONE", "cterm16": "0" }), - \ "comment_grey": get(s:overrides, "comment_grey", { "gui": "#5C6370", "cterm": "59", "cterm16": "15" }), - \ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "#4B5263", "cterm": "238", "cterm16": "15" }), - \ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "#2C323C", "cterm": "236", "cterm16": "8" }), - \ "visual_grey": get(s:overrides, "visual_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "15" }), - \ "menu_grey": get(s:overrides, "menu_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "8" }), - \ "special_grey": get(s:overrides, "special_grey", { "gui": "#3B4048", "cterm": "238", "cterm16": "15" }), - \ "vertsplit": get(s:overrides, "vertsplit", { "gui": "#181A1F", "cterm": "59", "cterm16": "15" }), + \ "foreground": get(s:overrides, "foreground", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "NONE" }), + \ "background": get(s:overrides, "background", { "gui": "#282C34", "cterm": "235", "cterm16": "NONE" }), + \ "comment_grey": get(s:overrides, "comment_grey", { "gui": "#5C6370", "cterm": "59", "cterm16": "7" }), + \ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "#4B5263", "cterm": "238", "cterm16": "8" }), + \ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "#2C323C", "cterm": "236", "cterm16": "0" }), + \ "visual_grey": get(s:overrides, "visual_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "8" }), + \ "menu_grey": get(s:overrides, "menu_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "7" }), + \ "special_grey": get(s:overrides, "special_grey", { "gui": "#3B4048", "cterm": "238", "cterm16": "7" }), + \ "vertsplit": get(s:overrides, "vertsplit", { "gui": "#3E4452", "cterm": "59", "cterm16": "7" }), \} function! onedark#GetColors() diff --git a/build/build.js b/build/build.js index 95566b5..e251ccf 100755 --- a/build/build.js +++ b/build/build.js @@ -14,18 +14,18 @@ const baseColors = Object.freeze({ blue: { gui: '#61AFEF', cterm: '39', cterm16: '4' }, // alternate cterm: 75 purple: { gui: '#C678DD', cterm: '170', cterm16: '5' }, // alternate cterm: 176 cyan: { gui: '#56B6C2', cterm: '38', cterm16: '6' }, // alternate cterm: 73 - white: { gui: '#ABB2BF', cterm: '145', cterm16: '7' }, + white: { gui: '#ABB2BF', cterm: '145', cterm16: '15' }, black: { gui: '#282C34', cterm: '235', cterm16: '0' } }); const specialColors = Object.freeze({ - comment_grey: { gui: '#5C6370', cterm: '59', cterm16: '15' }, - gutter_fg_grey: { gui: '#4B5263', cterm: '238', cterm16: '15' }, - cursor_grey: { gui: '#2C323C', cterm: '236', cterm16: '8' }, - visual_grey: { gui: '#3E4452', cterm: '237', cterm16: '15' }, - menu_grey: { cterm16: '8' }, // vim theme handles gui/cterm values - special_grey: { gui: '#3B4048', cterm: '238', cterm16: '15' }, - vertsplit: { gui: '#181A1F', cterm: '59', cterm16: '15' } + comment_grey: { gui: '#5C6370', cterm: '59', cterm16: '7' }, + gutter_fg_grey: { gui: '#4B5263', cterm: '238', cterm16: '8' }, + cursor_grey: { gui: '#2C323C', cterm: '236', cterm16: '0' }, + visual_grey: { gui: '#3E4452', cterm: '237', cterm16: '8' }, + menu_grey: { cterm16: '7' }, // vim theme handles gui/cterm values + special_grey: { gui: '#3B4048', cterm: '238', cterm16: '7' }, + vertsplit: { gui: '#3E4452', cterm: '59', cterm16: '7' } }); const colors = Object.assign({}, baseColors, specialColors); diff --git a/build/templates/One Dark.Xresources b/build/templates/One Dark.Xresources index 4051d88..632d663 100644 --- a/build/templates/One Dark.Xresources +++ b/build/templates/One Dark.Xresources @@ -4,12 +4,12 @@ *.cursorColor: <%=white.gui%> ! black -*.color0: <%=comment_grey.gui%> -*.color8: <%=gutter_fg_grey.gui%> +*.color0: <%=cursor_grey.gui%> +*.color8: <%=visual_grey.gui%> ! red *.color1: <%=red.gui%> -*.color9: <%=dark_red.gui%> +*.color9: <%=red.gui%> ! green *.color2: <%=green.gui%> @@ -17,7 +17,7 @@ ! yellow *.color3: <%=yellow.gui%> -*.color11: <%=dark_yellow.gui%> +*.color11: <%=yellow.gui%> ! blue *.color4: <%=blue.gui%> @@ -32,6 +32,6 @@ *.color14: <%=cyan.gui%> ! white -*.color7: <%=white.gui%> -*.color15: <%=visual_grey.gui%> +*.color7: <%=comment_grey.gui%> +*.color15: <%=white.gui%> diff --git a/build/templates/autoload.template.vim b/build/templates/autoload.template.vim index fdd1919..204ecc6 100644 --- a/build/templates/autoload.template.vim +++ b/build/templates/autoload.template.vim @@ -13,7 +13,8 @@ let s:colors = { \ "cyan": get(s:overrides, "cyan", { "gui": "<%=cyan.gui%>", "cterm": "<%=cyan.cterm%>", "cterm16": "<%=cyan.cterm16%>" }), \ "white": get(s:overrides, "white", { "gui": "<%=white.gui%>", "cterm": "<%=white.cterm%>", "cterm16": "<%=white.cterm16%>" }), \ "black": get(s:overrides, "black", { "gui": "<%=black.gui%>", "cterm": "<%=black.cterm%>", "cterm16": "<%=black.cterm16%>" }), - \ "visual_black": get(s:overrides, "visual_black", { "gui": "NONE", "cterm": "NONE", "cterm16": "<%=black.cterm16%>" }), + \ "foreground": get(s:overrides, "foreground", { "gui": "<%=white.gui%>", "cterm": "<%=white.cterm%>", "cterm16": "NONE" }), + \ "background": get(s:overrides, "background", { "gui": "<%=black.gui%>", "cterm": "<%=black.cterm%>", "cterm16": "NONE" }), \ "comment_grey": get(s:overrides, "comment_grey", { "gui": "<%=comment_grey.gui%>", "cterm": "<%=comment_grey.cterm%>", "cterm16": "<%=comment_grey.cterm16%>" }), \ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "<%=gutter_fg_grey.gui%>", "cterm": "<%=gutter_fg_grey.cterm%>", "cterm16": "<%=gutter_fg_grey.cterm16%>" }), \ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "<%=cursor_grey.gui%>", "cterm": "<%=cursor_grey.cterm%>", "cterm16": "<%=cursor_grey.cterm16%>" }), diff --git a/colors/onedark.vim b/colors/onedark.vim index 3df2ba2..e356331 100644 --- a/colors/onedark.vim +++ b/colors/onedark.vim @@ -145,7 +145,8 @@ let s:purple = s:colors.purple let s:cyan = s:colors.cyan let s:white = s:colors.white let s:black = s:colors.black -let s:visual_black = s:colors.visual_black " Black out selected text in 16-color visual mode +let s:foreground = s:colors.foreground +let s:background = s:colors.background let s:comment_grey = s:colors.comment_grey let s:gutter_fg_grey = s:colors.gutter_fg_grey let s:cursor_grey = s:colors.cursor_grey @@ -160,9 +161,9 @@ let s:vertsplit = s:colors.vertsplit let g:terminal_ansi_colors = [ \ s:black.gui, s:red.gui, s:green.gui, s:yellow.gui, - \ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui, - \ s:visual_grey.gui, s:dark_red.gui, s:green.gui, s:dark_yellow.gui, - \ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui + \ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui, + \ s:visual_grey.gui, s:red.gui, s:green.gui, s:yellow.gui, + \ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui \] " }}} @@ -240,10 +241,10 @@ call s:h("MatchParen", { "fg": s:blue, "gui": "underline", "cterm": "underline" call s:h("ModeMsg", {}) " 'showmode' message (e.g., "-- INSERT --") call s:h("MoreMsg", {}) " more-prompt call s:h("NonText", { "fg": s:special_grey }) " '~' and '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). -call s:h("Normal", { "fg": s:white, "bg": s:black }) " normal text -call s:h("Pmenu", { "bg": s:menu_grey }) " Popup menu: normal item. -call s:h("PmenuSel", { "fg": s:black, "bg": s:blue }) " Popup menu: selected item. -call s:h("PmenuSbar", { "bg": s:special_grey }) " Popup menu: scrollbar. +call s:h("Normal", { "fg": s:foreground, "bg": s:background }) " normal text +call s:h("Pmenu", { "fg": s:white, "bg": s:menu_grey }) " Popup menu: normal item. +call s:h("PmenuSel", { "fg": s:cursor_grey, "bg": s:blue }) " Popup menu: selected item. +call s:h("PmenuSbar", { "bg": s:cursor_grey }) " Popup menu: scrollbar. call s:h("PmenuThumb", { "bg": s:white }) " Popup menu: Thumb of the scrollbar. call s:h("Question", { "fg": s:purple }) " hit-enter prompt and yes/no questions call s:h("QuickFixLine", { "fg": s:black, "bg": s:yellow }) " Current quickfix item in the quickfix window. @@ -262,7 +263,7 @@ call s:h("TabLineFill", {}) " tab pages line, where there are no labels call s:h("TabLineSel", { "fg": s:white }) " tab pages line, active tab page label call s:h("Terminal", { "fg": s:white, "bg": s:black }) " terminal window (see terminal-size-color) call s:h("Title", { "fg": s:green }) " titles for output from ":set all", ":autocmd" etc. -call s:h("Visual", { "fg": s:visual_black, "bg": s:visual_grey }) " Visual mode selection +call s:h("Visual", { "bg": s:visual_grey }) " Visual mode selection call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim is "Not Owning the Selection". Only X11 Gui's gui-x11 and xterm-clipboard supports this. call s:h("WarningMsg", { "fg": s:yellow }) " warning messages call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion @@ -644,8 +645,8 @@ if has("nvim") let g:terminal_color_13 = s:purple.gui " No dark version let g:terminal_color_14 = s:cyan.gui " No dark version let g:terminal_color_15 = s:comment_grey.gui - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_7 + let g:terminal_color_background = s:background.gui + let g:terminal_color_foreground = s:foreground.gui " }}} " Neovim LSP {{{ diff --git a/term/One Dark.Xresources b/term/One Dark.Xresources index 3107e18..37aec79 100644 --- a/term/One Dark.Xresources +++ b/term/One Dark.Xresources @@ -4,12 +4,12 @@ *.cursorColor: #ABB2BF ! black -*.color0: #5C6370 -*.color8: #4B5263 +*.color0: #2C323C +*.color8: #3E4452 ! red *.color1: #E06C75 -*.color9: #BE5046 +*.color9: #E06C75 ! green *.color2: #98C379 @@ -17,7 +17,7 @@ ! yellow *.color3: #E5C07B -*.color11: #D19A66 +*.color11: #E5C07B ! blue *.color4: #61AFEF @@ -32,6 +32,6 @@ *.color14: #56B6C2 ! white -*.color7: #ABB2BF -*.color15: #3E4452 +*.color7: #5C6370 +*.color15: #ABB2BF diff --git a/term/One Dark.alacritty b/term/One Dark.alacritty index b864fd6..a1f3b57 100644 --- a/term/One Dark.alacritty +++ b/term/One Dark.alacritty @@ -7,12 +7,23 @@ colors: # Cursor colors cursor: - text: '0x5c6370' - cursor: '0xabb2bf' + text: '0x2c323c' + cursor: '0x5c6370' # Normal colors normal: - black: '0x5c6370' + black: '0x2c323c' + red: '0xe06c75' + green: '0x98c379' + yellow: '0xe5c07b' + blue: '0x61afef' + magenta: '0xc678dd' + cyan: '0x56b6c2' + white: '0x5c6370' + + # Bright colors + bright: + black: '0x3e4452' red: '0xe06c75' green: '0x98c379' yellow: '0xe5c07b' @@ -21,14 +32,3 @@ colors: cyan: '0x56b6c2' white: '0xabb2bf' - # Bright colors - bright: - black: '0x4b5263' - red: '0xbe5046' - green: '0x98c379' - yellow: '0xd19a66' - blue: '0x61afef' - magenta: '0xc678dd' - cyan: '0x56b6c2' - white: '0x3e4452' - diff --git a/term/One Dark.colorscheme b/term/One Dark.colorscheme index 27dd194..6f4bff5 100644 --- a/term/One Dark.colorscheme +++ b/term/One Dark.colorscheme @@ -8,13 +8,13 @@ Color=40,44,52 Color=40,44,52 [Color0] -Color=92,99,112 +Color=44,50,60 [Color0Faint] -Color=92,99,112 +Color=44,50,60 [Color0Intense] -Color=75,82,99 +Color=62,68,82 [Color1] Color=224,108,117 @@ -23,7 +23,7 @@ Color=224,108,117 Color=224,108,117 [Color1Intense] -Color=190,80,70 +Color=224,108,117 [Color2] Color=152,195,121 @@ -41,7 +41,7 @@ Color=229,192,123 Color=229,192,123 [Color3Intense] -Color=209,154,102 +Color=229,192,123 [Color4] Color=97,175,239 @@ -71,13 +71,13 @@ Color=86,182,194 Color=86,182,194 [Color7] -Color=171,178,191 +Color=92,99,112 [Color7Faint] -Color=171,178,191 +Color=92,99,112 [Color7Intense] -Color=62,68,82 +Color=171,178,191 [Foreground] Color=171,178,191 diff --git a/term/One Dark.itermcolors b/term/One Dark.itermcolors index dff657b..fa08006 100644 --- a/term/One Dark.itermcolors +++ b/term/One Dark.itermcolors @@ -7,11 +7,11 @@ Color Space sRGB Blue Component - 0.4392156862745098 + 0.23529411764705882 Green Component - 0.38823529411764707 + 0.19607843137254902 Red Component - 0.3607843137254902 + 0.17254901960784313 Ansi 1 Color @@ -40,11 +40,11 @@ Color Space sRGB Blue Component - 0.4 + 0.4823529411764706 Green Component - 0.6039215686274509 + 0.7529411764705882 Red Component - 0.8196078431372549 + 0.8980392156862745 Ansi 12 Color @@ -84,11 +84,11 @@ Color Space sRGB Blue Component - 0.3215686274509804 + 0.7490196078431373 Green Component - 0.26666666666666666 + 0.6980392156862745 Red Component - 0.24313725490196078 + 0.6705882352941176 Ansi 2 Color @@ -150,33 +150,33 @@ Color Space sRGB Blue Component - 0.7490196078431373 + 0.4392156862745098 Green Component - 0.6980392156862745 + 0.38823529411764707 Red Component - 0.6705882352941176 + 0.3607843137254902 Ansi 8 Color Color Space sRGB Blue Component - 0.38823529411764707 - Green Component 0.3215686274509804 + Green Component + 0.26666666666666666 Red Component - 0.29411764705882354 + 0.24313725490196078 Ansi 9 Color Color Space sRGB Blue Component - 0.27450980392156865 + 0.4588235294117647 Green Component - 0.3137254901960784 + 0.4235294117647059 Red Component - 0.7450980392156863 + 0.8784313725490196 Background Color diff --git a/term/One Dark.kitty b/term/One Dark.kitty index d102db1..a0a1251 100644 --- a/term/One Dark.kitty +++ b/term/One Dark.kitty @@ -1,20 +1,20 @@ # Cursor -cursor #abb2bf -cursor_text_color #5c6370 +cursor #5c6370 +cursor_text_color #2c323c # Special foreground #abb2bf background #282c34 -selection_foreground #5c6370 -selection_background #abb2bf +selection_foreground #2c323c +selection_background #5c6370 # Black -color0 #5c6370 -color8 #4b5263 +color0 #2c323c +color8 #3e4452 # Red color1 #e06c75 -color9 #be5046 +color9 #e06c75 # Green color2 #98c379 @@ -22,7 +22,7 @@ color10 #98c379 # Yellow color3 #e5c07b -color11 #d19a66 +color11 #e5c07b # Blue color4 #61afef @@ -37,5 +37,5 @@ color6 #56b6c2 color14 #56b6c2 # White -color7 #abb2bf -color15 #3e4452 +color7 #5c6370 +color15 #abb2bf diff --git a/term/One Dark.terminal b/term/One Dark.terminal index a0417f2..c5d681f 100644 --- a/term/One Dark.terminal +++ b/term/One Dark.terminal @@ -6,7 +6,7 @@ YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjM2MDc4NDMxMzcgMC4zODgyMzUyOTQxIDAuNDM5MjE1Njg2MwAQAYAC0hAREhNaJGNs + LjE3MjU0OTAxOTYgMC4xOTYwNzg0MzE0IDAuMjM1Mjk0MTE3NgAQAYAC0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -24,7 +24,7 @@ YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjI5NDExNzY0NzEgMC4zMjE1Njg2Mjc1IDAuMzg4MjM1Mjk0MQAQAYAC0hAREhNaJGNs + LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -69,7 +69,7 @@ YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - Ljc0NTA5ODAzOTIgMC4zMTM3MjU0OTAyIDAuMjc0NTA5ODAzOQAQAYAC0hAREhNaJGNs + Ljg3ODQzMTM3MjUgMC40MjM1Mjk0MTE4IDAuNDU4ODIzNTI5NAAQAYAC0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -78,7 +78,7 @@ YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs + LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -87,7 +87,7 @@ YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjgxOTYwNzg0MzEgMC42MDM5MjE1Njg2IDAuNDAwMDAwMDAwMAAQAYAC0hAREhNaJGNs + Ljg5ODAzOTIxNTcgMC43NTI5NDExNzY1IDAuNDgyMzUyOTQxMgAQAYAC0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -132,7 +132,7 @@ YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs + LjM2MDc4NDMxMzcgMC4zODgyMzUyOTQxIDAuNDM5MjE1Njg2MwAQAYAC0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q== @@ -168,7 +168,7 @@ YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw - LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs + LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA AAAZAAAAAAAAAAAAAAAAAAAA2Q==