Merge branch 'main' into light-variant

.github/workflows/extras.yml

@@ -0,0 +1,24 @@
+name: Generate Extras
+on:
+    push:
+
+jobs:
+    generate-extras:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+
+            - name: Install Neovim
+              uses: rhysd/action-setup-vim@v1
+              with:
+                  neovim: true
+                  version: stable
+
+            - name: Generate Extras
+              run: |
+                  nvim -u NONE -E -R --headless --cmd "set rtp^=." --cmd "lua require('cyberdream.extra').generate_all_extras()" --cmd qa
+
+            - name: Commit changes
+              uses: stefanzweifel/git-auto-commit-action@v4
+              with:
+                  commit_message: "chore: generate extras"

CHANGELOG.md

@@ -1,5 +1,54 @@
 # Changelog
 
+## [1.3.0](https://github.com/scottmckendry/cyberdream.nvim/compare/v1.2.1...v1.3.0) (2024-05-03)
+
+
+### Features
+
+* add support for indent-blankline ([a9eb003](https://github.com/scottmckendry/cyberdream.nvim/commit/a9eb003663010322b3acbf41740dd8024f24acb9))
+* add support for treesitter-context ([ef2cbcc](https://github.com/scottmckendry/cyberdream.nvim/commit/ef2cbccda1197f5ed07d52177456c14db27fd0f5))
+
+## [1.2.1](https://github.com/scottmckendry/cyberdream.nvim/compare/v1.2.0...v1.2.1) (2024-04-30)
+
+
+### Bug Fixes
+
+* differentiate matches when replacing with /gc ([d777f1b](https://github.com/scottmckendry/cyberdream.nvim/commit/d777f1bfb0e6e1d74b3f243d8e4999b6b931ae19))
+* set CursorLine hl to visible color ([528085b](https://github.com/scottmckendry/cyberdream.nvim/commit/528085bc1760a76ff4e9aba4d85b0d39d2486866))
+
+## [1.2.0](https://github.com/scottmckendry/cyberdream.nvim/compare/v1.1.0...v1.2.0) (2024-04-28)
+
+
+### Features
+
+* add support for nofify ([dab90f1](https://github.com/scottmckendry/cyberdream.nvim/commit/dab90f1cf0c49bab8fb7a967d47724e075bcc437)), closes [#22](https://github.com/scottmckendry/cyberdream.nvim/issues/22)
+
+
+### Bug Fixes
+
+* typo in default config properties ([8008e70](https://github.com/scottmckendry/cyberdream.nvim/commit/8008e70302ecf70b32c7d3658dc6a346351ed93d))
+
+## [1.1.0](https://github.com/scottmckendry/cyberdream.nvim/compare/v1.0.1...v1.1.0) (2024-04-27)
+
+
+### Features
+
+* add fish theme ([#18](https://github.com/scottmckendry/cyberdream.nvim/issues/18)) ([19693ee](https://github.com/scottmckendry/cyberdream.nvim/commit/19693ee5a577addb4dd2f7c43474e84f283ccc3b))
+
+
+### Bug Fixes
+
+* change wezterm cursor_fg ([#19](https://github.com/scottmckendry/cyberdream.nvim/issues/19)) ([75966c7](https://github.com/scottmckendry/cyberdream.nvim/commit/75966c7ee08b6ebb6ca97fd7ee8d8f8b27103481))
+* use non-conflicting hl for quickfix list ([d400d3f](https://github.com/scottmckendry/cyberdream.nvim/commit/d400d3fede6ad68df0c4c58d009da7420dcb43cb)), closes [#17](https://github.com/scottmckendry/cyberdream.nvim/issues/17)
+
+## [1.0.1](https://github.com/scottmckendry/cyberdream.nvim/compare/v1.0.0...v1.0.1) (2024-04-27)
+
+
+### Bug Fixes
+
+* set TS [@variable](https://github.com/variable) to built-in color ([eaabbae](https://github.com/scottmckendry/cyberdream.nvim/commit/eaabbaea162e90c671cff64bdbca2d2e2a211a30))
+* use visible color for colorcolumn highlight ([341178e](https://github.com/scottmckendry/cyberdream.nvim/commit/341178ea1d9da135e2aace85ff186d4ba1eea85e)), closes [#16](https://github.com/scottmckendry/cyberdream.nvim/issues/16)
+
 ## 1.0.0 (2024-04-26)
 
 

extras/alacritty_cyberdream.toml → extras/alacritty/cyberdream.toml

@@ -1,4 +1,4 @@
-# cyberdream theme for Alacritty
+# cyberdream theme for alacritty
 [[colors.indexed_colors]]
 color = "0xffbd5e"
 index = 16

extras/fish/README.md

@@ -0,0 +1,11 @@
+## Usage
+
+### Install
+
+1. Place the `cyberdream.theme` under `~/.config/fish/themes/`
+
+2. Run command to set the theme:
+
+```bash
+fish_config theme save cyberdream
+```

extras/fish/cyberdream.theme

@@ -0,0 +1,30 @@
+# name: 'cyberdream'
+# url: 'https://github.com/scottmckendry/cyberdream.nvim'
+# preferred_background: 16181a
+
+fish_color_normal ffffff
+fish_color_command 5ef1ff
+fish_color_param ffaecf
+fish_color_keyword 5eff6c
+fish_color_quote f1ff5e
+fish_color_redirection 5ea1ff
+fish_color_end bd5eff
+fish_color_comment 7b8496
+fish_color_error ff6e5e
+fish_color_gray 7b8496
+fish_color_selection --background=3c4048
+fish_color_search_match --background=3c4048
+fish_color_option f1ff5e
+fish_color_operator 5ea1ff
+fish_color_escape ffaecf
+fish_color_autosuggestion 7b8496
+fish_color_cancel ff6e5e
+fish_color_cwd ffbd5e
+fish_color_user 5ef5d2
+fish_color_host 5eff6c
+fish_color_host_remote f1ff5e
+fish_color_status ff6e5e
+fish_pager_color_progress 7b8496
+fish_pager_color_prefix 5ea1ff
+fish_pager_color_completion ffffff
+fish_pager_color_description 7b8496

extras/gitui/cyberdream.ron

@@ -0,0 +1,23 @@
+(
+    selected_tab: Rgb(94, 241, 255), // bright cyan for highlight
+    command_fg: Rgb(255, 255, 255), // white for commands foreground
+    selection_bg: Rgb(60, 64, 72), // darker grey for selection background
+    selection_fg: Rgb(255, 255, 255), // white for selected text
+    cmdbar_bg: Rgb(22, 24, 26), // very dark grey almost black for command bar background
+    cmdbar_extra_lines_bg: Rgb(22, 24, 26), // very dark grey almost black for extra lines in command bar
+    disabled_fg: Rgb(123, 132, 150), // a soft grey for disabled elements, adjusted to fit the theme
+    diff_line_add: Rgb(94, 255, 108), // vibrant green for added lines
+    diff_line_delete: Rgb(255, 110, 94), // vibrant red for deleted lines
+    diff_file_added: Rgb(241, 255, 94), // yellow for added files
+    diff_file_removed: Rgb(255, 94, 160), // light red for removed files
+    diff_file_moved: Rgb(189, 94, 255), // purple for moved files
+    diff_file_modified: Rgb(94, 161, 255), // blue for modified files
+    commit_hash: Rgb(222, 174, 255), // light purplish for commit hashes
+    commit_time: Rgb(108, 146, 202), // greyish blue for commit time
+    commit_author: Rgb(94, 161, 255), // soft blue for author
+    danger_fg: Rgb(255, 110, 94), // vibrant red for danger
+    push_gauge_bg: Rgb(94, 161, 255), // soft blue for push gauge background
+    push_gauge_fg: Rgb(62, 97, 145), // dark blue for push gauge foreground
+    tag_fg: Rgb(255, 174, 207), // light pastel pink for tags
+    branch_fg: Rgb(94, 245, 210) // soft turquoise for branches
+)

extras/helix/README.md

@@ -0,0 +1,10 @@
+## Usage
+
+### Install
+
+1. Place the `cyberdream.toml` under `$HOME/.config/helix/themes`
+2. Open `hx` and run the command `:theme cyberdream`
+3. If you want permanentely to use the theme, add this to your `$HOME/.config/helix/config.toml`:
+```toml
+theme = "cyberdream"
+```

extras/helix/cyberdream.toml

@@ -0,0 +1,87 @@
+# cyberdream theme for helix
+"ui.background" = "bg"
+"ui.text" = "fg"
+"ui.cursor" = { bg = "fg", fg = "bg" }
+"ui.linenr" = "grey"
+"ui.statusline" = { fg = "cyan" }
+"ui.selection" = "green"
+"ui.selection.primary" = "magenta"
+
+# Syntax Highlighting for Code
+"comment" = { fg = "grey", modifiers = ["italic"] }
+"comment.line" = { fg = "grey", modifiers = ["italic"] }
+"comment.block" = { fg = "grey", modifiers = ["italic"] }
+"comment.documentation" = { fg = "blue", modifiers = ["italic"] }
+"keyword" = "orange"
+"keyword.control" = "orange"
+"keyword.operator" = "pink"
+"keyword.function" = "orange"
+"type" = "cyan"
+"type.builtin" = "cyan"
+"function" = "blue"
+"function.builtin" = "pink"
+"function.method" = "blue"
+"variable" = "fg"
+"variable.builtin" = "magenta"
+"variable.parameter" = "cyan"
+"string" = "green"
+"string.special" = "pink"
+"constant" = "fg"
+"constant.builtin" = "red"
+"constant.numeric" = "yellow"
+"constant.character" = "pink"
+"constant.boolean" = "red"
+"attribute" = "magenta"
+"operator" = "purple"
+"tag" = { fg = "purple", modifiers = ["bold"] }
+"tag.special" = { fg = "orange", modifiers = ["bold"] }
+"namespace" = "purple"
+"macro" = "orange"
+"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.statusline.normal" = { fg = "fg", bg = "bg" }
+"ui.statusline.insert" = { fg = "green", bg = "bg" }
+"ui.statusline.select" = { fg = "blue", bg = "bg" }
+"ui.statusline.command" = { fg = "red", bg = "bg" }
+"ui.statusline.visual" = { fg = "purple", bg = "bg" }
+
+# Diagnostic styles
+"warning" = { fg = "yellow", modifiers = ["bold"] }
+"error" = { fg = "red", modifiers = ["bold"] }
+"info" = { fg = "cyan", modifiers = ["bold"] }
+"hint" = { fg = "blue", modifiers = ["bold"] }
+"diagnostic.error" = { fg = "red" }
+"diagnostic.warning" = { fg = "yellow" }
+"diagnostic.info" = { fg = "cyan" }
+"diagnostic.hint" = { fg = "blue" }
+
+# Popups and Menus
+"ui.popup" = { fg = "fg", bg = "bg" }
+"ui.popup.info" = { fg = "cyan", bg = "bgAlt" }
+"ui.menu" = { fg = "fg", bg = "bg" }
+"ui.menu.selected" = { fg = "bg", bg = "fg" }
+
+# Additional overrides
+"ui.virtual.whitespace" = "grey"
+"ui.virtual.indent-guide" = { fg = "grey", style = "dotted" }
+
+[palette]
+bg = "#16181a"
+fg = "#ffffff"
+grey = "#7b8496"
+blue = "#5ea1ff"
+green = "#5eff6c"
+cyan = "#5ef1ff"
+red = "#ff6e5e"
+yellow = "#f1ff5e"
+magenta = "#ff5ef1"
+pink = "#ff5ea0"
+orange = "#ffbd5e"
+purple = "#bd5eff"
+bgAlt = "#1e2124"
+bgHighlight = "#3c4048"

extras/lazygit.yml → extras/lazygit/cyberdream.yml

@@ -1,4 +1,5 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/jesseduffield/lazygit/master/schema/config.json
+# cyberdream theme for lazygit
 gui:
     border: rounded
     theme:

extras/cyberdream.json → extras/tilix/cyberdream.json

@@ -1,9 +1,9 @@
 {
     "name": "cyberdream",
     "comment": "A high-contrast, futuristic & vibrant colourscheme",
-    "background-color": "#16181A ",
+    "background-color": "#16181a",
     "foreground-color": "#ffffff",
-    "badge-color": "#16181A ",
+    "badge-color": "#16181a",
     "bold-color": "#5ef1ff",
     "cursor-color": "#ffffff",
     "highlight-background-color": "#3c4048",
@@ -18,7 +18,7 @@
         "#5ef1ff",
         "#ffffff",
         "#3c4048",
-        "#ff6e5e",
+        #ff6e5e",
         "#5eff6c",
         "#f1ff5e",
         "#5ea1ff",

extras/wezterm.lua → extras/wezterm/cyberdream.lua

@@ -1,9 +1,10 @@
+-- cyberdream theme for wezterm
 return {
     foreground = "#ffffff",
     background = "#16181a",
 
     cursor_bg = "#ffffff",
-    cursor_fg = "#ffffff",
+    cursor_fg = "#16181a",
     cursor_border = "#ffffff",
 
     selection_fg = "#ffffff",

extras/windows_terminal.json → extras/windowsterminal/cyberdream.json

@@ -1,5 +1,5 @@
 {
-    "background": "#16181A ",
+    "background": "#16181a",
     "black": "#16181a",
     "blue": "#5ea1ff",
     "brightBlack": "#3c4048",

lua/cyberdream/config.lua

@@ -6,7 +6,7 @@ local default_options = {
     italic_comments = false,
     hide_fillchars = false,
     borderless_telescope = true,
-    terminal_colos = true,
+    terminal_colors = true,
 
     theme = {
         variant = "default",

lua/cyberdream/extra/alacritty.lua

@@ -0,0 +1,68 @@
+local colors = require("cyberdream.colors")
+local util = require("cyberdream.util")
+
+local M = {}
+
+--- Format a color for use in allacritty.
+--- @param hex string: The hex color to format. Must be in the format "#RRGGBB".
+local function format_color(hex)
+    return "0x" .. string.sub(hex, 2)
+end
+
+--- Iterate over the colors in a table and format them.
+--- @param t table: The table of colors to format.
+local function format_colors(t)
+    local formatted = {}
+    for k, v in pairs(t) do
+        formatted[k] = format_color(v)
+    end
+    return formatted
+end
+
+--- Generate the theme for alacritty.
+--- @param variant string: Variation of the colorscheme to use.
+function M.generate(variant)
+    local t = format_colors(colors[variant])
+    local template = [==[
+# cyberdream theme for alacritty
+[[colors.indexed_colors]]
+color = "${orange}"
+index = 16
+
+[[colors.indexed_colors]]
+color = "${red}"
+index = 17
+
+[colors.bright]
+black = "${bgHighlight}"
+blue = "${blue}"
+cyan = "${cyan}"
+green = "${green}"
+magenta = "${purple}"
+red = "${red}"
+white = "${fg}"
+yellow = "${yellow}"
+
+[colors.normal]
+black = "${bg}"
+blue = "${blue}"
+cyan = "${cyan}"
+green = "${green}"
+magenta = "${purple}"
+red = "${red}"
+white = "${fg}"
+yellow = "${yellow}"
+
+[colors.primary]
+background = "${bg}"
+foreground = "${fg}"
+
+[colors.selection]
+background = "${bgHighlight}"
+foreground = "${fg}"
+]==]
+
+    return util.parse_extra_template(template, t)
+end
+
+return M