diff --git a/README.md b/README.md index b11542a..016ff61 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,15 @@ A dark Neovim theme written in Lua ported from the Visual Studio Code [TokyoNigh ## ✨ Features ++ supports the latest Neovim 5.0 features like TreeSitter and LSP ++ minimal inactive statusline ++ vim terminal colors ++ darker background for sidebar-like windows ++ color configs for [Kitty](https://sw.kovidgoyal.net/kitty/conf.html?highlight=include) ++ **lualine** theme + +### Plugin Support + + [TreeSitter](https://github.com/nvim-treesitter/nvim-treesitter) + [LSP Diagnostics](https://neovim.io/doc/user/lsp.html) + [LSP Saga](https://github.com/glepnir/lspsaga.nvim) @@ -24,7 +33,7 @@ A dark Neovim theme written in Lua ported from the Visual Studio Code [TokyoNigh + [Indent Blankline](https://github.com/lukas-reineke/indent-blankline.nvim) + [Dashboard](https://github.com/glepnir/dashboard-nvim) + [BufferLine](https://github.com/akinsho/nvim-bufferline.lua) -+ a TokyNight [Lualine](https://github.com/hoob3rt/lualine.nvim) theme is included ++ [Lualine](https://github.com/hoob3rt/lualine.nvim) ## 📦 Installation @@ -81,7 +90,6 @@ The theme comes in two styles, `storm` and a darker variant `night`. | tokyonight_hide_inactive_statusline | `false` | Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**. | | tokyonight_sidebars | `{}` | Set a darker background on sidebar-like windows. For example: `["quickfix", "__vista__", "terminal"]` | - ```lua -- Example config in Lua vim.g.tokyonight_style = "night" @@ -95,3 +103,11 @@ let g:tokyonight_style = "night" let g:tokyonight_italic_functions = true let g:tokyonight_sidebars = [ "quickfix", "__vista__", "terminal" ] ``` + +## 🍭 Extras + +Two color configs for **Kitty** can be found at [/extra](extra/). To use them, copy the color config you want to your Kitty condif directory and append the following in yout `kitty.conf` + +```kitty +include other.conf +``` diff --git a/extra/build b/extra/build new file mode 100755 index 0000000..8cfa3cb --- /dev/null +++ b/extra/build @@ -0,0 +1,9 @@ +#!/bin/bash + +set -e + +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" +cd "$DIR/.." + +export LUA_PATH="./lua/?/init.lua;./lua/?.lua" +lua -e 'require"tokyonight.extra"' diff --git a/extra/kitty_tokyonight_night.conf b/extra/kitty_tokyonight_night.conf new file mode 100644 index 0000000..a0a7f76 --- /dev/null +++ b/extra/kitty_tokyonight_night.conf @@ -0,0 +1,40 @@ + # TokyoNight colors for Kitty + + background #1a1b26 + foreground #c0caf5 + selection_background #33467C + selection_foreground #c0caf5 + url_color #73daca + cursor #c0caf5 + + # Tabs + active_tab_background #7aa2f7 + active_tab_foreground #1f2335 + inactive_tab_background #292e42 + inactive_tab_foreground #545c7e + #tab_bar_background #15161E + + # normal + color0 #414868 + color1 #f7768e + color2 #9ece6a + color3 #e0af68 + color4 #7aa2f7 + color5 #bb9af7 + color6 #7dcfff + color7 #a9b1d6 + + # bright + color8 #414868 + color9 #f7768e + color10 #9ece6a + color11 #e0af68 + color12 #7aa2f7 + color13 #bb9af7 + color14 #7dcfff + color15 #c0caf5 + + # extended colors + color16 #ff9e64 + color17 #db4b4b + \ No newline at end of file diff --git a/extra/kitty_tokyonight_storm.conf b/extra/kitty_tokyonight_storm.conf new file mode 100644 index 0000000..c8b6a8d --- /dev/null +++ b/extra/kitty_tokyonight_storm.conf @@ -0,0 +1,40 @@ + # TokyoNight colors for Kitty + + background #24283b + foreground #c0caf5 + selection_background #364A82 + selection_foreground #c0caf5 + url_color #73daca + cursor #c0caf5 + + # Tabs + active_tab_background #7aa2f7 + active_tab_foreground #1f2335 + inactive_tab_background #292e42 + inactive_tab_foreground #545c7e + #tab_bar_background #1D202F + + # normal + color0 #414868 + color1 #f7768e + color2 #9ece6a + color3 #e0af68 + color4 #7aa2f7 + color5 #bb9af7 + color6 #7dcfff + color7 #a9b1d6 + + # bright + color8 #414868 + color9 #f7768e + color10 #9ece6a + color11 #e0af68 + color12 #7aa2f7 + color13 #bb9af7 + color14 #7dcfff + color15 #c0caf5 + + # extended colors + color16 #ff9e64 + color17 #db4b4b + \ No newline at end of file diff --git a/lua/lualine/themes/tokyonight.lua b/lua/lualine/themes/tokyonight.lua index 7d3f548..c71e0d9 100644 --- a/lua/lualine/themes/tokyonight.lua +++ b/lua/lualine/themes/tokyonight.lua @@ -1,4 +1,4 @@ -local colors = require("tokyonight.colors") +local colors = require("tokyonight.colors").setup() local tokyonight = {} diff --git a/lua/tokyonight/colors.lua b/lua/tokyonight/colors.lua index 0a7c8f2..93aec16 100644 --- a/lua/tokyonight/colors.lua +++ b/lua/tokyonight/colors.lua @@ -1,59 +1,66 @@ local util = require("tokyonight.util") -local config = require("tokyonight.config") --- Color Palette ----@class ColorScheme -local colors = { - none = "NONE", - bg_dark = "#1f2335", - bg = "#24283b", - bg_highlight = "#292e42", - terminal_black = "#414868", - fg = "#c0caf5", - fg_dark = "#a9b1d6", - fg_gutter = "#3b4261", - dark3 = "#545c7e", - comment = "#565f89", - dark5 = "#737aa2", - blue0 = "#3d59a1", - blue = "#7aa2f7", - cyan = "#7dcfff", - blue1 = "#2ac3de", - blue5 = "#89ddff", - blue6 = "#B4F9F8", - magenta = "#bb9af7", - purple = "#9d7cd8", - orange = "#ff9e64", - yellow = "#e0af68", - green = "#9ece6a", - green1 = "#73daca", - teal = "#1abc9c", - red = "#f7768e", - red1 = "#db4b4b", - diff = { change = "#394b70", add = "#164846", delete = "#823c41" }, - git = { change = "#6183bb", add = "#449dab", delete = "#914c54" }, -} -if config.style == "night" then colors.bg = "#1a1b26" end -util.bg = colors.bg -colors.git.ignore = colors.dark3 -colors.black = util.darken(colors.bg, 0.8, "#000000") -colors.border_highlight = colors.blue0 -colors.border = colors.black +local M = {} -colors.bg_popup = colors.bg_dark -colors.bg_sidebar = colors.bg_dark -colors.bg_statusline = colors.bg_dark -colors.bg_float = colors.bg -colors.bg_visual = util.darken(colors.blue0, 0.7) -colors.bg_search = colors.blue0 -colors.fg_sidebar = colors.fg_dark +---@param config Config +---@return ColorScheme +function M.setup(config) + config = config or require("tokyonight.config") -colors.error = colors.red1 -colors.warning = colors.yellow -colors.info = colors.teal -colors.hint = colors.info + -- Color Palette + ---@class ColorScheme + local colors = { + none = "NONE", + bg_dark = "#1f2335", + bg = "#24283b", + bg_highlight = "#292e42", + terminal_black = "#414868", + fg = "#c0caf5", + fg_dark = "#a9b1d6", + fg_gutter = "#3b4261", + dark3 = "#545c7e", + comment = "#565f89", + dark5 = "#737aa2", + blue0 = "#3d59a1", + blue = "#7aa2f7", + cyan = "#7dcfff", + blue1 = "#2ac3de", + blue5 = "#89ddff", + blue6 = "#B4F9F8", + magenta = "#bb9af7", + purple = "#9d7cd8", + orange = "#ff9e64", + yellow = "#e0af68", + green = "#9ece6a", + green1 = "#73daca", + teal = "#1abc9c", + red = "#f7768e", + red1 = "#db4b4b", + diff = { change = "#394b70", add = "#164846", delete = "#823c41" }, + git = { change = "#6183bb", add = "#449dab", delete = "#914c54" }, + } --- util.fg = colors.fg + if config.style == "night" then colors.bg = "#1a1b26" end + util.bg = colors.bg + colors.git.ignore = colors.dark3 + colors.black = util.darken(colors.bg, 0.8, "#000000") + colors.border_highlight = colors.blue0 + colors.border = colors.black -return colors + colors.bg_popup = colors.bg_dark + colors.bg_sidebar = colors.bg_dark + colors.bg_statusline = colors.bg_dark + colors.bg_float = colors.bg + colors.bg_visual = util.darken(colors.blue0, 0.7) + colors.bg_search = colors.blue0 + colors.fg_sidebar = colors.fg_dark + + colors.error = colors.red1 + colors.warning = colors.yellow + colors.info = colors.teal + colors.hint = colors.info + return colors +end + +return M diff --git a/lua/tokyonight/extra.lua b/lua/tokyonight/extra.lua new file mode 100644 index 0000000..ed18325 --- /dev/null +++ b/lua/tokyonight/extra.lua @@ -0,0 +1,16 @@ +local config = require("tokyonight.config") +local kitty = require("tokyonight.kitty") + +local function write(str, fileName) + local file = io.open("extra/" .. fileName, "w") + file:write(str) + file:close() +end + +config.style = "storm" + +write(kitty.kitty(config), "kitty_tokyonight_storm.conf") + +config.style = "night" + +write(kitty.kitty(config), "kitty_tokyonight_night.conf") diff --git a/lua/tokyonight/init.lua b/lua/tokyonight/init.lua index d6976ce..868f6e3 100644 --- a/lua/tokyonight/init.lua +++ b/lua/tokyonight/init.lua @@ -1,4 +1,9 @@ local util = require("tokyonight.util") local theme = require("tokyonight.theme") -return { colorscheme = function() util.load(theme) end } +local M = {} + +function M.colorscheme() util.load(theme.setup()) end + +return M + diff --git a/lua/tokyonight/kitty.lua b/lua/tokyonight/kitty.lua new file mode 100644 index 0000000..c9fb296 --- /dev/null +++ b/lua/tokyonight/kitty.lua @@ -0,0 +1,54 @@ +local util = require("tokyonight.util") + +local M = {} + +function M.kitty(config) + config = config or require("tokyonight.config") + local colors = require("tokyonight.colors").setup(config) + + local kitty = util.template([[ + # TokyoNight colors for Kitty + + background ${bg} + foreground ${fg} + selection_background ${bg_visual} + selection_foreground ${fg} + url_color ${green1} + cursor ${fg} + + # Tabs + active_tab_background ${blue} + active_tab_foreground ${bg_dark} + inactive_tab_background ${bg_highlight} + inactive_tab_foreground ${dark3} + #tab_bar_background ${black} + + # normal + color0 ${terminal_black} + color1 ${red} + color2 ${green} + color3 ${yellow} + color4 ${blue} + color5 ${magenta} + color6 ${cyan} + color7 ${fg_dark} + + # bright + color8 ${terminal_black} + color9 ${red} + color10 ${green} + color11 ${yellow} + color12 ${blue} + color13 ${magenta} + color14 ${cyan} + color15 ${fg} + + # extended colors + color16 ${orange} + color17 ${red1} + ]], colors) + return kitty +end + +return M + diff --git a/lua/tokyonight/theme.lua b/lua/tokyonight/theme.lua index e54caa7..b10f8c9 100644 --- a/lua/tokyonight/theme.lua +++ b/lua/tokyonight/theme.lua @@ -1,306 +1,314 @@ local util = require("tokyonight.util") -local config = require("tokyonight.config") -local c = require("tokyonight.colors") +local colors = require("tokyonight.colors") ----@class Theme -local theme = {} -theme.config = config -theme.colors = c +local M = {} -theme.base = { - Comment = { fg = c.comment, style = config.commentStyle }, -- any comment - ColorColumn = { bg = c.bg_visual }, -- used for the columns set with 'colorcolumn' - Conceal = { fg = c.fg_gutter }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor = { style = "reverse" }, -- character under the cursor - lCursor = { style = "reverse" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - CursorIM = { style = "reverse" }, -- like Cursor, but used when in IME mode |CursorIM| - CursorColumn = { bg = c.bg_highlight }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - CursorLine = { bg = c.bg_highlight }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. - Directory = { fg = c.fg_dark }, -- directory names (and other special names in listings) - DiffAdd = { bg = c.diff.add }, -- diff mode: Added line |diff.txt| - DiffChange = { bg = c.diff.change }, -- diff mode: Changed line |diff.txt| - DiffDelete = { bg = c.diff.delete }, -- diff mode: Deleted line |diff.txt| - DiffText = { bg = c.diff.change }, -- diff mode: Changed text within a changed line |diff.txt| - EndOfBuffer = { fg = c.bg }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. - -- TermCursor = { }, -- cursor in a focused terminal - -- TermCursorNC= { }, -- cursor in an unfocused terminal - ErrorMsg = { fg = c.error }, -- error messages on the command line - VertSplit = { fg = c.border }, -- the column separating vertically split windows - Folded = { fg = c.blue, bg = c.fg_gutter }, -- line used for closed folds - FoldColumn = { bg = c.bg, fg = c.comment }, -- 'foldcolumn' - SignColumn = { bg = c.bg, fg = c.fg_gutter }, -- column where |signs| are displayed - SignColumnSB = { bg = c.bg_sidebar, fg = c.fg_gutter }, -- column where |signs| are displayed - Substitute = { bg = c.red }, -- |:substitute| replacement text highlighting - LineNr = { fg = c.fg_gutter }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. - CursorLineNr = { fg = c.dark5 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - MatchParen = { fg = c.orange, style = "bold" }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| - ModeMsg = { fg = c.fg_dark, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") - MsgArea = { fg = c.fg_dark }, -- Area for messages and cmdline - -- MsgSeparator= { }, -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg = { fg = c.blue }, -- |more-prompt| - NonText = { fg = c.dark3 }, -- '@' 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). See also |hl-EndOfBuffer|. - Normal = { fg = c.fg, bg = config.transparent and c.none or c.bg }, -- normal text - NormalNC = { fg = c.fg, bg = config.transparent and c.none or c.bg }, -- normal text in non-current windows - NormalSB = { fg = c.fg_sidebar, bg = c.bg_sidebar }, -- normal text in non-current windows - NormalFloat = { fg = c.fg, bg = c.bg_float }, -- Normal text in floating windows. - FloatBorder = { fg = c.border_highlight }, - Pmenu = { bg = c.bg_popup, c.fg }, -- Popup menu: normal item. - PmenuSel = { bg = util.darken(c.fg_gutter, 0.8) }, -- Popup menu: selected item. - PmenuSbar = { bg = util.lighten(c.bg_popup, 0.95) }, -- Popup menu: scrollbar. - PmenuThumb = { bg = c.fg_gutter }, -- Popup menu: Thumb of the scrollbar. - Question = { fg = c.blue }, -- |hit-enter| prompt and yes/no questions - QuickFixLine = { bg = c.bg_visual, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. - Search = { bg = c.bg_search, fg = c.fg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. - IncSearch = { bg = c.bg_search, fg = c.fg }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" - SpecialKey = { fg = c.dark3 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| - SpellBad = { fg = c.error, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. - SpellCap = { fg = c.warning, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. - SpellLocal = { fg = c.info, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. - SpellRare = { fg = c.hint, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine = { fg = c.fg_sidebar, bg = c.bg_statusline }, -- status line of current window - StatusLineNC = { fg = c.fg_sidebar, bg = c.bg_statusline }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. - TabLine = { bg = c.bg_statusline, fg = c.fg_gutter }, -- tab pages line, not active tab page label - TabLineFill = { bg = c.bg_statusline }, -- tab pages line, where there are no labels - TabLineSel = { fg = c.blue, bg = c.bg }, -- tab pages line, active tab page label - Title = { fg = c.blue, style = "bold" }, -- titles for output from ":set all", ":autocmd" etc. - Visual = { bg = c.bg_visual }, -- Visual mode selection - VisualNOS = { bg = c.bg_visual }, -- Visual mode selection when vim is "Not Owning the Selection". - WarningMsg = { fg = c.warning }, -- warning messages - Whitespace = { fg = c.fg_gutter }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - WildMenu = { bg = c.bg_visual }, -- current match in 'wildmenu' completion +---@param config Config +---@return Theme +function M.setup(config) + config = config or require("tokyonight.config") - -- These groups are not listed as default vim groups, - -- but they are defacto standard group names for syntax highlighting. - -- commented out groups should chain up to their "preferred" group by - -- default, - -- Uncomment and edit if you want more specific syntax highlighting. + ---@class Theme + local theme = {} + theme.config = config + theme.colors = colors.setup(config) + local c = theme.colors - Constant = { fg = c.orange }, -- (preferred) any constant - String = { fg = c.green }, -- a string constant: "this is a string" - Character = { fg = c.green }, -- a character constant: 'c', '\n' - -- Number = { }, -- a number constant: 234, 0xff - -- Boolean = { }, -- a boolean constant: TRUE, false - -- Float = { }, -- a floating point constant: 2.3e10 + theme.base = { + Comment = { fg = c.comment, style = config.commentStyle }, -- any comment + ColorColumn = { bg = c.bg_visual }, -- used for the columns set with 'colorcolumn' + Conceal = { fg = c.fg_gutter }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Cursor = { style = "reverse" }, -- character under the cursor + lCursor = { style = "reverse" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { style = "reverse" }, -- like Cursor, but used when in IME mode |CursorIM| + CursorColumn = { bg = c.bg_highlight }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + CursorLine = { bg = c.bg_highlight }, -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. + Directory = { fg = c.fg_dark }, -- directory names (and other special names in listings) + DiffAdd = { bg = c.diff.add }, -- diff mode: Added line |diff.txt| + DiffChange = { bg = c.diff.change }, -- diff mode: Changed line |diff.txt| + DiffDelete = { bg = c.diff.delete }, -- diff mode: Deleted line |diff.txt| + DiffText = { bg = c.diff.change }, -- diff mode: Changed text within a changed line |diff.txt| + EndOfBuffer = { fg = c.bg }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. + -- TermCursor = { }, -- cursor in a focused terminal + -- TermCursorNC= { }, -- cursor in an unfocused terminal + ErrorMsg = { fg = c.error }, -- error messages on the command line + VertSplit = { fg = c.border }, -- the column separating vertically split windows + Folded = { fg = c.blue, bg = c.fg_gutter }, -- line used for closed folds + FoldColumn = { bg = c.bg, fg = c.comment }, -- 'foldcolumn' + SignColumn = { bg = c.bg, fg = c.fg_gutter }, -- column where |signs| are displayed + SignColumnSB = { bg = c.bg_sidebar, fg = c.fg_gutter }, -- column where |signs| are displayed + Substitute = { bg = c.red }, -- |:substitute| replacement text highlighting + LineNr = { fg = c.fg_gutter }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + CursorLineNr = { fg = c.dark5 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + MatchParen = { fg = c.orange, style = "bold" }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| + ModeMsg = { fg = c.fg_dark, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") + MsgArea = { fg = c.fg_dark }, -- Area for messages and cmdline + -- MsgSeparator= { }, -- Separator for scrolled messages, `msgsep` flag of 'display' + MoreMsg = { fg = c.blue }, -- |more-prompt| + NonText = { fg = c.dark3 }, -- '@' 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). See also |hl-EndOfBuffer|. + Normal = { fg = c.fg, bg = config.transparent and c.none or c.bg }, -- normal text + NormalNC = { fg = c.fg, bg = config.transparent and c.none or c.bg }, -- normal text in non-current windows + NormalSB = { fg = c.fg_sidebar, bg = c.bg_sidebar }, -- normal text in non-current windows + NormalFloat = { fg = c.fg, bg = c.bg_float }, -- Normal text in floating windows. + FloatBorder = { fg = c.border_highlight }, + Pmenu = { bg = c.bg_popup, c.fg }, -- Popup menu: normal item. + PmenuSel = { bg = util.darken(c.fg_gutter, 0.8) }, -- Popup menu: selected item. + PmenuSbar = { bg = util.lighten(c.bg_popup, 0.95) }, -- Popup menu: scrollbar. + PmenuThumb = { bg = c.fg_gutter }, -- Popup menu: Thumb of the scrollbar. + Question = { fg = c.blue }, -- |hit-enter| prompt and yes/no questions + QuickFixLine = { bg = c.bg_visual, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. + Search = { bg = c.bg_search, fg = c.fg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + IncSearch = { bg = c.bg_search, fg = c.fg }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + SpecialKey = { fg = c.dark3 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + SpellBad = { fg = c.error, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. + SpellCap = { fg = c.warning, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. + SpellLocal = { fg = c.info, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. + SpellRare = { fg = c.hint, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. + StatusLine = { fg = c.fg_sidebar, bg = c.bg_statusline }, -- status line of current window + StatusLineNC = { fg = c.fg_sidebar, bg = c.bg_statusline }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + TabLine = { bg = c.bg_statusline, fg = c.fg_gutter }, -- tab pages line, not active tab page label + TabLineFill = { bg = c.bg_statusline }, -- tab pages line, where there are no labels + TabLineSel = { fg = c.blue, bg = c.bg }, -- tab pages line, active tab page label + Title = { fg = c.blue, style = "bold" }, -- titles for output from ":set all", ":autocmd" etc. + Visual = { bg = c.bg_visual }, -- Visual mode selection + VisualNOS = { bg = c.bg_visual }, -- Visual mode selection when vim is "Not Owning the Selection". + WarningMsg = { fg = c.warning }, -- warning messages + Whitespace = { fg = c.fg_gutter }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + WildMenu = { bg = c.bg_visual }, -- current match in 'wildmenu' completion - Identifier = { fg = c.magenta }, -- (preferred) any variable name - Function = { fg = c.blue, style = config.functionStyle }, -- function name (also: methods for classes) + -- These groups are not listed as default vim groups, + -- but they are defacto standard group names for syntax highlighting. + -- commented out groups should chain up to their "preferred" group by + -- default, + -- Uncomment and edit if you want more specific syntax highlighting. - Statement = { fg = c.magenta }, -- (preferred) any statement - -- Conditional = { }, -- if, then, else, endif, switch, etc. - -- Repeat = { }, -- for, do, while, etc. - -- Label = { }, -- case, default, etc. - Operator = { fg = c.blue5 }, -- "sizeof", "+", "*", etc. - Keyword = { fg = c.cyan, style = config.keywordStyle }, -- any other keyword - -- Exception = { }, -- try, catch, throw + Constant = { fg = c.orange }, -- (preferred) any constant + String = { fg = c.green }, -- a string constant: "this is a string" + Character = { fg = c.green }, -- a character constant: 'c', '\n' + -- Number = { }, -- a number constant: 234, 0xff + -- Boolean = { }, -- a boolean constant: TRUE, false + -- Float = { }, -- a floating point constant: 2.3e10 - PreProc = { fg = c.cyan }, -- (preferred) generic Preprocessor - -- Include = { }, -- preprocessor #include - -- Define = { }, -- preprocessor #define - -- Macro = { }, -- same as Define - -- PreCondit = { }, -- preprocessor #if, #else, #endif, etc. + Identifier = { fg = c.magenta }, -- (preferred) any variable name + Function = { fg = c.blue, style = config.functionStyle }, -- function name (also: methods for classes) - Type = { fg = c.blue1 }, -- (preferred) int, long, char, etc. - -- StorageClass = { }, -- static, register, volatile, etc. - -- Structure = { }, -- struct, union, enum, etc. - -- Typedef = { }, -- A typedef + Statement = { fg = c.magenta }, -- (preferred) any statement + -- Conditional = { }, -- if, then, else, endif, switch, etc. + -- Repeat = { }, -- for, do, while, etc. + -- Label = { }, -- case, default, etc. + Operator = { fg = c.blue5 }, -- "sizeof", "+", "*", etc. + Keyword = { fg = c.cyan, style = config.keywordStyle }, -- any other keyword + -- Exception = { }, -- try, catch, throw - Special = { fg = c.blue1 }, -- (preferred) any special symbol - -- SpecialChar = { }, -- special character in a constant - -- Tag = { }, -- you can use CTRL-] on this - -- Delimiter = { }, -- character that needs attention - -- SpecialComment= { }, -- special things inside a comment - -- Debug = { }, -- debugging statements + PreProc = { fg = c.cyan }, -- (preferred) generic Preprocessor + -- Include = { }, -- preprocessor #include + -- Define = { }, -- preprocessor #define + -- Macro = { }, -- same as Define + -- PreCondit = { }, -- preprocessor #if, #else, #endif, etc. - Underlined = { style = "underline" }, -- (preferred) text that stands out, HTML links - Bold = { style = "bold" }, - Italic = { style = "italic" }, + Type = { fg = c.blue1 }, -- (preferred) int, long, char, etc. + -- StorageClass = { }, -- static, register, volatile, etc. + -- Structure = { }, -- struct, union, enum, etc. + -- Typedef = { }, -- A typedef - -- ("Ignore", below, may be invisible...) - -- Ignore = { }, -- (preferred) left blank, hidden |hl-Ignore| + Special = { fg = c.blue1 }, -- (preferred) any special symbol + -- SpecialChar = { }, -- special character in a constant + -- Tag = { }, -- you can use CTRL-] on this + -- Delimiter = { }, -- character that needs attention + -- SpecialComment= { }, -- special things inside a comment + -- Debug = { }, -- debugging statements - Error = { fg = c.error }, -- (preferred) any erroneous construct - Todo = { bg = c.yellow, fg = c.bg }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Underlined = { style = "underline" }, -- (preferred) text that stands out, HTML links + Bold = { style = "bold" }, + Italic = { style = "italic" }, - qfLineNr = { fg = c.dark5 }, - qfFileName = { fg = c.blue }, + -- ("Ignore", below, may be invisible...) + -- Ignore = { }, -- (preferred) left blank, hidden |hl-Ignore| - htmlH1 = { fg = c.magenta, style = "bold" }, - markdownH1 = { fg = c.magenta, style = "bold" }, - markdownH1Delimiter = { fg = c.magenta }, - htmlH2 = { fg = c.blue, style = "bold" }, - markdownH2 = { fg = c.blue, style = "bold" }, - markdownH2Delimiter = { fg = c.blue }, + Error = { fg = c.error }, -- (preferred) any erroneous construct + Todo = { bg = c.yellow, fg = c.bg }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX - -- These groups are for the native LSP client. Some other LSP clients may - -- use these groups, or use their own. Consult your LSP client's - -- documentation. -} + qfLineNr = { fg = c.dark5 }, + qfFileName = { fg = c.blue }, -theme.plugins = { - LspReferenceText = { bg = c.fg_gutter }, -- used for highlighting "text" references - LspReferenceRead = { bg = c.fg_gutter }, -- used for highlighting "read" references - LspReferenceWrite = { bg = c.fg_gutter }, -- used for highlighting "write" references + htmlH1 = { fg = c.magenta, style = "bold" }, + markdownH1 = { fg = c.magenta, style = "bold" }, + markdownH1Delimiter = { fg = c.magenta }, + htmlH2 = { fg = c.blue, style = "bold" }, + markdownH2 = { fg = c.blue, style = "bold" }, + markdownH2Delimiter = { fg = c.blue }, - LspDiagnosticsDefaultError = { fg = c.error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultWarning = { fg = c.warning }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultInformation = { fg = c.info }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultHint = { fg = c.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + -- These groups are for the native LSP client. Some other LSP clients may + -- use these groups, or use their own. Consult your LSP client's + -- documentation. + } - LspDiagnosticsVirtualTextError = { bg = util.darken(c.error, 0.1), fg = c.error }, -- Used for "Error" diagnostic virtual text - LspDiagnosticsVirtualTextWarning = { bg = util.darken(c.warning, 0.1), fg = c.warning }, -- Used for "Warning" diagnostic virtual text - LspDiagnosticsVirtualTextInformation = { bg = util.darken(c.info, 0.1), fg = c.info }, -- Used for "Information" diagnostic virtual text - LspDiagnosticsVirtualTextHint = { bg = util.darken(c.hint, 0.1), fg = c.hint }, -- Used for "Hint" diagnostic virtual text + theme.plugins = { + LspReferenceText = { bg = c.fg_gutter }, -- used for highlighting "text" references + LspReferenceRead = { bg = c.fg_gutter }, -- used for highlighting "read" references + LspReferenceWrite = { bg = c.fg_gutter }, -- used for highlighting "write" references - LspDiagnosticsUnderlineError = { style = "undercurl", sp = c.error }, -- Used to underline "Error" diagnostics - LspDiagnosticsUnderlineWarning = { style = "undercurl", sp = c.warning }, -- Used to underline "Warning" diagnostics - LspDiagnosticsUnderlineInformation = { style = "undercurl", sp = c.info }, -- Used to underline "Information" diagnostics - LspDiagnosticsUnderlineHint = { style = "undercurl", sp = c.hint }, -- Used to underline "Hint" diagnostics + LspDiagnosticsDefaultError = { fg = c.error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultWarning = { fg = c.warning }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultInformation = { fg = c.info }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultHint = { fg = c.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - -- LspDiagnosticsFloatingError = { }, -- Used to color "Error" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingWarning = { }, -- Used to color "Warning" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingInformation = { }, -- Used to color "Information" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingHint = { }, -- Used to color "Hint" diagnostic messages in diagnostics float + LspDiagnosticsVirtualTextError = { bg = util.darken(c.error, 0.1), fg = c.error }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextWarning = { bg = util.darken(c.warning, 0.1), fg = c.warning }, -- Used for "Warning" diagnostic virtual text + LspDiagnosticsVirtualTextInformation = { bg = util.darken(c.info, 0.1), fg = c.info }, -- Used for "Information" diagnostic virtual text + LspDiagnosticsVirtualTextHint = { bg = util.darken(c.hint, 0.1), fg = c.hint }, -- Used for "Hint" diagnostic virtual text - -- LspDiagnosticsSignError = { }, -- Used for "Error" signs in sign column - -- LspDiagnosticsSignWarning = { }, -- Used for "Warning" signs in sign column - -- LspDiagnosticsSignInformation = { }, -- Used for "Information" signs in sign column - -- LspDiagnosticsSignHint = { }, -- Used for "Hint" signs in sign column + LspDiagnosticsUnderlineError = { style = "undercurl", sp = c.error }, -- Used to underline "Error" diagnostics + LspDiagnosticsUnderlineWarning = { style = "undercurl", sp = c.warning }, -- Used to underline "Warning" diagnostics + LspDiagnosticsUnderlineInformation = { style = "undercurl", sp = c.info }, -- Used to underline "Information" diagnostics + LspDiagnosticsUnderlineHint = { style = "undercurl", sp = c.hint }, -- Used to underline "Hint" diagnostics - -- These groups are for the neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. - -- By default, most of these groups link to an appropriate Vim group, - -- TSError -> Error for example, so you do not have to define these unless - -- you explicitly want to support Treesitter's improved syntax awareness. + -- LspDiagnosticsFloatingError = { }, -- Used to color "Error" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingWarning = { }, -- Used to color "Warning" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingInformation = { }, -- Used to color "Information" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingHint = { }, -- Used to color "Hint" diagnostic messages in diagnostics float - -- TSAnnotation = { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. - -- TSAttribute = { }; -- (unstable) TODO: docs - -- TSBoolean = { }; -- For booleans. - -- TSCharacter = { }; -- For characters. - -- TSComment = { }; -- For comment blocks. - TSConstructor = { fg = c.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - -- TSConditional = { }; -- For keywords related to conditionnals. - -- TSConstant = { }; -- For constants - -- TSConstBuiltin = { }; -- For constant that are built in the language: `nil` in Lua. - -- TSConstMacro = { }; -- For constants that are defined by macros: `NULL` in C. - -- TSError = { }; -- For syntax/parser errors. - -- TSException = { }; -- For exception related keywords. - TSField = { fg = c.green1 }, -- For fields. - -- TSFloat = { }; -- For floats. - -- TSFunction = { }; -- For function (calls and definitions). - -- TSFuncBuiltin = { }; -- For builtin functions: `table.insert` in Lua. - -- TSFuncMacro = { }; -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. - -- TSInclude = { }; -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. - TSKeyword = { fg = c.purple, style = config.keywordStyle }, -- For keywords that don't fall in previous categories. - -- TSKeywordFunction = { }; -- For keywords used to define a fuction. - TSLabel = { fg = c.blue }, -- For labels: `label:` in C and `:label:` in Lua. - -- TSMethod = { }; -- For method calls and definitions. - -- TSNamespace = { }; -- For identifiers referring to modules and namespaces. - -- TSNone = { }; -- TODO: docs - -- TSNumber = { }; -- For all numbers - TSOperator = { fg = c.blue5 }, -- For any operator: `+`, but also `->` and `*` in C. - TSParameter = { fg = c.yellow }, -- For parameters of a function. - -- TSParameterReference= { }; -- For references to parameters of a function. - TSProperty = { fg = c.green1 }, -- Same as `TSField`. - TSPunctDelimiter = { fg = c.blue5 }, -- For delimiters ie: `.` - TSPunctBracket = { fg = c.fg_dark }, -- For brackets and parens. - TSPunctSpecial = { fg = c.blue5 }, -- For special punctutation that does not fall in the catagories before. - -- TSRepeat = { }; -- For keywords related to loops. - -- TSString = { }; -- For strings. - TSStringRegex = { fg = c.blue6 }, -- For regexes. - TSStringEscape = { fg = c.magenta }, -- For escape characters within a string. - -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. - -- TSType = { }; -- For types. - -- TSTypeBuiltin = { }; -- For builtin types. - -- TSVariable = { }; -- Any variable name that does not have another highlight. - TSVariableBuiltin = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`. + -- LspDiagnosticsSignError = { }, -- Used for "Error" signs in sign column + -- LspDiagnosticsSignWarning = { }, -- Used for "Warning" signs in sign column + -- LspDiagnosticsSignInformation = { }, -- Used for "Information" signs in sign column + -- LspDiagnosticsSignHint = { }, -- Used for "Hint" signs in sign column - -- TSTag = { }; -- Tags like html tag names. - -- TSTagDelimiter = { }; -- Tag delimiter like `<` `>` `/` - -- TSText = { }; -- For strings considered text in a markup language. - TSTextReference = { fg = c.red }, -- FIXME - -- TSEmphasis = { }; -- For text to be represented with emphasis. - -- TSUnderline = { }; -- For text to be represented with an underline. - -- TSStrike = { }; -- For strikethrough text. - -- TSTitle = { }; -- Text that is part of a title. - -- TSLiteral = { }; -- Literal text. - -- TSURI = { }; -- Any URI like a link or email. + -- These groups are for the neovim tree-sitter highlights. + -- As of writing, tree-sitter support is a WIP, group names may change. + -- By default, most of these groups link to an appropriate Vim group, + -- TSError -> Error for example, so you do not have to define these unless + -- you explicitly want to support Treesitter's improved syntax awareness. - -- GitGutter - GitGutterAdd = { fg = c.diff.add }, -- diff mode: Added line |diff.txt| - GitGutterChange = { fg = c.diff.change }, -- diff mode: Changed line |diff.txt| - GitGutterDelete = { fg = c.diff.delete }, -- diff mode: Deleted line |diff.txt| + -- TSAnnotation = { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. + -- TSAttribute = { }; -- (unstable) TODO: docs + -- TSBoolean = { }; -- For booleans. + -- TSCharacter = { }; -- For characters. + -- TSComment = { }; -- For comment blocks. + TSConstructor = { fg = c.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + -- TSConditional = { }; -- For keywords related to conditionnals. + -- TSConstant = { }; -- For constants + -- TSConstBuiltin = { }; -- For constant that are built in the language: `nil` in Lua. + -- TSConstMacro = { }; -- For constants that are defined by macros: `NULL` in C. + -- TSError = { }; -- For syntax/parser errors. + -- TSException = { }; -- For exception related keywords. + TSField = { fg = c.green1 }, -- For fields. + -- TSFloat = { }; -- For floats. + -- TSFunction = { }; -- For function (calls and definitions). + -- TSFuncBuiltin = { }; -- For builtin functions: `table.insert` in Lua. + -- TSFuncMacro = { }; -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. + -- TSInclude = { }; -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. + TSKeyword = { fg = c.purple, style = config.keywordStyle }, -- For keywords that don't fall in previous categories. + -- TSKeywordFunction = { }; -- For keywords used to define a fuction. + TSLabel = { fg = c.blue }, -- For labels: `label:` in C and `:label:` in Lua. + -- TSMethod = { }; -- For method calls and definitions. + -- TSNamespace = { }; -- For identifiers referring to modules and namespaces. + -- TSNone = { }; -- TODO: docs + -- TSNumber = { }; -- For all numbers + TSOperator = { fg = c.blue5 }, -- For any operator: `+`, but also `->` and `*` in C. + TSParameter = { fg = c.yellow }, -- For parameters of a function. + -- TSParameterReference= { }; -- For references to parameters of a function. + TSProperty = { fg = c.green1 }, -- Same as `TSField`. + TSPunctDelimiter = { fg = c.blue5 }, -- For delimiters ie: `.` + TSPunctBracket = { fg = c.fg_dark }, -- For brackets and parens. + TSPunctSpecial = { fg = c.blue5 }, -- For special punctutation that does not fall in the catagories before. + -- TSRepeat = { }; -- For keywords related to loops. + -- TSString = { }; -- For strings. + TSStringRegex = { fg = c.blue6 }, -- For regexes. + TSStringEscape = { fg = c.magenta }, -- For escape characters within a string. + -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. + -- TSType = { }; -- For types. + -- TSTypeBuiltin = { }; -- For builtin types. + -- TSVariable = { }; -- Any variable name that does not have another highlight. + TSVariableBuiltin = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`. - -- GitSigns - GitSignsAdd = { fg = c.diff.add }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = c.diff.change }, -- diff mode: Changed line |diff.txt| - GitSignsDelete = { fg = c.diff.delete }, -- diff mode: Deleted line |diff.txt| + -- TSTag = { }; -- Tags like html tag names. + -- TSTagDelimiter = { }; -- Tag delimiter like `<` `>` `/` + -- TSText = { }; -- For strings considered text in a markup language. + TSTextReference = { fg = c.red }, -- FIXME + -- TSEmphasis = { }; -- For text to be represented with emphasis. + -- TSUnderline = { }; -- For text to be represented with an underline. + -- TSStrike = { }; -- For strikethrough text. + -- TSTitle = { }; -- Text that is part of a title. + -- TSLiteral = { }; -- Literal text. + -- TSURI = { }; -- Any URI like a link or email. - -- Telescope - TelescopeBorder = { fg = c.border_highlight }, + -- GitGutter + GitGutterAdd = { fg = c.diff.add }, -- diff mode: Added line |diff.txt| + GitGutterChange = { fg = c.diff.change }, -- diff mode: Changed line |diff.txt| + GitGutterDelete = { fg = c.diff.delete }, -- diff mode: Deleted line |diff.txt| - -- NvimTree - NvimTreeNormal = { fg = c.fg_sidebar, bg = c.bg_sidebar }, - NvimTreeRootFolder = { fg = c.blue, style = "bold" }, - NvimTreeGitDirty = { fg = c.git.change }, - NvimTreeGitNew = { fg = c.git.add }, - NvimTreeSpecialFile = { fg = c.purple }, - LspDiagnosticsError = { fg = c.error }, - LspDiagnosticsWarning = { fg = c.warning }, - LspDiagnosticsInformation = { fg = c.info }, - LspDiagnosticsHint = { fg = c.hint }, - -- NvimTreeFolderName= { fg = c.fg_float }, + -- GitSigns + GitSignsAdd = { fg = c.diff.add }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = c.diff.change }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = c.diff.delete }, -- diff mode: Deleted line |diff.txt| - -- Dashboard - DashboardShortCut = { fg = c.cyan }, - DashboardHeader = { fg = c.blue }, - DashboardCenter = { fg = c.magenta }, - DashboardFooter = { fg = c.yellow, style = "italic" }, + -- Telescope + TelescopeBorder = { fg = c.border_highlight }, - -- WhichKey - WhichKey = { fg = c.cyan }, - WhichKeyGroup = { fg = c.blue }, - WhichKeyDesc = { fg = c.magenta }, - WhichKeySeperator = { fg = c.comment }, - WhichKeyFloating = { bg = c.bg_sidebar }, + -- NvimTree + NvimTreeNormal = { fg = c.fg_sidebar, bg = c.bg_sidebar }, + NvimTreeRootFolder = { fg = c.blue, style = "bold" }, + NvimTreeGitDirty = { fg = c.git.change }, + NvimTreeGitNew = { fg = c.git.add }, + NvimTreeSpecialFile = { fg = c.purple }, + LspDiagnosticsError = { fg = c.error }, + LspDiagnosticsWarning = { fg = c.warning }, + LspDiagnosticsInformation = { fg = c.info }, + LspDiagnosticsHint = { fg = c.hint }, + -- NvimTreeFolderName= { fg = c.fg_float }, - -- LspSaga - DiagnosticError = { fg = c.error }, - DiagnosticWarning = { fg = c.warning }, - DiagnosticInformation = { fg = c.info }, - DiagnosticHint = { fg = c.hint }, + -- Dashboard + DashboardShortCut = { fg = c.cyan }, + DashboardHeader = { fg = c.blue }, + DashboardCenter = { fg = c.magenta }, + DashboardFooter = { fg = c.yellow, style = "italic" }, - -- NeoVim - healthError = { fg = c.error }, - healthSuccess = { fg = c.green1 }, - healthWarning = { fg = c.warning }, + -- WhichKey + WhichKey = { fg = c.cyan }, + WhichKeyGroup = { fg = c.blue }, + WhichKeyDesc = { fg = c.magenta }, + WhichKeySeperator = { fg = c.comment }, + WhichKeyFloating = { bg = c.bg_sidebar }, - -- BufferLine - BufferLineIndicatorSelected = { fg = c.git.change }, - BufferLineFill = { bg = c.black }, + -- LspSaga + DiagnosticError = { fg = c.error }, + DiagnosticWarning = { fg = c.warning }, + DiagnosticInformation = { fg = c.info }, + DiagnosticHint = { fg = c.hint }, -} + -- NeoVim + healthError = { fg = c.error }, + healthSuccess = { fg = c.green1 }, + healthWarning = { fg = c.warning }, --- LuaLine -for _, section in ipairs({ "b", "c" }) do - local bg = c.bg_sidebar - if section == "b" then bg = c.fg_gutter end - theme.plugins["lualine_" .. section .. "_diagnostics_error_normal"] = { fg = c.error, bg = bg } - theme.plugins["lualine_" .. section .. "_diagnostics_warn_normal"] = { fg = c.warning, bg = bg } - theme.plugins["lualine_" .. section .. "_diagnostics_info_normal"] = { fg = c.info, bg = bg } -end + -- BufferLine + BufferLineIndicatorSelected = { fg = c.git.change }, + BufferLineFill = { bg = c.black }, -if config.hideInactiveStatusline then - local inactive = { style = "underline", bg = c.bg, fg = c.bg, sp = c.border } - - -- StatusLineNC - theme.base.StatusLineNC = inactive + } -- LuaLine - for _, section in ipairs({ "a", "b", "c" }) do - theme.plugins["lualine_" .. section .. "_inactive"] = inactive + for _, section in ipairs({ "b", "c" }) do + local bg = c.bg_sidebar + if section == "b" then bg = c.fg_gutter end + theme.plugins["lualine_" .. section .. "_diagnostics_error_normal"] = { fg = c.error, bg = bg } + theme.plugins["lualine_" .. section .. "_diagnostics_warn_normal"] = { fg = c.warning, bg = bg } + theme.plugins["lualine_" .. section .. "_diagnostics_info_normal"] = { fg = c.info, bg = bg } end + + if config.hideInactiveStatusline then + local inactive = { style = "underline", bg = c.bg, fg = c.bg, sp = c.border } + + -- StatusLineNC + theme.base.StatusLineNC = inactive + + -- LuaLine + for _, section in ipairs({ "a", "b", "c" }) do + theme.plugins["lualine_" .. section .. "_inactive"] = inactive + end + end + + return theme end -return theme - --- vi:nowrap +return M