From cb717f81969234280ae2758f9e2b2aa6acecac73 Mon Sep 17 00:00:00 2001 From: Scott McKendry <39483124+scottmckendry@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:18:22 +1300 Subject: [PATCH] refactor: replace camel case palette properties --- CONTRIBUTING.md | 2 +- README.md | 8 ++-- doc/cyberdream.txt | 8 ++-- doc/tags | 11 +++++ extras/helix/cyberdream-light.toml | 16 +++---- extras/helix/cyberdream.toml | 16 +++---- lua/cyberdream/colors.lua | 12 ++--- lua/cyberdream/extensions/base.lua | 46 +++++++++---------- lua/cyberdream/extensions/blinkcmp.lua | 4 +- lua/cyberdream/extensions/fzflua.lua | 10 ++-- lua/cyberdream/extensions/grapple.lua | 6 +-- lua/cyberdream/extensions/grugfar.lua | 2 +- lua/cyberdream/extensions/helpview.lua | 4 +- lua/cyberdream/extensions/hop.lua | 4 +- lua/cyberdream/extensions/indentblankline.lua | 4 +- lua/cyberdream/extensions/lazy.lua | 4 +- lua/cyberdream/extensions/leap.lua | 2 +- lua/cyberdream/extensions/markdown.lua | 2 +- lua/cyberdream/extensions/markview.lua | 6 +-- lua/cyberdream/extensions/mini.lua | 14 +++--- lua/cyberdream/extensions/neogit.lua | 2 +- lua/cyberdream/extensions/noice.lua | 4 +- lua/cyberdream/extensions/notify.lua | 10 ++-- lua/cyberdream/extensions/snacks.lua | 2 +- lua/cyberdream/extensions/telescope.lua | 43 ++++++----------- .../extensions/treesittercontext.lua | 4 +- lua/cyberdream/extensions/trouble.lua | 2 +- lua/cyberdream/extra/alacritty.lua | 4 +- lua/cyberdream/extra/base16.lua | 4 +- lua/cyberdream/extra/fish.lua | 4 +- lua/cyberdream/extra/foot.lua | 2 +- lua/cyberdream/extra/ghostty.lua | 4 +- lua/cyberdream/extra/gitui.lua | 4 +- lua/cyberdream/extra/helix.lua | 16 +++---- lua/cyberdream/extra/kitty.lua | 4 +- lua/cyberdream/extra/lazydocker.lua | 4 +- lua/cyberdream/extra/lazygit.lua | 6 +-- lua/cyberdream/extra/lsd.lua | 2 +- lua/cyberdream/extra/pywal.lua | 2 +- lua/cyberdream/extra/rio.lua | 10 ++-- lua/cyberdream/extra/textmate.lua | 6 +-- lua/cyberdream/extra/tilix.lua | 4 +- lua/cyberdream/extra/tmux.lua | 6 +-- lua/cyberdream/extra/wezterm.lua | 4 +- lua/cyberdream/extra/windowsterminal.lua | 4 +- lua/cyberdream/extra/yazi.lua | 12 ++--- lua/cyberdream/extra/zed.lua | 4 +- lua/cyberdream/theme.lua | 4 +- 48 files changed, 177 insertions(+), 181 deletions(-) create mode 100644 doc/tags diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0336b3f..fb8cd76 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,7 +51,7 @@ function M.get(opts, t) -- Add your highlights here -- See lua/cyberdream/colors.lua for a complete list of available colors in the palette HighlightGroupName = { fg = t.blue }, - AnotherHighlightGroupName = { fg = t.purple, bg = t.bgHighlight }, + AnotherHighlightGroupName = { fg = t.purple, bg = t.bg_highlight }, } return highlights diff --git a/README.md b/README.md index b0697f9..6819353 100644 --- a/README.md +++ b/README.md @@ -266,8 +266,8 @@ vim.api.nvim_create_autocmd("User", { | 🖌 | Hex | Color | | --------------------------------------------------------- | --------- | ----------- | | ![#16181a](https://place-hold.it/15/16181a/16181a?text=+) | `#16181a` | bg | -| ![#1e2124](https://place-hold.it/15/1e2124/1e2124?text=+) | `#1e2124` | bgAlt | -| ![#3c4048](https://place-hold.it/15/3c4048/3c4048?text=+) | `#3c4048` | bgHighlight | +| ![#1e2124](https://place-hold.it/15/1e2124/1e2124?text=+) | `#1e2124` | bg_alt | +| ![#3c4048](https://place-hold.it/15/3c4048/3c4048?text=+) | `#3c4048` | bg_highlight | | ![#ffffff](https://place-hold.it/15/ffffff/ffffff?text=+) | `#ffffff` | fg | | ![#7b8496](https://place-hold.it/15/7b8496/7b8496?text=+) | `#7b8496` | grey | | ![#5ea1ff](https://place-hold.it/15/5ea1ff/5ea1ff?text=+) | `#5ea1ff` | blue | @@ -288,8 +288,8 @@ vim.api.nvim_create_autocmd("User", { | 🖌 | Hex | Color | | --------------------------------------------------------- | --------- | ----------- | | ![#ffffff](https://place-hold.it/15/ffffff/ffffff?text=+) | `#ffffff` | bg | -| ![#eaeaea](https://place-hold.it/15/eaeaea/eaeaea?text=+) | `#eaeaea` | bgAlt | -| ![#acacac](https://place-hold.it/15/acacac/acacac?text=+) | `#acacac` | bgHighlight | +| ![#eaeaea](https://place-hold.it/15/eaeaea/eaeaea?text=+) | `#eaeaea` | bg_alt | +| ![#acacac](https://place-hold.it/15/acacac/acacac?text=+) | `#acacac` | bg_highlight | | ![#16181a](https://place-hold.it/15/16181a/16181a?text=+) | `#16181a` | fg | | ![#7b8496](https://place-hold.it/15/7b8496/7b8496?text=+) | `#7b8496` | grey | | ![#0057d1](https://place-hold.it/15/0057d1/0057d1?text=+) | `#0057d1` | blue | diff --git a/doc/cyberdream.txt b/doc/cyberdream.txt index 2a4e9a2..6119eba 100644 --- a/doc/cyberdream.txt +++ b/doc/cyberdream.txt @@ -279,9 +279,9 @@ Dark ~ ---------------------------------------------------- --------- ------------- [#16181a] #16181a bg - [#1e2124] #1e2124 bgAlt + [#1e2124] #1e2124 bg_alt - [#3c4048] #3c4048 bgHighlight + [#3c4048] #3c4048 bg_highlight [#ffffff] #ffffff fg @@ -312,9 +312,9 @@ Light ~ ---------------------------------------------------- --------- ------------- [#ffffff] #ffffff bg - [#eaeaea] #eaeaea bgAlt + [#eaeaea] #eaeaea bg_alt - [#acacac] #acacac bgHighlight + [#acacac] #acacac bg_highlight [#16181a] #16181a fg diff --git a/doc/tags b/doc/tags new file mode 100644 index 0000000..4dc1fb0 --- /dev/null +++ b/doc/tags @@ -0,0 +1,11 @@ +cyberdream-configuring cyberdream.txt /*cyberdream-configuring* +cyberdream-contributing cyberdream.txt /*cyberdream-contributing* +cyberdream-extras cyberdream.txt /*cyberdream-extras* +cyberdream-features cyberdream.txt /*cyberdream-features* +cyberdream-installation cyberdream.txt /*cyberdream-installation* +cyberdream-links cyberdream.txt /*cyberdream-links* +cyberdream-palette cyberdream.txt /*cyberdream-palette* +cyberdream-table-of-contents cyberdream.txt /*cyberdream-table-of-contents* +cyberdream-usage cyberdream.txt /*cyberdream-usage* +cyberdream-‍-recipes cyberdream.txt /*cyberdream-‍-recipes* +cyberdream.txt cyberdream.txt /*cyberdream.txt* diff --git a/extras/helix/cyberdream-light.toml b/extras/helix/cyberdream-light.toml index e603627..ec31eca 100644 --- a/extras/helix/cyberdream-light.toml +++ b/extras/helix/cyberdream-light.toml @@ -6,7 +6,7 @@ "ui.statusline" = { fg = "cyan" } "ui.selection" = "green" "ui.selection.primary" = "magenta" -"ui.virtual.ruler" = { bg = "bgHighlight" } +"ui.virtual.ruler" = { bg = "bg_highlight" } # Syntax Highlighting for Code "comment" = { fg = "grey", modifiers = ["italic"] } @@ -41,10 +41,10 @@ "label" = "red" # Interface specific -"ui.cursorline.primary" = { bg = "bgHighlight" } -"ui.cursorline.secondary" = { bg = "bgAlt" } -"ui.cursorcolumn.primary" = { bg = "bgHighlight" } -"ui.cursorcolumn.secondary" = { bg = "bgAlt" } +"ui.cursorline.primary" = { bg = "bg_highlight" } +"ui.cursorline.secondary" = { bg = "bg_alt" } +"ui.cursorcolumn.primary" = { bg = "bg_highlight" } +"ui.cursorcolumn.secondary" = { bg = "bg_alt" } "ui.statusline.normal" = { fg = "fg", bg = "bg" } "ui.statusline.insert" = { fg = "green", bg = "bg" } "ui.statusline.select" = { fg = "blue", bg = "bg" } @@ -63,7 +63,7 @@ # Popups and Menus "ui.popup" = { fg = "fg", bg = "bg" } -"ui.popup.info" = { fg = "cyan", bg = "bgAlt" } +"ui.popup.info" = { fg = "cyan", bg = "bg_alt" } "ui.menu" = { fg = "fg", bg = "bg" } "ui.menu.selected" = { fg = "bg", bg = "fg" } @@ -84,5 +84,5 @@ magenta = "#d100bf" pink = "#f40064" orange = "#d17c00" purple = "#a018ff" -bgAlt = "#eaeaea" -bgHighlight = "#acacac" +bg_alt = "#eaeaea" +bg_highlight = "#acacac" diff --git a/extras/helix/cyberdream.toml b/extras/helix/cyberdream.toml index 85565dd..2935d0b 100644 --- a/extras/helix/cyberdream.toml +++ b/extras/helix/cyberdream.toml @@ -6,7 +6,7 @@ "ui.statusline" = { fg = "cyan" } "ui.selection" = "green" "ui.selection.primary" = "magenta" -"ui.virtual.ruler" = { bg = "bgHighlight" } +"ui.virtual.ruler" = { bg = "bg_highlight" } # Syntax Highlighting for Code "comment" = { fg = "grey", modifiers = ["italic"] } @@ -41,10 +41,10 @@ "label" = "red" # Interface specific -"ui.cursorline.primary" = { bg = "bgHighlight" } -"ui.cursorline.secondary" = { bg = "bgAlt" } -"ui.cursorcolumn.primary" = { bg = "bgHighlight" } -"ui.cursorcolumn.secondary" = { bg = "bgAlt" } +"ui.cursorline.primary" = { bg = "bg_highlight" } +"ui.cursorline.secondary" = { bg = "bg_alt" } +"ui.cursorcolumn.primary" = { bg = "bg_highlight" } +"ui.cursorcolumn.secondary" = { bg = "bg_alt" } "ui.statusline.normal" = { fg = "fg", bg = "bg" } "ui.statusline.insert" = { fg = "green", bg = "bg" } "ui.statusline.select" = { fg = "blue", bg = "bg" } @@ -63,7 +63,7 @@ # Popups and Menus "ui.popup" = { fg = "fg", bg = "bg" } -"ui.popup.info" = { fg = "cyan", bg = "bgAlt" } +"ui.popup.info" = { fg = "cyan", bg = "bg_alt" } "ui.menu" = { fg = "fg", bg = "bg" } "ui.menu.selected" = { fg = "bg", bg = "fg" } @@ -84,5 +84,5 @@ magenta = "#ff5ef1" pink = "#ff5ea0" orange = "#ffbd5e" purple = "#bd5eff" -bgAlt = "#1e2124" -bgHighlight = "#3c4048" +bg_alt = "#1e2124" +bg_highlight = "#3c4048" diff --git a/lua/cyberdream/colors.lua b/lua/cyberdream/colors.lua index 6791c52..77d0c35 100644 --- a/lua/cyberdream/colors.lua +++ b/lua/cyberdream/colors.lua @@ -1,7 +1,7 @@ ---@class CyberdreamPalette ---@field bg string ----@field bgAlt string ----@field bgHighlight string +---@field bg_alt string +---@field bg_highlight string ---@field bg_solid? string ---@field fg string ---@field grey string @@ -22,8 +22,8 @@ local M = {} M.default = { bg = "#16181a", - bgAlt = "#1e2124", - bgHighlight = "#3c4048", + bg_alt = "#1e2124", + bg_highlight = "#3c4048", fg = "#ffffff", grey = "#7b8496", blue = "#5ea1ff", @@ -39,8 +39,8 @@ M.default = { M.light = { bg = "#ffffff", - bgAlt = "#eaeaea", - bgHighlight = "#acacac", + bg_alt = "#eaeaea", + bg_highlight = "#acacac", fg = "#16181a", grey = "#7b8496", blue = "#0057d1", diff --git a/lua/cyberdream/extensions/base.lua b/lua/cyberdream/extensions/base.lua index 152778c..6693fcb 100644 --- a/lua/cyberdream/extensions/base.lua +++ b/lua/cyberdream/extensions/base.lua @@ -8,13 +8,13 @@ function M.get(opts, t) opts = opts or {} local highlights = { Comment = { fg = t.grey, italic = opts.italic_comments }, - ColorColumn = { bg = t.bgHighlight }, + ColorColumn = { bg = t.bg_highlight }, Conceal = { fg = t.grey }, Cursor = { fg = t.bg, bg = t.fg }, ICursor = { fg = t.bg, bg = t.fg }, CursorIM = { fg = t.bg, bg = t.fg }, - CursorColumn = { bg = t.bgHighlight }, - CursorLine = { bg = t.bgHighlight }, + CursorColumn = { bg = t.bg_highlight }, + CursorLine = { bg = t.bg_highlight }, Directory = { fg = t.blue }, DiffAdd = { bg = util.blend(t.bg_solid, t.green, 0.8) }, DiffChange = { bg = util.blend(t.bg_solid, t.blue, 0.8) }, @@ -24,16 +24,16 @@ function M.get(opts, t) Removed = { fg = t.red }, EndOfBuffer = { fg = t.bg }, ErrorMsg = { fg = t.red }, - VertSplit = { fg = t.bgHighlight, bg = t.bg }, - WinSeparator = { fg = t.bgHighlight, bg = t.bg }, + VertSplit = { fg = t.bg_highlight, bg = t.bg }, + WinSeparator = { fg = t.bg_highlight, bg = t.bg }, Folded = { fg = t.grey, bg = t.bg }, FoldColumn = { fg = t.grey, bg = t.bg }, SignColumn = { fg = t.grey, bg = t.bg }, SignColumnSB = { fg = t.grey, bg = t.bg }, - Substitute = { fg = t.red, bg = t.bgHighlight }, - LineNr = { fg = util.blend(t.bgHighlight, t.fg, 0.9) }, + Substitute = { fg = t.red, bg = t.bg_highlight }, + LineNr = { fg = util.blend(t.bg_highlight, t.fg, 0.9) }, CursorLineNr = { fg = t.grey }, - MatchParen = { fg = t.pink, bg = t.bgHighlight }, + MatchParen = { fg = t.pink, bg = t.bg_highlight }, ModeMsg = { fg = t.fg }, MsgArea = { fg = t.fg }, MoreMsg = { fg = t.blue }, @@ -42,16 +42,16 @@ function M.get(opts, t) NormalNC = { fg = t.fg, bg = t.bg }, NormalFloat = { fg = t.fg, bg = t.bg }, FloatTitle = { fg = t.cyan, bg = t.bg }, - FloatBorder = { fg = t.bgHighlight, bg = t.bg }, + FloatBorder = { fg = t.bg_highlight, bg = t.bg }, Pmenu = { fg = t.fg, bg = t.bg }, - PmenuSel = { fg = t.fg, bg = t.bgHighlight }, - PmenuSbar = { fg = t.bg, bg = t.bgHighlight }, - PmenuThumb = { fg = t.bg, bg = t.bgHighlight }, + PmenuSel = { fg = t.fg, bg = t.bg_highlight }, + PmenuSbar = { fg = t.bg, bg = t.bg_highlight }, + PmenuThumb = { fg = t.bg, bg = t.bg_highlight }, Question = { fg = t.yellow }, - QuickFixLine = { bg = t.bgHighlight }, - Search = { fg = t.bgAlt, bg = t.fg }, - IncSearch = { fg = t.bgAlt, bg = t.cyan }, - CurSearch = { fg = t.bgAlt, bg = t.cyan }, + QuickFixLine = { bg = t.bg_highlight }, + Search = { fg = t.bg_alt, bg = t.fg }, + IncSearch = { fg = t.bg_alt, bg = t.cyan }, + CurSearch = { fg = t.bg_alt, bg = t.cyan }, SpecialKey = { fg = t.grey }, SpellBad = { sp = t.red, undercurl = true }, SpellCap = { sp = t.yellow, undercurl = true }, @@ -61,14 +61,14 @@ function M.get(opts, t) StatusLineNC = { fg = t.grey, bg = t.bg }, TabLine = { fg = t.grey, bg = t.bg }, TabLineFill = { fg = t.grey, bg = t.bg }, - TabLineSel = { fg = t.fg, bg = t.bgHighlight }, + TabLineSel = { fg = t.fg, bg = t.bg_highlight }, WinBar = { fg = t.fg, bg = t.bg }, WinBarNC = { fg = t.grey, bg = t.bg }, Title = { fg = t.fg }, - Visual = { bg = t.bgHighlight }, - VisualNOS = { bg = t.bgHighlight }, + Visual = { bg = t.bg_highlight }, + VisualNOS = { bg = t.bg_highlight }, WarningMsg = { fg = t.orange }, - Whitespace = { fg = t.bgHighlight }, + Whitespace = { fg = t.bg_highlight }, WildMenu = { fg = t.bg, bg = t.blue }, Constant = { fg = t.pink }, @@ -120,9 +120,9 @@ function M.get(opts, t) markdownH6 = { fg = t.green, bold = true }, markdownLinkText = { fg = t.blue, underline = true }, - LspReferenceText = { bg = t.bgHighlight }, - LspReferenceRead = { bg = t.bgHighlight }, - LspReferenceWrite = { bg = t.bgHighlight }, + LspReferenceText = { bg = t.bg_highlight }, + LspReferenceRead = { bg = t.bg_highlight }, + LspReferenceWrite = { bg = t.bg_highlight }, DiagnosticError = { fg = t.red }, DiagnosticWarn = { fg = t.yellow }, diff --git a/lua/cyberdream/extensions/blinkcmp.lua b/lua/cyberdream/extensions/blinkcmp.lua index f0792a6..87cff2e 100644 --- a/lua/cyberdream/extensions/blinkcmp.lua +++ b/lua/cyberdream/extensions/blinkcmp.lua @@ -8,8 +8,8 @@ function M.get(opts, t) opts = opts or {} local highlights = { BlinkCmpMenu = { link = "Pmenu" }, - BlinkCmpMenuBorder = { fg = util.blend(t.bgHighlight, t.grey, 0.7) }, - BlinkCmpMenuSelection = { bg = t.bgHighlight }, + BlinkCmpMenuBorder = { fg = util.blend(t.bg_highlight, t.grey, 0.7) }, + BlinkCmpMenuSelection = { bg = t.bg_highlight }, BlinkCmpLabel = { fg = t.fg }, BlinkCmpLabelDeprecated = { fg = t.grey, strikethrough = true }, BlinkCmpLabelMatch = { fg = t.cyan }, diff --git a/lua/cyberdream/extensions/fzflua.lua b/lua/cyberdream/extensions/fzflua.lua index 8457aaa..cd1eae6 100644 --- a/lua/cyberdream/extensions/fzflua.lua +++ b/lua/cyberdream/extensions/fzflua.lua @@ -7,15 +7,15 @@ function M.get(opts, t) opts = opts or {} local highlights = { - FzfLuaNormal = { bg = t.bgAlt }, - FzfLuaPreviewNormal = { bg = t.bgAlt }, - FzfLuaBorder = { fg = t.bgAlt, bg = t.bgAlt }, - FzfLuaTitle = { bg = t.blue, fg = t.bgAlt }, + FzfLuaNormal = { bg = t.bg_alt }, + FzfLuaPreviewNormal = { bg = t.bg_alt }, + FzfLuaBorder = { fg = t.bg_alt, bg = t.bg_alt }, + FzfLuaTitle = { bg = t.blue, fg = t.bg_alt }, FzfLuaFzfMatch = { fg = t.cyan }, FzfLuaFzfQuery = { fg = t.blue }, FzfLuaFzfPrompt = { fg = t.fg }, - FzfLuaFzfGutter = { bg = t.bgAlt }, + FzfLuaFzfGutter = { bg = t.bg_alt }, FzfLuaFzfPointer = { fg = t.pink }, FzfLuaFzfHeader = { fg = t.purple }, FzfLuaFzfInfo = { fg = t.cyan }, diff --git a/lua/cyberdream/extensions/grapple.lua b/lua/cyberdream/extensions/grapple.lua index 4494df2..b561d81 100644 --- a/lua/cyberdream/extensions/grapple.lua +++ b/lua/cyberdream/extensions/grapple.lua @@ -13,9 +13,9 @@ function M.get(opts, t) -- Inherit borderless theme from telescope (if enabled) if opts.borderless_telescope then - highlights.GrappleNormal = { bg = t.bgAlt } - highlights.GrappleBorder = { fg = t.bgAlt, bg = t.bgAlt } - highlights.GrappleTitle = { fg = t.bgAlt, bg = t.cyan } + highlights.GrappleNormal = { bg = t.bg_alt } + highlights.GrappleBorder = { fg = t.bg_alt, bg = t.bg_alt } + highlights.GrappleTitle = { fg = t.bg_alt, bg = t.cyan } end return highlights diff --git a/lua/cyberdream/extensions/grugfar.lua b/lua/cyberdream/extensions/grugfar.lua index 62b8d0c..2fba2b9 100644 --- a/lua/cyberdream/extensions/grugfar.lua +++ b/lua/cyberdream/extensions/grugfar.lua @@ -15,7 +15,7 @@ function M.get(opts, t) GrugFarHelpWinActionDescription = { link = "Comment" }, GrugFarInputLabel = { fg = t.orange, bold = true }, - GrugFarInputPlaceholder = { fg = util.blend(t.bgHighlight, t.fg, 0.9), italic = true }, + GrugFarInputPlaceholder = { fg = util.blend(t.bg_highlight, t.fg, 0.9), italic = true }, GrugFarResultsHeader = { link = "Comment" }, GrugFarResultsStats = { fg = t.yellow }, diff --git a/lua/cyberdream/extensions/helpview.lua b/lua/cyberdream/extensions/helpview.lua index ccc0b52..2192c59 100644 --- a/lua/cyberdream/extensions/helpview.lua +++ b/lua/cyberdream/extensions/helpview.lua @@ -13,9 +13,9 @@ function M.get(opts, t) HelpviewHeading3 = { fg = t.purple, bg = util.blend(t.bg_solid, t.purple, 0.8), bold = true }, HelpviewHeading4 = { fg = t.magenta, bg = util.blend(t.bg_solid, t.magenta, 0.8), bold = true }, - HelpviewCode = { bg = t.bgAlt }, + HelpviewCode = { bg = t.bg_alt }, HelpviewInlineCode = { link = "HelpviewCode" }, - HelpviewCodeLanguage = { fg = t.grey, bg = t.bgAlt, italic = true }, + HelpviewCodeLanguage = { fg = t.grey, bg = t.bg_alt, italic = true }, HelpviewTaglink = { fg = t.blue }, HelpviewOptionlink = { fg = util.blend(t.cyan, t.magenta, 0.4) }, diff --git a/lua/cyberdream/extensions/hop.lua b/lua/cyberdream/extensions/hop.lua index 8a985c6..20b64db 100644 --- a/lua/cyberdream/extensions/hop.lua +++ b/lua/cyberdream/extensions/hop.lua @@ -14,8 +14,8 @@ function M.get(opts, t) bg = util.blend(t.bg_solid, t.cyan, 0.9), bold = true, }, - HopUnmatched = { fg = t.bgHighlight }, - HopPreview = { fg = t.fg, bg = t.bgHighlight }, + HopUnmatched = { fg = t.bg_highlight }, + HopPreview = { fg = t.fg, bg = t.bg_highlight }, } return highlights end diff --git a/lua/cyberdream/extensions/indentblankline.lua b/lua/cyberdream/extensions/indentblankline.lua index fee3d40..f53d8a7 100644 --- a/lua/cyberdream/extensions/indentblankline.lua +++ b/lua/cyberdream/extensions/indentblankline.lua @@ -7,8 +7,8 @@ local M = {} function M.get(opts, t) opts = opts or {} local highlights = { - IblIndent = { fg = util.blend(t.bgHighlight, t.bgAlt, 0.3) }, - IblScope = { fg = t.bgHighlight }, + IblIndent = { fg = util.blend(t.bg_highlight, t.bg_alt, 0.3) }, + IblScope = { fg = t.bg_highlight }, } return highlights diff --git a/lua/cyberdream/extensions/lazy.lua b/lua/cyberdream/extensions/lazy.lua index e73bcc4..855c00d 100644 --- a/lua/cyberdream/extensions/lazy.lua +++ b/lua/cyberdream/extensions/lazy.lua @@ -8,8 +8,8 @@ function M.get(opts, t) local highlights = { LazyH1 = { fg = t.blue, bold = true }, LazyH2 = { fg = t.fg, bold = true }, - LazyButton = { fg = t.fg, bg = t.bgHighlight }, - LazyButtonActive = { fg = t.fg, bg = t.bgHighlight, bold = true }, + LazyButton = { fg = t.fg, bg = t.bg_highlight }, + LazyButtonActive = { fg = t.fg, bg = t.bg_highlight, bold = true }, LazyProgressDone = { bold = true, fg = t.magenta }, LazyProgressTodo = { bold = true, fg = t.grey }, diff --git a/lua/cyberdream/extensions/leap.lua b/lua/cyberdream/extensions/leap.lua index dad5db0..6fccee5 100644 --- a/lua/cyberdream/extensions/leap.lua +++ b/lua/cyberdream/extensions/leap.lua @@ -9,7 +9,7 @@ function M.get(opts, t) LeapMatch = { fg = t.fg, bg = t.magenta }, LeapLabelPrimary = { fg = t.blue, bg = t.bg, bold = true }, LeapLabelSecondary = { fg = t.green, bg = t.bg }, - LeapBackdrop = { fg = t.bgHighlight }, + LeapBackdrop = { fg = t.bg_highlight }, } return highlights diff --git a/lua/cyberdream/extensions/markdown.lua b/lua/cyberdream/extensions/markdown.lua index ab8b913..28ab6a4 100644 --- a/lua/cyberdream/extensions/markdown.lua +++ b/lua/cyberdream/extensions/markdown.lua @@ -21,7 +21,7 @@ function M.get(opts, t) RenderMarkdownH5Bg = { bg = util.blend(t.bg_solid, t.magenta, 0.85) }, RenderMarkdownH6Bg = { bg = util.blend(t.bg_solid, t.green, 0.85) }, - RenderMarkdownCode = { bg = t.bgAlt }, + RenderMarkdownCode = { bg = t.bg_alt }, RenderMarkdownBullet = { fg = t.grey }, RenderMarkdownQuote = { link = "Comment" }, RenderMarkdownDash = { fg = t.grey }, diff --git a/lua/cyberdream/extensions/markview.lua b/lua/cyberdream/extensions/markview.lua index d80647b..da5aa06 100644 --- a/lua/cyberdream/extensions/markview.lua +++ b/lua/cyberdream/extensions/markview.lua @@ -28,10 +28,10 @@ function M.get(opts, t) MarkviewBlockQuoteNote = { fg = t.blue }, MarkviewBlockQuoteSpecial = { fg = t.cyan }, - MarkviewCode = { bg = util.blend(t.bgAlt, t.bgHighlight, 0.8) }, - MarkviewInlineCode = { fg = t.pink, bg = util.blend(t.bgAlt, t.bgHighlight, 0.8) }, + MarkviewCode = { bg = util.blend(t.bg_alt, t.bg_highlight, 0.8) }, + MarkviewInlineCode = { fg = t.pink, bg = util.blend(t.bg_alt, t.bg_highlight, 0.8) }, - MarkviewTableBorder = { fg = t.bgHighlight }, + MarkviewTableBorder = { fg = t.bg_highlight }, MarkviewTableAlignLeft = { fg = t.green }, MarkviewTableAlignCenter = { fg = t.blue }, MarkviewTableAlignRight = { fg = t.purple }, diff --git a/lua/cyberdream/extensions/mini.lua b/lua/cyberdream/extensions/mini.lua index 72392bf..6a45d57 100644 --- a/lua/cyberdream/extensions/mini.lua +++ b/lua/cyberdream/extensions/mini.lua @@ -42,13 +42,13 @@ function M.get(opts, t) MiniDiffSignChange = { fg = t.orange }, MiniDiffSignDelete = { fg = t.red }, - MiniFilesBorder = { fg = t.bgHighlight }, + MiniFilesBorder = { fg = t.bg_highlight }, MiniFilesBorderModified = { fg = t.pink }, MiniFilesCursorLine = { link = "CursorLine" }, MiniFilesDirectory = { fg = t.blue }, MiniFilesFile = { fg = t.fg }, MiniFilesNormal = { link = "NormalFloat" }, - MiniFilesTitle = { fg = util.blend(t.bgHighlight, t.cyan, 0.7) }, + MiniFilesTitle = { fg = util.blend(t.bg_highlight, t.cyan, 0.7) }, MiniFilesTitleFocused = { fg = t.cyan }, MiniHipatternsFixme = { fg = t.bg_solid, bg = t.red, bold = true }, @@ -94,7 +94,7 @@ function M.get(opts, t) MiniPickIconFile = { link = "MiniPickNormal" }, MiniPickHeader = { link = "DiagnosticFloatingHint" }, MiniPickMatchCurrent = { link = "CursorLine" }, - MiniPickMatchMarked = { bg = t.bgHighlight }, + MiniPickMatchMarked = { bg = t.bg_highlight }, MiniPickMatchRanges = { fg = t.orange }, MiniPickNormal = { link = "NormalFloat" }, MiniPickPreviewLine = { link = "CursorLine" }, @@ -124,14 +124,14 @@ function M.get(opts, t) MiniSurround = { link = "IncSearch" }, - MiniTablineCurrent = { fg = t.fg, bg = t.bgHighlight, bold = true }, + MiniTablineCurrent = { fg = t.fg, bg = t.bg_highlight, bold = true }, MiniTablineFill = { link = "TabLineFill" }, MiniTablineHidden = { fg = t.grey, bg = t.bg }, - MiniTablineModifiedCurrent = { fg = t.bgHighlight, bg = t.fg, bold = true }, + MiniTablineModifiedCurrent = { fg = t.bg_highlight, bg = t.fg, bold = true }, MiniTablineModifiedHidden = { fg = t.bg_solid, bg = t.grey }, - MiniTablineModifiedVisible = { fg = t.bgHighlight, bg = t.fg }, + MiniTablineModifiedVisible = { fg = t.bg_highlight, bg = t.fg }, MiniTablineTabpagesection = { link = "Search" }, - MiniTablineVisible = { fg = t.fg, bg = t.bgHighlight }, + MiniTablineVisible = { fg = t.fg, bg = t.bg_highlight }, MiniTestEmphasis = { bold = true }, MiniTestFail = { fg = t.red, bold = true }, diff --git a/lua/cyberdream/extensions/neogit.lua b/lua/cyberdream/extensions/neogit.lua index de37edb..94a5d72 100644 --- a/lua/cyberdream/extensions/neogit.lua +++ b/lua/cyberdream/extensions/neogit.lua @@ -29,7 +29,7 @@ function M.get(opts, t) bg_cyan = util.blend(t.bg_solid, t.cyan, 0.20), bg_blue = util.blend(t.bg_solid, t.blue, 0.20), bg_magenta = util.blend(t.bg_solid, t.magenta, 0.20), - bg_alt = util.blend(t.bg_solid, t.bgHighlight, 0.02), + bg_alt = util.blend(t.bg_solid, t.bg_highlight, 0.02), -- styles bold = true, italic = true, diff --git a/lua/cyberdream/extensions/noice.lua b/lua/cyberdream/extensions/noice.lua index 4eb9918..96f5817 100644 --- a/lua/cyberdream/extensions/noice.lua +++ b/lua/cyberdream/extensions/noice.lua @@ -6,8 +6,8 @@ local M = {} function M.get(opts, t) opts = opts or {} local highlights = { - NoiceFormatProgressDone = { fg = t.bgAlt, bg = t.cyan }, - NoiceFormatProgressTodo = { fg = t.grey, bg = t.bgHighlight }, + NoiceFormatProgressDone = { fg = t.bg_alt, bg = t.cyan }, + NoiceFormatProgressTodo = { fg = t.grey, bg = t.bg_highlight }, NoiceLspProgressClient = { fg = t.blue }, NoiceLspProgressSpinner = { fg = t.orange }, NoiceLspProgressTitle = { fg = t.cyan }, diff --git a/lua/cyberdream/extensions/notify.lua b/lua/cyberdream/extensions/notify.lua index 7ddad4c..7cdc90c 100644 --- a/lua/cyberdream/extensions/notify.lua +++ b/lua/cyberdream/extensions/notify.lua @@ -7,22 +7,22 @@ function M.get(opts, t) opts = opts or {} local highlights = { NotifyDEBUGBody = { fg = t.fg }, - NotifyDEBUGBorder = { fg = t.bgHighlight }, + NotifyDEBUGBorder = { fg = t.bg_highlight }, NotifyDEBUGIcon = { fg = t.grey }, NotifyDEBUGTitle = { fg = t.grey }, NotifyERRORBody = { fg = t.fg }, - NotifyERRORBorder = { fg = t.bgHighlight }, + NotifyERRORBorder = { fg = t.bg_highlight }, NotifyERRORIcon = { fg = t.red }, NotifyERRORTitle = { fg = t.pink }, NotifyINFOBody = { fg = t.fg }, - NotifyINFOBorder = { fg = t.bgHighlight }, + NotifyINFOBorder = { fg = t.bg_highlight }, NotifyINFOIcon = { fg = t.green }, NotifyINFOTitle = { fg = t.cyan }, - NotifyTRACEBorder = { fg = t.bgHighlight }, + NotifyTRACEBorder = { fg = t.bg_highlight }, NotifyTRACEIcon = { fg = t.purple }, NotifyTRACETitle = { fg = t.magenta }, NotifyWARNBody = { fg = t.fg }, - NotifyWARNBorder = { fg = t.bgHighlight }, + NotifyWARNBorder = { fg = t.bg_highlight }, NotifyWARNIcon = { fg = t.orange }, NotifyWARNTitle = { fg = t.yellow }, NotifyBackground = { bg = t.bg }, diff --git a/lua/cyberdream/extensions/snacks.lua b/lua/cyberdream/extensions/snacks.lua index afb1f71..dd9506c 100644 --- a/lua/cyberdream/extensions/snacks.lua +++ b/lua/cyberdream/extensions/snacks.lua @@ -14,7 +14,7 @@ function M.get(opts, t) SnacksWinBarNC = { link = "SnacksWinBar" }, SnacksNotifierDebug = { fg = t.fg }, - SnacksNotifierBorderDebug = { fg = t.bgHighlight }, + SnacksNotifierBorderDebug = { fg = t.bg_highlight }, SnacksNotifierIconDebug = { fg = t.grey }, SnacksNotifierTitleDebug = { fg = t.grey }, diff --git a/lua/cyberdream/extensions/telescope.lua b/lua/cyberdream/extensions/telescope.lua index fbd9372..4b88a4c 100644 --- a/lua/cyberdream/extensions/telescope.lua +++ b/lua/cyberdream/extensions/telescope.lua @@ -5,20 +5,13 @@ local M = {} --- @param t CyberdreamPalette function M.get(opts, t) opts = opts or {} - local borderless_telescope = opts.borderless_telescope - local telescope_style = "" - if type(opts.borderless_telescope) == "table" then - borderless_telescope = not opts.borderless_telescope.border - telescope_style = opts.borderless_telescope.style - end - local highlights = { - TelescopeBorder = { fg = t.bgHighlight }, + TelescopeBorder = { fg = t.bg_highlight }, TelescopePromptTitle = { fg = t.blue }, TelescopeResultsTitle = { fg = t.cyan }, TelescopePromptPrefix = { fg = t.pink }, TelescopePreviewTitle = { fg = t.magenta }, - TelescopeSelection = { bg = t.bgHighlight }, + TelescopeSelection = { bg = t.bg_highlight }, TelescopePromptCounter = { fg = t.pink }, TelescopeMatching = { fg = t.cyan }, @@ -72,26 +65,18 @@ function M.get(opts, t) TelescopeResultsDiffUntracked = { link = "NonText" }, } - if borderless_telescope then - highlights.TelescopeBorder = { fg = t.bgAlt, bg = t.bgAlt } - highlights.TelescopeNormal = { bg = t.bgAlt } - highlights.TelescopePreviewBorder = { fg = t.bgAlt, bg = t.bgAlt } - highlights.TelescopePreviewNormal = { bg = t.bgAlt } - highlights.TelescopePreviewTitle = { fg = t.bgAlt, bg = t.green, bold = true } - highlights.TelescopePromptTitle = { fg = t.bgAlt, bg = t.red, bold = true } - highlights.TelescopeResultsBorder = { fg = t.bgAlt, bg = t.bgAlt } - highlights.TelescopeResultsNormal = { bg = t.bgAlt } - highlights.TelescopeResultsTitle = { fg = t.bgAlt, bg = t.cyan } - if telescope_style == "nvchad" then - highlights.TelescopePromptBorder = { fg = t.bgHighlight, bg = t.bgHighlight } - highlights.TelescopePromptNormal = { fg = t.fg, bg = t.bgHighlight } - highlights.TelescopePromptPrefix = { fg = t.red, bg = t.bgHighlight } - elseif telescope_style == "flat" then - highlights.TelescopePromptPrefix = { fg = t.blue, bg = t.bgAlt } - highlights.TelescopePromptCounter = { fg = t.cyan, bg = t.bgAlt } - highlights.TelescopePromptTitle = { fg = t.bgAlt, bg = t.blue, bold = true } - highlights.TelescopeResultsTitle = { fg = t.blue, bg = t.bgAlt, bold = true } - end + if opts.borderless_telescope then + highlights.TelescopeBorder = { fg = t.bg_alt, bg = t.bg_alt } + highlights.TelescopeNormal = { bg = t.bg_alt } + highlights.TelescopePreviewBorder = { fg = t.bg_alt, bg = t.bg_alt } + highlights.TelescopePreviewNormal = { bg = t.bg_alt } + highlights.TelescopePreviewTitle = { fg = t.bg_alt, bg = t.green, bold = true } + highlights.TelescopeResultsBorder = { fg = t.bg_alt, bg = t.bg_alt } + highlights.TelescopeResultsNormal = { bg = t.bg_alt } + highlights.TelescopePromptPrefix = { fg = t.blue, bg = t.bg_alt } + highlights.TelescopePromptCounter = { fg = t.cyan, bg = t.bg_alt } + highlights.TelescopePromptTitle = { fg = t.bg_alt, bg = t.blue, bold = true } + highlights.TelescopeResultsTitle = { fg = t.blue, bg = t.bg_alt, bold = true } end return highlights diff --git a/lua/cyberdream/extensions/treesittercontext.lua b/lua/cyberdream/extensions/treesittercontext.lua index 98ae604..8e0300e 100644 --- a/lua/cyberdream/extensions/treesittercontext.lua +++ b/lua/cyberdream/extensions/treesittercontext.lua @@ -7,8 +7,8 @@ local util = require("cyberdream.util") function M.get(opts, t) opts = opts or {} local highlights = { - TreeSitterContext = { bg = util.blend(t.bgAlt, t.cyan, 0.9) }, - TreeSitterContextLineNumber = { fg = util.blend(t.bgHighlight, t.fg) }, + TreeSitterContext = { bg = util.blend(t.bg_alt, t.cyan, 0.9) }, + TreeSitterContextLineNumber = { fg = util.blend(t.bg_highlight, t.fg) }, } return highlights end diff --git a/lua/cyberdream/extensions/trouble.lua b/lua/cyberdream/extensions/trouble.lua index ab4a000..18dfda6 100644 --- a/lua/cyberdream/extensions/trouble.lua +++ b/lua/cyberdream/extensions/trouble.lua @@ -7,7 +7,7 @@ function M.get(opts, t) opts = opts or {} local highlights = { TroubleCode = { fg = t.magenta }, - TroubleCount = { bg = t.bgHighlight, bold = true }, + TroubleCount = { bg = t.bg_highlight, bold = true }, TroubleDirectory = { fg = t.grey, bold = true }, TroubleFilename = { fg = t.cyan }, TroubleIconArray = { fg = t.pink }, diff --git a/lua/cyberdream/extra/alacritty.lua b/lua/cyberdream/extra/alacritty.lua index f6569bc..4b6f1f4 100644 --- a/lua/cyberdream/extra/alacritty.lua +++ b/lua/cyberdream/extra/alacritty.lua @@ -34,7 +34,7 @@ color = "${red}" index = 17 [colors.bright] -black = "${bgHighlight}" +black = "${bg_highlight}" blue = "${blue}" cyan = "${cyan}" green = "${green}" @@ -58,7 +58,7 @@ background = "${bg}" foreground = "${fg}" [colors.selection] -background = "${bgHighlight}" +background = "${bg_highlight}" foreground = "${fg}" ]==] diff --git a/lua/cyberdream/extra/base16.lua b/lua/cyberdream/extra/base16.lua index c60a6e6..9bc118e 100644 --- a/lua/cyberdream/extra/base16.lua +++ b/lua/cyberdream/extra/base16.lua @@ -20,8 +20,8 @@ function M.generate(variant) scheme: "Cyberdream" author: "Scott McKendry" base00: "${bg}" -base01: "${bgAlt}" -base02: "${bgHighlight}" +base01: "${bg_alt}" +base02: "${bg_highlight}" base03: "${grey}" base04: "${grey}" base05: "${fg}" diff --git a/lua/cyberdream/extra/fish.lua b/lua/cyberdream/extra/fish.lua index 0856d21..8efd8a7 100644 --- a/lua/cyberdream/extra/fish.lua +++ b/lua/cyberdream/extra/fish.lua @@ -40,8 +40,8 @@ fish_color_end ${purple} fish_color_comment ${grey} fish_color_error ${red} fish_color_gray ${grey} -fish_color_selection --background=${bgHighlight} -fish_color_search_match --background=${bgHighlight} +fish_color_selection --background=${bg_highlight} +fish_color_search_match --background=${bg_highlight} fish_color_option ${yellow} fish_color_operator ${blue} fish_color_escape ${pastel_pink} diff --git a/lua/cyberdream/extra/foot.lua b/lua/cyberdream/extra/foot.lua index fea9fda..903b4e8 100644 --- a/lua/cyberdream/extra/foot.lua +++ b/lua/cyberdream/extra/foot.lua @@ -41,7 +41,7 @@ regular5= ${purple} regular6= ${cyan} regular7= ${fg} # The eight bright ANSI colors (Black, Red, Green, Yellow, Blue, Magenta, Cyan, White) -bright0= ${bgHighlight} +bright0= ${bg_highlight} bright1= ${red} bright2= ${green} bright3= ${yellow} diff --git a/lua/cyberdream/extra/ghostty.lua b/lua/cyberdream/extra/ghostty.lua index 26d6209..37b9fff 100644 --- a/lua/cyberdream/extra/ghostty.lua +++ b/lua/cyberdream/extra/ghostty.lua @@ -17,7 +17,7 @@ palette = 4=${blue} palette = 5=${purple} palette = 6=${cyan} palette = 7=${fg} -palette = 8=${bgHighlight} +palette = 8=${bg_highlight} palette = 9=${red} palette = 10=${green} palette = 11=${yellow} @@ -29,7 +29,7 @@ palette = 15=${fg} background = ${bg} foreground = ${fg} cursor-color = ${fg} -selection-background = ${bgHighlight} +selection-background = ${bg_highlight} selection-foreground = ${fg} ]==] diff --git a/lua/cyberdream/extra/gitui.lua b/lua/cyberdream/extra/gitui.lua index 2cc121b..53c2aa6 100644 --- a/lua/cyberdream/extra/gitui.lua +++ b/lua/cyberdream/extra/gitui.lua @@ -29,7 +29,7 @@ function M.generate(variant) local unformatted = colors[variant] unformatted.light_purple = util.blend(unformatted.fg, unformatted.purple) unformatted.grey_blue = util.blend(unformatted.grey, unformatted.blue) - unformatted.dark_blue = util.blend(unformatted.bgAlt, unformatted.blue) + unformatted.dark_blue = util.blend(unformatted.bg_alt, unformatted.blue) unformatted.pastel_pink = util.blend(unformatted.fg, unformatted.pink) unformatted.turquoise = util.blend(unformatted.green, unformatted.cyan, 0.3) @@ -38,7 +38,7 @@ function M.generate(variant) ( selected_tab: Rgb(${cyan}), // bright cyan for highlight command_fg: Rgb(${fg}), // white for commands foreground - selection_bg: Rgb(${bgHighlight}), // darker grey for selection background + selection_bg: Rgb(${bg_highlight}), // darker grey for selection background selection_fg: Rgb(${fg}), // white for selected text cmdbar_bg: Rgb(${bg}), // very dark grey almost black for command bar background cmdbar_extra_lines_bg: Rgb(${bg}), // very dark grey almost black for extra lines in command bar diff --git a/lua/cyberdream/extra/helix.lua b/lua/cyberdream/extra/helix.lua index e4f8b80..3377275 100644 --- a/lua/cyberdream/extra/helix.lua +++ b/lua/cyberdream/extra/helix.lua @@ -15,7 +15,7 @@ function M.generate(variant) "ui.statusline" = { fg = "cyan" } "ui.selection" = "green" "ui.selection.primary" = "magenta" -"ui.virtual.ruler" = { bg = "bgHighlight" } +"ui.virtual.ruler" = { bg = "bg_highlight" } # Syntax Highlighting for Code "comment" = { fg = "grey", modifiers = ["italic"] } @@ -50,10 +50,10 @@ function M.generate(variant) "label" = "red" # Interface specific -"ui.cursorline.primary" = { bg = "bgHighlight" } -"ui.cursorline.secondary" = { bg = "bgAlt" } -"ui.cursorcolumn.primary" = { bg = "bgHighlight" } -"ui.cursorcolumn.secondary" = { bg = "bgAlt" } +"ui.cursorline.primary" = { bg = "bg_highlight" } +"ui.cursorline.secondary" = { bg = "bg_alt" } +"ui.cursorcolumn.primary" = { bg = "bg_highlight" } +"ui.cursorcolumn.secondary" = { bg = "bg_alt" } "ui.statusline.normal" = { fg = "fg", bg = "bg" } "ui.statusline.insert" = { fg = "green", bg = "bg" } "ui.statusline.select" = { fg = "blue", bg = "bg" } @@ -72,7 +72,7 @@ function M.generate(variant) # Popups and Menus "ui.popup" = { fg = "fg", bg = "bg" } -"ui.popup.info" = { fg = "cyan", bg = "bgAlt" } +"ui.popup.info" = { fg = "cyan", bg = "bg_alt" } "ui.menu" = { fg = "fg", bg = "bg" } "ui.menu.selected" = { fg = "bg", bg = "fg" } @@ -93,8 +93,8 @@ magenta = "${magenta}" pink = "${pink}" orange = "${orange}" purple = "${purple}" -bgAlt = "${bgAlt}" -bgHighlight = "${bgHighlight}" +bg_alt = "${bg_alt}" +bg_highlight = "${bg_highlight}" ]==] return util.parse_extra_template(template, colors[variant]) diff --git a/lua/cyberdream/extra/kitty.lua b/lua/cyberdream/extra/kitty.lua index 2b56bfe..aca0f69 100644 --- a/lua/cyberdream/extra/kitty.lua +++ b/lua/cyberdream/extra/kitty.lua @@ -13,9 +13,9 @@ background ${bg} foreground ${fg} cursor ${fg} cursor_text_color ${bg} -selection_background ${bgHighlight} +selection_background ${bg_highlight} color0 ${bg} -color8 ${bgHighlight} +color8 ${bg_highlight} color1 ${red} color9 ${red} color2 ${green} diff --git a/lua/cyberdream/extra/lazydocker.lua b/lua/cyberdream/extra/lazydocker.lua index 214c6ec..1655f91 100644 --- a/lua/cyberdream/extra/lazydocker.lua +++ b/lua/cyberdream/extra/lazydocker.lua @@ -17,9 +17,9 @@ gui: inactiveBorderColor: - "${grey}" selectedLineBgColor: - - "${bgHighlight}" + - "${bg_highlight}" optionsTextColor: - - "${bgHighlight}" + - "${bg_highlight}" ]==] return util.parse_extra_template(template, colors[variant]) diff --git a/lua/cyberdream/extra/lazygit.lua b/lua/cyberdream/extra/lazygit.lua index de238fa..70d2805 100644 --- a/lua/cyberdream/extra/lazygit.lua +++ b/lua/cyberdream/extra/lazygit.lua @@ -19,11 +19,11 @@ gui: searchingActiveBorderColor: - "${magenta}" optionsTextColor: - - "${bgHighlight}" + - "${bg_highlight}" selectedLineBgColor: - - "${bgHighlight}" + - "${bg_highlight}" cherryPickedCommitBgColor: - - "${bgHighlight}" + - "${bg_highlight}" cherryPickedCommitFgColor: - "${pink}" unstagedChangesColor: diff --git a/lua/cyberdream/extra/lsd.lua b/lua/cyberdream/extra/lsd.lua index caf0788..4f3b1f2 100644 --- a/lua/cyberdream/extra/lsd.lua +++ b/lua/cyberdream/extra/lsd.lua @@ -57,7 +57,7 @@ permission: date: hour-old: ${fgDim} day-old: ${grey} - older: ${bgHighlight} + older: ${bg_highlight} size: none: ${grey} small: ${green} diff --git a/lua/cyberdream/extra/pywal.lua b/lua/cyberdream/extra/pywal.lua index 807fb46..62f57c7 100644 --- a/lua/cyberdream/extra/pywal.lua +++ b/lua/cyberdream/extra/pywal.lua @@ -17,7 +17,7 @@ function M.generate(variant) "color5": "${purple}", "color6": "${cyan}", "color7": "${fg}", - "color8": "${bgHighlight}", + "color8": "${bg_highlight}", "color9": "${red}", "color10": "${green}", "color11": "${yellow}", diff --git a/lua/cyberdream/extra/rio.lua b/lua/cyberdream/extra/rio.lua index 9bd9b69..caff3fc 100644 --- a/lua/cyberdream/extra/rio.lua +++ b/lua/cyberdream/extra/rio.lua @@ -24,7 +24,7 @@ function M.generate(variant) [colors] # Regular colors background = '${bg}' -black = '${bgAlt}' +black = '${bg_alt}' blue = '${blue}' cursor = '${fg}' cyan = '${cyan}' @@ -36,13 +36,13 @@ white = '${fg}' yellow = '${yellow}' # UI colors -tabs = '${bgHighlight}' +tabs = '${bg_highlight}' tabs-active = '${grey}' selection-foreground = '${fg}' -selection-background = '${bgAlt}' +selection-background = '${bg_alt}' # Dim colors -dim-black = '${bgAltDim}' +dim-black = '${bg_altDim}' dim-blue = '${blueDim}' dim-cyan = '${cyanDim}' dim-foreground = '${fgDim}' @@ -53,7 +53,7 @@ dim-white = '${fgDim}' dim-yellow = '${yellowDim}' # Light colors -light-black = '${bgAltLight}' +light-black = '${bg_altLight}' light-blue = '${blueLight}' light-cyan = '${cyanLight}' light-foreground = '${fgLight}' diff --git a/lua/cyberdream/extra/textmate.lua b/lua/cyberdream/extra/textmate.lua index fe753af..35f4b7e 100644 --- a/lua/cyberdream/extra/textmate.lua +++ b/lua/cyberdream/extra/textmate.lua @@ -29,13 +29,13 @@ function M.generate(variant) invisibles ${bg} lineHighlight - ${bgHighlight} + ${bg_highlight} selection - ${bgHighlight} + ${bg_highlight} findHighlight ${cyan} findHighlightForeground - ${bgAlt} + ${bg_alt} selectionBorder ${bg} activeGuide diff --git a/lua/cyberdream/extra/tilix.lua b/lua/cyberdream/extra/tilix.lua index 08b741d..af5ecf8 100644 --- a/lua/cyberdream/extra/tilix.lua +++ b/lua/cyberdream/extra/tilix.lua @@ -15,7 +15,7 @@ function M.generate(variant) "badge-color": "${bg}", "bold-color": "${cyan}", "cursor-color": "${fg}", - "highlight-background-color": "${bgHighlight}", + "highlight-background-color": "${bg_highlight}", "highlight-foreground-color": "${fg}", "palette": [ "${bg}", @@ -26,7 +26,7 @@ function M.generate(variant) "${purple}", "${cyan}", "${fg}", - "${bgHighlight}", + "${bg_highlight}", "${red}", "${green}", "${yellow}", diff --git a/lua/cyberdream/extra/tmux.lua b/lua/cyberdream/extra/tmux.lua index 31c5808..11a49c7 100644 --- a/lua/cyberdream/extra/tmux.lua +++ b/lua/cyberdream/extra/tmux.lua @@ -8,11 +8,11 @@ local M = {} function M.generate(variant) local template = [==[ # cyberdream theme for tmux (catppuccin) -thm_bg="${bgAlt}" +thm_bg="${bg_alt}" thm_fg="${fg}" thm_cyan="${cyan}" -thm_black="${bgHighlight}" -thm_gray="${bgHighlight}" +thm_black="${bg_highlight}" +thm_gray="${bg_highlight}" thm_magenta="${magenta}" thm_pink="${pink}" thm_red="${red}" diff --git a/lua/cyberdream/extra/wezterm.lua b/lua/cyberdream/extra/wezterm.lua index bad11eb..0023111 100644 --- a/lua/cyberdream/extra/wezterm.lua +++ b/lua/cyberdream/extra/wezterm.lua @@ -17,13 +17,13 @@ return { cursor_border = "${fg}", selection_fg = "${fg}", - selection_bg = "${bgHighlight}", + selection_bg = "${bg_highlight}", scrollbar_thumb = "${bg}", split = "${bg}", ansi = { "${bg}", "${red}", "${green}", "${yellow}", "${blue}", "${purple}", "${cyan}", "${fg}" }, - brights = { "${bgHighlight}", "${red}", "${green}", "${yellow}", "${blue}", "${purple}", "${cyan}", "${fg}" }, + brights = { "${bg_highlight}", "${red}", "${green}", "${yellow}", "${blue}", "${purple}", "${cyan}", "${fg}" }, indexed = { [16] = "${orange}", [17] = "${red}" }, } ]==] diff --git a/lua/cyberdream/extra/windowsterminal.lua b/lua/cyberdream/extra/windowsterminal.lua index f9c1248..2f26fa9 100644 --- a/lua/cyberdream/extra/windowsterminal.lua +++ b/lua/cyberdream/extra/windowsterminal.lua @@ -11,7 +11,7 @@ function M.generate(variant) "background": "${bg}", "black": "${bg}", "blue": "${blue}", - "brightBlack": "${bgHighlight}", + "brightBlack": "${bg_highlight}", "brightBlue": "${blue}", "brightCyan": "${cyan}", "brightGreen": "${green}", @@ -26,7 +26,7 @@ function M.generate(variant) "name": "cyberdream", "purple": "${purple}", "red": "${red}", - "selectionBackground": "${bgHighlight}", + "selectionBackground": "${bg_highlight}", "white": "${fg}", "yellow": "${yellow}" } diff --git a/lua/cyberdream/extra/yazi.lua b/lua/cyberdream/extra/yazi.lua index 54d433c..f3561c0 100644 --- a/lua/cyberdream/extra/yazi.lua +++ b/lua/cyberdream/extra/yazi.lua @@ -10,17 +10,17 @@ function M.generate(variant) [manager] # tmTheme files can be found here: https://github.com/scottmckendry/cyberdream.nvim/tree/main/extras/textmate syntect_theme = "../bat/themes/cyberdream.tmTheme" -border_style = { fg = "${bgHighlight}" } +border_style = { fg = "${bg_highlight}" } cwd = { fg = "${cyan}" } find_keyword = { bold = true, fg = "${green}" } find_position = { fg = "${fg}" } hovered = { bg = "${grey}", bold = true, fg = "${fg}" } marker_copied = { bg = "${yellow}", fg = "${yellow}" } marker_cut = { bg = "${red}", fg = "${red}" } -marker_selected = { bg = "${bgHighlight}", fg = "${green}" } -preview_hovered = { bg = "${bgHighlight}", bold = true, fg = "${fg}" } +marker_selected = { bg = "${bg_highlight}", fg = "${green}" } +preview_hovered = { bg = "${bg_highlight}", bold = true, fg = "${fg}" } tab_active = { bg = "${blue}", fg = "${bg}" } -tab_inactive = { bg = "${bgHighlight}", fg = "${fg}" } +tab_inactive = { bg = "${bg_highlight}", fg = "${fg}" } count_selected = { bg = "${green}", fg = "${bg}" } count_copied = { bg = "${yellow}", fg = "${bg}" } @@ -82,7 +82,7 @@ permissions_x = { fg = "${green}" } progress_error = { bg = "${bg}", fg = "${red}" } progress_label = { bg = "${bg}", fg = "${fg}" } progress_normal = { bg = "${bg}", fg = "${fg}" } -separator_style = { bg = "${bgHighlight}", fg = "${bgHighlight}" } +separator_style = { bg = "${bg_highlight}", fg = "${bg_highlight}" } [tasks] border = { fg = "${blue}" } @@ -92,7 +92,7 @@ title = { fg = "${fg}" } [which] cand = { fg = "${cyan}" } desc = { fg = "${fg}" } -mask = { bg = "${bgHighlight}" } +mask = { bg = "${bg_highlight}" } rest = { fg = "${magenta}" } separator_style = { fg = "${grey}" } ]==] diff --git a/lua/cyberdream/extra/zed.lua b/lua/cyberdream/extra/zed.lua index 06d7565..613102f 100644 --- a/lua/cyberdream/extra/zed.lua +++ b/lua/cyberdream/extra/zed.lua @@ -62,7 +62,7 @@ function M.generate(variant) "toolbar.background": "${bg}", "tab_bar.background": null, "tab.inactive_background": "${bg}", - "tab.active_background": "${bgAlt}", + "tab.active_background": "${bg_alt}", "search.match_background": "${orangeAlpha}", "panel.background": "${bg}", "panel.focused_border": null, @@ -77,7 +77,7 @@ function M.generate(variant) "editor.background": "${bg}", "editor.gutter.background": "${bg}", "editor.subheader.background": null, - "editor.active_line.background": "${bgAlt}", + "editor.active_line.background": "${bg_alt}", "editor.highlighted_line.background": null, "editor.line_number": null, "editor.active_line_number": "${fg}", diff --git a/lua/cyberdream/theme.lua b/lua/cyberdream/theme.lua index 24d18ae..31061db 100644 --- a/lua/cyberdream/theme.lua +++ b/lua/cyberdream/theme.lua @@ -28,7 +28,7 @@ function M.setup() ---@type CyberdreamPalette t = vim.tbl_deep_extend("force", t, opts.theme.colors) - t.bg_solid = t.bg ~= "NONE" and t.bg or t.bgAlt + t.bg_solid = t.bg ~= "NONE" and t.bg or t.bg_alt if opts.transparent then t.bg = "NONE" end @@ -52,7 +52,7 @@ function M.setup() if opts.terminal_colors then vim.g.terminal_color_0 = t.bg - vim.g.terminal_color_8 = t.bgAlt + vim.g.terminal_color_8 = t.bg_alt vim.g.terminal_color_7 = t.fg vim.g.terminal_color_15 = t.grey