Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: scottmckendry/cyberdream.nvim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9bbacf8f0f0bd1e2a85c41ea16efc74469f4e96c
Choose a base ref
..
head repository: scottmckendry/cyberdream.nvim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 42ff1ade61dc3b70ecc69f9943dbaa20864bf8fa
Choose a head ref
Showing with 25 additions and 7 deletions.
  1. +1 −0 CHANGELOG.md
  2. +3 −1 lua/cyberdream/config.lua
  3. +21 −6 lua/cyberdream/theme.lua
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
* **ci:** developer experience improvements ([#71](https://github.com/scottmckendry/cyberdream.nvim/issues/71)) ([b7c5f5b](https://github.com/scottmckendry/cyberdream.nvim/commit/b7c5f5b4fbed9a9655bf738d3fbf932ecfe24f78))
* **ci:** run ci checks on pull requests ([9d0662e](https://github.com/scottmckendry/cyberdream.nvim/commit/9d0662e79d0a1ccb437dee7d7cd093a076a14f3b))
* **highlights:** improved `NonText` readability ([#74](https://github.com/scottmckendry/cyberdream.nvim/issues/74)) ([aec0467](https://github.com/scottmckendry/cyberdream.nvim/commit/aec04675175107fb613e638312dd90cddca3977f))
* **telescope:** add `nvchad` borderless telescope style ([#75](https://github.com/scottmckendry/cyberdream.nvim/issues/75)) ([c1085d7](https://github.com/scottmckendry/cyberdream.nvim/commit/c1085d73fcb72edc14dab0f6a90d0e8155b51d03))
* use more distinct colors for variable types ([#73](https://github.com/scottmckendry/cyberdream.nvim/issues/73)) ([e668b02](https://github.com/scottmckendry/cyberdream.nvim/commit/e668b02fb438fe1be907dfd83f98b7eb2a563b66))


4 changes: 3 additions & 1 deletion lua/cyberdream/config.lua
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,13 @@ local M = {}
---@field highlights? table<string, table<string, string>>
---@field overrides? CyberdreamOverrideFn

---@alias CyberdreamTelescopeStyle "nvchad" | "flat"

---@class Config
---@field transparent? boolean
---@field italic_comments? boolean
---@field hide_fillchars? boolean
---@field borderless_telescope? boolean
---@field borderless_telescope? boolean | { border: boolean, style: CyberdreamTelescopeStyle }
---@field terminal_colors? boolean
---@field theme? ThemeConfig
local default_options = {
27 changes: 21 additions & 6 deletions lua/cyberdream/theme.lua
View file
Original file line number Diff line number Diff line change
@@ -48,6 +48,13 @@ function M.setup()
})
end

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

theme.highlights = {
Comment = { fg = t.grey, italic = opts.italic_comments },
ColorColumn = { bg = t.bgHighlight },
@@ -343,16 +350,24 @@ function M.setup()
["@keyword"] = { link = "Keyword" },
}

if opts.borderless_telescope then
if borderless_telescope then
theme.highlights.TelescopeBorder = { fg = t.bgAlt, bg = t.bgAlt }
theme.highlights.TelescopeNormal = { bg = t.bgAlt }
theme.highlights.TelescopePreviewBorder = { fg = t.bgAlt, bg = t.bgAlt }
theme.highlights.TelescopePreviewNormal = { bg = t.bgAlt }
theme.highlights.TelescopePreviewTitle = { fg = t.bgAlt, bg = t.green }
theme.highlights.TelescopePromptBorder = { fg = t.bgAlt, bg = t.bgAlt }
theme.highlights.TelescopePromptNormal = { fg = t.fg, bg = t.bgAlt }
theme.highlights.TelescopePromptPrefix = { fg = t.red, bg = t.bgAlt }
theme.highlights.TelescopePromptTitle = { fg = t.bgAlt, bg = t.red }
if telescope_style == "nvchad" then
theme.highlights.TelescopePreviewTitle = { fg = t.bgAlt, bg = t.green, bold = true }
theme.highlights.TelescopePromptBorder = { fg = t.bgHighlight, bg = t.bgHighlight }
theme.highlights.TelescopePromptNormal = { fg = t.fg, bg = t.bgHighlight }
theme.highlights.TelescopePromptPrefix = { fg = t.red, bg = t.bgHighlight }
theme.highlights.TelescopePromptTitle = { fg = t.bgAlt, bg = t.red, bold = true }
else
theme.highlights.TelescopePreviewTitle = { fg = t.bgAlt, bg = t.green }
theme.highlights.TelescopePromptBorder = { fg = t.bgAlt, bg = t.bgAlt }
theme.highlights.TelescopePromptNormal = { fg = t.fg, bg = t.bgAlt }
theme.highlights.TelescopePromptPrefix = { fg = t.red, bg = t.bgAlt }
theme.highlights.TelescopePromptTitle = { fg = t.bgAlt, bg = t.red }
end
theme.highlights.TelescopeResultsBorder = { fg = t.bgAlt, bg = t.bgAlt }
theme.highlights.TelescopeResultsNormal = { bg = t.bgAlt }
theme.highlights.TelescopeResultsTitle = { fg = t.bgAlt, bg = t.bgAlt }