summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-23 11:12:56 -0300
committerGabriel Schneider <[email protected]>2026-10-23 17:10:58 -0300
commita53a1aafb9804e943bdcd720c2bb688ecb90a888 (patch)
tree197ee0ac4106037d49c5c9fc7a2b6be4186173bf
parenta0d367b6c54ff29737662fd7cf5a78d4d183cb20 (diff)
downloadpardes-a53a1aafb9804e943bdcd720c2bb688ecb90a888.tar.gz
pardes-a53a1aafb9804e943bdcd720c2bb688ecb90a888.zip
Audit (colours, drawing): one Surface.tint, shared colour maths, the helix copies of hand-ported themes removed
The 22 <name>_helix themes that duplicate a hand-written port are gone; monokai, ayu_dark and nord stay, since others inherit from them. Co-Authored-By: Claude Opus 5.5 <[email protected]>
-rw-r--r--docs/typ/themes.typ5
-rw-r--r--src/File.zig23
-rw-r--r--src/Messages.zig10
-rw-r--r--src/Presentation.zig72
-rw-r--r--src/animation.zig16
-rw-r--r--src/body_layer.zig64
-rw-r--r--src/colors.zig123
-rw-r--r--src/draw.zig25
-rw-r--r--src/gui/gui.zig38
-rw-r--r--src/surface.zig193
-rw-r--r--test/snapshots/themesel.golden28
-rw-r--r--tools/gen_themes.zig14
-rw-r--r--vendor/themes/ayu_dark_helix.toml (renamed from vendor/themes/ayu_dark.toml)0
-rw-r--r--vendor/themes/ayu_evolve.toml2
-rw-r--r--vendor/themes/ayu_light.toml94
-rw-r--r--vendor/themes/ayu_mirage.toml92
-rw-r--r--vendor/themes/catppuccin_frappe.toml35
-rw-r--r--vendor/themes/catppuccin_latte.toml35
-rw-r--r--vendor/themes/catppuccin_macchiato.toml35
-rw-r--r--vendor/themes/catppuccin_mocha.toml168
-rw-r--r--vendor/themes/dark_plus.toml138
-rw-r--r--vendor/themes/doom-one.LICENSE23
-rw-r--r--vendor/themes/doom-one.toml127
-rw-r--r--vendor/themes/dracula.toml159
-rw-r--r--vendor/themes/molokai.toml2
-rw-r--r--vendor/themes/monokai_aqua.toml2
-rw-r--r--vendor/themes/monokai_helix.toml (renamed from vendor/themes/monokai.toml)0
-rw-r--r--vendor/themes/monokai_pro.toml134
-rw-r--r--vendor/themes/monokai_pro_machine.toml131
-rw-r--r--vendor/themes/monokai_pro_octagon.toml134
-rw-r--r--vendor/themes/monokai_pro_ristretto.toml131
-rw-r--r--vendor/themes/monokai_pro_spectrum.toml131
-rw-r--r--vendor/themes/nord-night.toml2
-rw-r--r--vendor/themes/nord_helix.toml (renamed from vendor/themes/nord.toml)0
-rw-r--r--vendor/themes/rose_pine.toml197
-rw-r--r--vendor/themes/rose_pine_dawn.toml30
-rw-r--r--vendor/themes/rose_pine_moon.toml30
-rw-r--r--vendor/themes/solarized_dark.toml135
-rw-r--r--vendor/themes/solarized_light.toml155
-rw-r--r--vendor/themes/tokyonight_day.toml41
-rw-r--r--vendor/themes/tokyonight_moon.toml41
-rw-r--r--vendor/themes/tokyonight_storm.toml12
42 files changed, 202 insertions, 2625 deletions
diff --git a/docs/typ/themes.typ b/docs/typ/themes.typ
index da4354e2..edfaa7ad 100644
--- a/docs/typ/themes.typ
+++ b/docs/typ/themes.typ
@@ -67,8 +67,9 @@ tab. Where a chrome colour misses one of pardes's floors (rules 1.5:1 off
the page, the focused tag 1.5:1 off the unfocused one on a dark page and
1.25:1 on a light one, tag text 4.5:1), only that colour moves, just far
enough, and the file's header says so; text, syntax and ANSI never move.
-An imported theme whose name a port now holds is kept with `_helix` added
-(`dracula_helix`).
+helix's own copy of a theme ported here is not imported, except the
+three other helix themes build on: `monokai_helix`, `ayu_dark_helix` and
+`nord_helix`.
#pairs(
[Visual Studio Code], [`dark_plus`],
diff --git a/src/File.zig b/src/File.zig
index 7e05ac9f..e92efaba 100644
--- a/src/File.zig
+++ b/src/File.zig
@@ -1929,16 +1929,6 @@ pub const DiffTints = struct {
}
};
-/// A diff row's tint: its ground from `x` to the pane's edge.
-fn tintRow(s: *Surface, x: u16, y: u16, end: u16, bg: [3]u8) void {
- var col = x;
- while (col < end) : (col += 1) {
- const cell = s.at(col, y);
- cell.default = false;
- cell.style.bg = .{ .rgb = bg };
- }
-}
-
fn synStyle(p: *Pardes, sy: syntax.Syn) ?SynStyle {
return switch (sy) {
.none => null,
@@ -2010,7 +2000,7 @@ pub fn recolorSyntax(p: *Pardes, s: *Surface, pane: *Pane, f: *State, r: pardes.
if (tint) |t| if (prefix_width < tw) {
// A +Diff line added or removed whole: faintly (hunks.zig).
const whole = highlights[base - highlight_start] & syntax.diff_whole != 0;
- if (row_tint or whole) tintRow(s, tx + @as(u16, @intCast(prefix_width)), body_y + vr, tx + tw, if (row_tint) t.bg else t.line_bg);
+ if (row_tint or whole) s.tint(tx + @as(u16, @intCast(prefix_width)), body_y + vr, tw -| @as(u16, @intCast(prefix_width)), if (row_tint) t.bg else t.line_bg, null);
};
// A +Pager's own colours (pager.zig) on every row but one the diff
// look tints: an added or removed line is drawn as pardes draws a
@@ -2228,7 +2218,7 @@ pub fn recolorDiffOutput(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, t
const view = maybe orelse continue;
const base = @intFromPtr(rows[view.row].ptr) - flat_start - lo;
const tint = if (base < styles.len) tints.forStyle(styles[base]) else null;
- if (tint) |t| tintRow(s, tx, body_y + @as(u16, @intCast(vr)), tx + tw, t.bg);
+ if (tint) |t| s.tint(tx, body_y + @as(u16, @intCast(vr)), tw, t.bg, null);
var c: usize = 0;
var screen_c: usize = 0;
while (c < line.len and screen_c < tw) {
@@ -2310,12 +2300,9 @@ pub fn paintWordSelection(
if (hi <= lo) continue;
const c0 = @as(i32, prefix_width) + here.pad + displayOffset(pane, row, here.at, lo);
const c1 = @as(i32, prefix_width) + here.pad + displayEndOffset(pane, row, here.at, hi - 1);
- var col = @max(@as(i32, prefix_width), c0);
- while (col <= c1 and col < @as(i32, tw)) : (col += 1) {
- const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr)));
- cell.default = false;
- cell.style.bg = .{ .rgb = bg };
- }
+ const col = @max(@as(i32, prefix_width), c0);
+ const end = @min(c1 + 1, @as(i32, tw));
+ if (col < end) s.tint(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr)), @intCast(end - col), bg, null);
}
}
diff --git a/src/Messages.zig b/src/Messages.zig
index 6d064c93..6785bd8a 100644
--- a/src/Messages.zig
+++ b/src/Messages.zig
@@ -398,16 +398,6 @@ pub fn noticeLife(pane: *const Pane, i: usize) ?Pane.MessageLife {
};
}
-pub fn blendRgb(from: [3]u8, to: [3]u8, amount: f32) [3]u8 {
- var out: [3]u8 = undefined;
- for (&out, from, to) |*o, a, b| {
- const af: f32 = @floatFromInt(a);
- const bf: f32 = @floatFromInt(b);
- o.* = @intFromFloat(@round(bf + (af - bf) * std.math.clamp(amount, 0, 1)));
- }
- return out;
-}
-
fn logMessage(p: *Pardes, id: usize, text: []const u8) void {
if (text.len == 0) return;
const serial: u32 = if (p.fs.session_write) 0 else if (id < MAX_PANES) if (p.panes[id]) |pane| pane.serial else 0 else 0;
diff --git a/src/Presentation.zig b/src/Presentation.zig
index 2a75b66d..3fc9be44 100644
--- a/src/Presentation.zig
+++ b/src/Presentation.zig
@@ -347,52 +347,36 @@ pub fn acknowledge(self: *Presentation, p: *Pardes, tracks: []const Track) void
pub fn capturePrevious(self: *Presentation, gpa: std.mem.Allocator, surface: *const pardes.Surface) void {
self.diff_state = .none;
const cells = surface.cells;
- if (cells.len == 0) {
- self.previous_valid = false;
- self.previous_layout = @splat(null);
- return;
- }
- if (self.previous_cells.len != cells.len) {
- const next = gpa.alloc(pardes.Cell, cells.len) catch {
- self.previous_valid = false;
- self.previous_layout = @splat(null);
- return;
- };
- if (self.previous_cells.len > 0) gpa.free(self.previous_cells);
- self.previous_cells = next;
- }
- for (&self.previous_body_layers, surface.bodyLayers()) |*old, *current| {
- const count = if (current.rows > 0) current.cells.len else 0;
- const storage = if (old.cells.len == count) old.cells else gpa.realloc(old.cells, count) catch {
- self.previous_valid = false;
- self.previous_layout = @splat(null);
- return;
- };
- if (count > 0) @memcpy(storage, current.cells);
- old.* = current.*;
- old.cells = storage;
- }
- for (&self.previous_tag_layers, surface.tagLayers()) |*old, *current| {
- const count = if (current.rows > 0) current.cells.len else 0;
- const storage = if (old.cells.len == count) old.cells else gpa.realloc(old.cells, count) catch {
- self.previous_valid = false;
- self.previous_layout = @splat(null);
- return;
+ copy: {
+ if (cells.len == 0) break :copy;
+ if (self.previous_cells.len != cells.len) {
+ const next = gpa.alloc(pardes.Cell, cells.len) catch break :copy;
+ if (self.previous_cells.len > 0) gpa.free(self.previous_cells);
+ self.previous_cells = next;
+ }
+ const olds = [_][]pardes.Layer{ &self.previous_body_layers, &self.previous_tag_layers };
+ const currents = [_][]const pardes.Layer{ surface.bodyLayers(), surface.tagLayers() };
+ for (olds, currents) |old_layers, current_layers| for (old_layers, current_layers) |*old, *current| {
+ const count = if (current.rows > 0) current.cells.len else 0;
+ const storage = if (old.cells.len == count) old.cells else gpa.realloc(old.cells, count) catch break :copy;
+ if (count > 0) @memcpy(storage, current.cells);
+ old.* = current.*;
+ old.cells = storage;
};
- if (count > 0) @memcpy(storage, current.cells);
- old.* = current.*;
- old.cells = storage;
+ @memcpy(self.previous_cells, cells);
+ @memcpy(self.previous_regions[0..surface.nregions], surface.regionList());
+ self.previous_nregions = surface.nregions;
+ self.previous_cols = surface.cols;
+ self.previous_rows = surface.rows;
+ self.previous_valid = true;
+ self.previous_layout = if (self.submitted_ready)
+ self.submitted
+ else
+ @splat(null);
+ return;
}
- @memcpy(self.previous_cells, cells);
- @memcpy(self.previous_regions[0..surface.nregions], surface.regionList());
- self.previous_nregions = surface.nregions;
- self.previous_cols = surface.cols;
- self.previous_rows = surface.rows;
- self.previous_valid = true;
- self.previous_layout = if (self.submitted_ready)
- self.submitted
- else
- @splat(null);
+ self.previous_valid = false;
+ self.previous_layout = @splat(null);
}
pub fn cellDiff(self: *const Presentation, cols: u16, rows: u16, col: u16, row: u16) pardes.PanelCellDiff {
diff --git a/src/animation.zig b/src/animation.zig
index 547b9201..a4887148 100644
--- a/src/animation.zig
+++ b/src/animation.zig
@@ -1226,22 +1226,14 @@ pub fn Immediate(comptime Value: type) type {
};
}
-pub fn interpolateRgb(from: [3]u8, to: [3]u8, step: u16, steps: u16) [3]u8 {
- if (step == 0) return from;
- if (step >= steps) return to;
- var out: [3]u8 = undefined;
- for (&out, from, to) |*dst, a, b| {
- const numerator = @as(u32, a) * (steps - step) + @as(u32, b) * step;
- dst.* = @intCast((numerator + steps / 2) / steps);
- }
- return out;
-}
-
+/// A Fade's value for its tests: a colour stepped channel by channel.
const TestColor = struct {
rgb: [3]u8,
pub fn interpolate(from: TestColor, to: TestColor, step: u16, steps: u16) TestColor {
- return .{ .rgb = interpolateRgb(from.rgb, to.rgb, step, steps) };
+ var out = from;
+ for (&out.rgb, to.rgb) |*c, b| c.* = @intCast((@as(u32, c.*) * (steps - step) + @as(u32, b) * step + steps / 2) / steps);
+ return out;
}
};
diff --git a/src/body_layer.zig b/src/body_layer.zig
index 2aa8e5f8..0ddda41d 100644
--- a/src/body_layer.zig
+++ b/src/body_layer.zig
@@ -6,7 +6,6 @@ const pardes = @import("pardes.zig");
const normal = @import("normal.zig");
const edit = @import("edit.zig");
const config = @import("config.zig");
-const limits = @import("memory.zig").limits;
const layout = @import("layout.zig");
const modal = @import("modal.zig");
const tracy = @import("tracy.zig");
@@ -23,19 +22,7 @@ const TAG_TEXT_INSET = pardes.TAG_TEXT_INSET;
const Rect = layout.Rect;
const Pardes = pardes.Pardes;
const tagline = @import("tagline.zig");
-const Messages = @import("Messages.zig");
const Text = panes.Text;
-const MAX_PANES = pardes.MAX_PANES;
-const TagKind = @import("Layer.zig").Kind;
-const MAX_TAG_ROWS = pardes.MAX_TAG_ROWS;
-const NOTICE_LAYER_BASE = pardes.NOTICE_LAYER_BASE;
-const TAG_LINE_LAYER_BASE = pardes.TAG_LINE_LAYER_BASE;
-const HEADER_LINE_LAYER_BASE = pardes.HEADER_LINE_LAYER_BASE;
-const MAX_COLS = pardes.MAX_COLS;
-const TOPBAR_H = pardes.TOPBAR_H;
-const COLBAR_H = pardes.COLBAR_H;
-const TAG_GAP = pardes.TAG_GAP;
-const wordBoundsAtCol = pardes.wordBoundsAtCol;
const Layer = @import("Layer.zig");
@@ -71,14 +58,9 @@ fn paintTerminalSelection(p: *Pardes, s: *Surface, pane: *Pane, r: Rect, rows: [
lo = modal.graphemeStart(line, @min(lo, line.len));
hi = @min(hi, line.len);
if (lo >= hi) continue;
- var col = panes.File.rawDisplayCol(line, lo);
- const end = if (row.to_edge and hi == line.len) width else panes.File.rawDisplayCol(line, hi);
- while (col < end and col < width) : (col += 1) {
- const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible)));
- cell.default = false;
- cell.style.bg = .{ .rgb = bg };
- if (fg) |ink| cell.style.fg = .{ .rgb = ink };
- }
+ const col = panes.File.rawDisplayCol(line, lo);
+ const end = @min(width, if (row.to_edge and hi == line.len) width else panes.File.rawDisplayCol(line, hi));
+ if (col < end) s.tint(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible)), @intCast(end - col), bg, fg);
}
}
}
@@ -113,14 +95,9 @@ fn paintSourceSelection(p: *Pardes, s: *Surface, pane: *Pane, r: Rect, rows: []c
const lo = @max(start, row.lo);
const hi = @min(end, row.hi);
if (lo >= hi) continue;
- var col = prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], lo - start)));
- const last = if (row.to_edge and hi == end) @as(i32, width) else prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], hi - start)));
- while (col < last and col < width) : (col += 1) {
- const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible)));
- cell.default = false;
- cell.style.bg = .{ .rgb = bg };
- if (fg) |ink| cell.style.fg = .{ .rgb = ink };
- }
+ const col = prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], lo - start)));
+ const last = @min(width, if (row.to_edge and hi == end) @as(i32, width) else prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], hi - start))));
+ if (col < last) s.tint(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible)), @intCast(last - col), bg, fg);
}
}
}
@@ -151,15 +128,11 @@ pub fn paintPointerSelection(
// File line numbers occupy a gutter only in the body. The tag is
// row zero in Sel space and starts at its real first text cell.
const scroll: i32 = if (row < pane.tag_rows) pane.tag_scroll else 0;
- var col: i32 = if (pane.file != null and row >= pane.tag_rows) @max(c0, @as(i32, panes.File.gutterWidth(pane))) else @max(0, c0 - scroll);
+ const col: i32 = if (pane.file != null and row >= pane.tag_rows) @max(c0, @as(i32, panes.File.gutterWidth(pane))) else @max(0, c0 - scroll);
const row_x = if (row < pane.tag_rows) r.x + @min(TAG_TEXT_INSET, r.w) else tx;
const row_width = if (row < pane.tag_rows) r.w -| TAG_TEXT_INSET else tw;
- while (col <= c1 - scroll and col < row_width) : (col += 1) {
- const cell = s.at(row_x + @as(u16, @intCast(col)), sy);
- cell.default = false;
- cell.style.bg = .{ .rgb = bg };
- if (fg) |ink| cell.style.fg = .{ .rgb = ink };
- }
+ const end = @min(c1 - scroll + 1, row_width);
+ if (col < end) s.tint(row_x + @as(u16, @intCast(col)), sy, @intCast(end - col), bg, fg);
}
}
@@ -345,13 +318,8 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane
while (row < body_bottom) : (row += 1) {
const ar = pane.wrapAt(@as(i32, row) - @as(i32, pane.tag_rows)).line;
if (ar < lo or ar > hi) continue;
- var col: u16 = if (pane.file != null) panes.File.gutterWidth(pane) else 0;
- while (col < tw) : (col += 1) {
- const cell = s.at(tx + col, body_y + row - pane.tag_rows);
- cell.default = false;
- cell.style.bg = .{ .rgb = modal_bg };
- if (!hover_only) cell.style.fg = .{ .rgb = th.sel_fg };
- }
+ const col: u16 = if (pane.file != null) panes.File.gutterWidth(pane) else 0;
+ if (col < tw) s.tint(tx + col, body_y + row - pane.tag_rows, tw - col, modal_bg, if (hover_only) null else th.sel_fg);
}
}
const preview = normal.selRegexArmed(pane) != null;
@@ -409,13 +377,9 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane
panes.File.lineDisplayEndOffset(visible_line, @intCast(@max(0, w.at)), @intCast(@max(0, bnd.hi_col)))) + vpfx + w.pad
else
@as(i32, tw) - 1;
- var col: i32 = @max(cstart, vpfx);
- while (col <= cend and col < tw) : (col += 1) {
- const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr)));
- cell.default = false;
- cell.style.bg = .{ .rgb = bg };
- if (!hover_only) cell.style.fg = .{ .rgb = th.sel_fg };
- }
+ const col: i32 = @max(cstart, vpfx);
+ const end = @min(cend + 1, tw);
+ if (col < end) s.tint(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr)), @intCast(end - col), bg, if (hover_only) null else th.sel_fg);
}
if (primary and !preview and !hover_only) continue; // the hardware cursor IS the primary's
if (hover_only) continue; // quiet preview preserves the source ink
diff --git a/src/colors.zig b/src/colors.zig
index 28136975..c016434b 100644
--- a/src/colors.zig
+++ b/src/colors.zig
@@ -4,12 +4,10 @@ const pardes = @import("pardes.zig");
const tagline = @import("tagline.zig");
const panes = @import("panes.zig");
const std = @import("std");
-const layout = @import("layout.zig");
const animation = @import("animation.zig");
const Color = @import("surface.zig").Color;
const FontRole = @import("surface.zig").FontRole;
const config = @import("config.zig");
-const limits = @import("memory.zig").limits;
const pdf_enabled = panes.Pdf.enabled;
const platform = pardes.platform;
const theme_animation = @import("pardes_config").theme_animation;
@@ -34,7 +32,7 @@ pub fn contrast(a: [3]u8, b: [3]u8) f32 {
return (@max(x, y) + 0.05) / (@min(x, y) + 0.05);
}
-fn lerp(a: [3]u8, b: [3]u8, t: f32) [3]u8 {
+pub fn lerp(a: [3]u8, b: [3]u8, t: f32) [3]u8 {
var out: [3]u8 = undefined;
for (&out, a, b) |*o, x, y| o.* = @intFromFloat(std.math.clamp(@round(@as(f32, @floatFromInt(x)) + (@as(f32, @floatFromInt(y)) - @as(f32, @floatFromInt(x))) * t), 0, 255));
return out;
@@ -498,22 +496,7 @@ fn fold(comptime C: type) [@typeInfo(C).@"struct".decl_names.len]Theme {
}
}
-/// The imported themes (tools/gen_themes.zig), less any name one of ours
-/// takes: a faithful port (`dracula`) keeps the plain name, and helix's
-/// looser copy of it is still there as `dracula_helix` (the zed ones already
-/// carry `_zed`).
-fn foldImports(comptime ours: anytype, comptime C: type) [@typeInfo(C).@"struct".decl_names.len]Theme {
- comptime {
- @setEvalBranchQuota(400000);
- var out = fold(C);
- for (&out) |*g| for (ours) |c| if (std.mem.eql(u8, c.name, g.name)) {
- g.name = g.name ++ "_helix";
- };
- return out;
- }
-}
-
-pub const themes = fold(curated) ++ foldImports(fold(curated), @import("generated_themes"));
+pub const themes = fold(curated) ++ fold(@import("generated_themes"));
/// The first `native_count` of `themes` are pardes's own; the rest imported.
pub const native_count = @typeInfo(curated).@"struct".decl_names.len;
@@ -589,18 +572,6 @@ test "lapis_plain is lapis on flat grounds, framed and shadowed as lapis" {
/// Original and classic-inspired Pardes palettes precede retained imports.
pub const native_theme_count = 15;
-fn themeContrast(a: [3]u8, b: [3]u8) f64 {
- var luminance: [2]f64 = .{ 0, 0 };
- for ([2][3]u8{ a, b }, 0..) |rgb, i| {
- for (rgb, [3]f64{ 0.2126, 0.7152, 0.0722 }) |channel, weight| {
- const srgb = @as(f64, @floatFromInt(channel)) / 255;
- const linear = if (srgb <= 0.04045) srgb / 12.92 else std.math.pow(f64, (srgb + 0.055) / 1.055, 2.4);
- luminance[i] += weight * linear;
- }
- }
- return (@max(luminance[0], luminance[1]) + 0.05) / (@min(luminance[0], luminance[1]) + 0.05);
-}
-
comptime {
if (themes.len > std.math.maxInt(u16) + 1)
@compileError("runtime config theme index no longer fits u16");
@@ -714,21 +685,11 @@ pub fn requestThemeFile(p: *Pardes, id: usize, argument: []const u8) void {
var joined: [4095]u8 = undefined;
const resolved = if (absolute) input else path: {
const dir = p.opts.config_dir.?;
- const separator = std.Io.Dir.path.sep;
- const needs_separator = dir.len > 0 and dir[dir.len - 1] != separator;
- const len = dir.len + @intFromBool(needs_separator) + input.len;
- if (len > joined.len) {
+ const separator = if (dir.len > 0 and dir[dir.len - 1] != std.Io.Dir.path.sep) std.Io.Dir.path.sep_str else "";
+ break :path std.fmt.bufPrint(&joined, "{s}{s}{s}", .{ dir, separator, input }) catch {
p.reportError(id, "theme file", error.PathTooLong);
return;
- }
- @memcpy(joined[0..dir.len], dir);
- var at = dir.len;
- if (needs_separator) {
- joined[at] = separator;
- at += 1;
- }
- @memcpy(joined[at..][0..input.len], input);
- break :path joined[0..len];
+ };
};
if (!p.theme_file_path.set(resolved)) {
p.reportError(id, "theme file", error.PathTooLong);
@@ -787,9 +748,7 @@ fn themeFileFailure(p: *Pardes, request: ThemeFileRequest, why: []const u8) void
fn revertThemeFile(p: *Pardes) void {
const loaded = p.theme_file_loaded.get();
if (std.mem.eql(u8, loaded, p.theme_file_path.get())) return;
- var keep: [limits.host_path_cap]u8 = undefined;
- @memcpy(keep[0..loaded.len], loaded);
- if (loaded.len == 0) p.theme_file_path.clear() else _ = p.theme_file_path.set(keep[0..loaded.len]);
+ if (loaded.len == 0) p.theme_file_path.clear() else _ = p.theme_file_path.set(loaded);
const generation = nextThemeFileGeneration(p);
p.emit(.{ .theme_file = .{ .generation = generation, .on = loaded.len > 0 } });
}
@@ -836,9 +795,7 @@ pub fn loadThemeFile(p: *Pardes, generation: u32, bytes: []const u8, animate: bo
const old = p.custom_theme;
p.custom_theme = parsed;
if (old) |theme_value| p.gpa.free(theme_value.name);
- var settled: [limits.host_path_cap]u8 = undefined;
- @memcpy(settled[0..request.path.len], request.path);
- _ = p.theme_file_loaded.set(settled[0..request.path.len]);
+ _ = p.theme_file_loaded.set(request.path);
invalidateThemeDependentRasters(p);
_ = p.scratch.reset(.{ .retain_with_limit = pardes.memory.limits.scratch_kept });
p.sync();
@@ -1115,58 +1072,38 @@ test "native themes keep text and UI roles readable on their own surfaces" {
for (themes[0..names.len], names) |th, name| {
try std.testing.expectEqualStrings(name, th.name);
const chrome = ChromeTheme.fromTheme(&th);
- const minimum: f64 = if (std.mem.eql(u8, name, "ink") or std.mem.eql(u8, name, "daybreak")) 7 else 4.5;
+ const minimum: f32 = if (std.mem.eql(u8, name, "ink") or std.mem.eql(u8, name, "daybreak")) 7 else 4.5;
const text_colors = [_][3]u8{
th.fg.?, th.kw, th.str, th.num, th.comment,
chrome.diagnostic_error, chrome.diagnostic_warning, chrome.diagnostic_info, chrome.diagnostic_hint,
};
- for (text_colors) |fg| try std.testing.expect(themeContrast(fg, th.bg.?) >= minimum);
+ for (text_colors) |fg| try std.testing.expect(contrast(fg, th.bg.?) >= minimum);
// Gutters are orientation aids, not source text: stay visible without
// competing with comments or pulling attention away from the body.
- try std.testing.expect(themeContrast(th.lineno, th.bg.?) >= 2.5);
- try std.testing.expect(themeContrast(th.lineno, th.bg.?) <= 4);
- try std.testing.expect(themeContrast(th.lineno_active.?, th.bg.?) >= themeContrast(th.lineno, th.bg.?));
- try std.testing.expect(themeContrast(th.lineno_active.?, th.bg.?) <= 4.5);
- try std.testing.expect(themeContrast(th.comment, th.bg.?) >= 5);
- try std.testing.expect(themeContrast(th.comment, th.bg.?) >= themeContrast(th.lineno, th.bg.?) + 2);
- try std.testing.expect(themeContrast(th.tag_fg, th.tag_bg) >= minimum);
- try std.testing.expect(themeContrast(chrome.tag_active_fg, chrome.tag_active_bg) >= minimum);
+ try std.testing.expect(contrast(th.lineno, th.bg.?) >= 2.5);
+ try std.testing.expect(contrast(th.lineno, th.bg.?) <= 4);
+ try std.testing.expect(contrast(th.lineno_active.?, th.bg.?) >= contrast(th.lineno, th.bg.?));
+ try std.testing.expect(contrast(th.lineno_active.?, th.bg.?) <= 4.5);
+ try std.testing.expect(contrast(th.comment, th.bg.?) >= 5);
+ try std.testing.expect(contrast(th.comment, th.bg.?) >= contrast(th.lineno, th.bg.?) + 2);
+ try std.testing.expect(contrast(th.tag_fg, th.tag_bg) >= minimum);
+ try std.testing.expect(contrast(chrome.tag_active_fg, chrome.tag_active_bg) >= minimum);
try std.testing.expect(th.tag_name_fg != null);
- try std.testing.expect(themeContrast(chrome.tag_name_fg, th.tag_bg) >= minimum);
- try std.testing.expect(themeContrast(chrome.tag_active_name_fg, chrome.tag_active_bg) >= minimum);
+ try std.testing.expect(contrast(chrome.tag_name_fg, th.tag_bg) >= minimum);
+ try std.testing.expect(contrast(chrome.tag_active_name_fg, chrome.tag_active_bg) >= minimum);
// Focus stays on the same tonal surface, rather than inverting a
// whole command strip. Text remains readable in both states.
- try std.testing.expect(themeContrast(chrome.tag_active_bg, th.tag_bg) <= 1.6);
- try std.testing.expect(themeContrast(chrome.tag_active_fg, th.tag_fg) <= 1.6);
- try std.testing.expect(themeContrast(th.sel_fg, th.sel_bg) >= minimum);
- try std.testing.expect(themeContrast(chrome.search_fg, chrome.search_bg) >= minimum);
+ try std.testing.expect(contrast(chrome.tag_active_bg, th.tag_bg) <= 1.6);
+ try std.testing.expect(contrast(chrome.tag_active_fg, th.tag_fg) <= 1.6);
+ try std.testing.expect(contrast(th.sel_fg, th.sel_bg) >= minimum);
+ try std.testing.expect(contrast(chrome.search_fg, chrome.search_bg) >= minimum);
// ANSI black can intentionally match the page (for backgrounds). All
// other ANSI foregrounds, including bright black, remain legible.
- for (th.palette.?[1..]) |fg| try std.testing.expect(themeContrast(fg, th.bg.?) >= minimum);
+ for (th.palette.?[1..]) |fg| try std.testing.expect(contrast(fg, th.bg.?) >= minimum);
}
}
test "native filename tints change hue without changing perceived lightness" {
- const Perceptual = struct {
- fn lab(rgb: [3]u8) [3]f64 {
- var linear: [3]f64 = undefined;
- for (rgb, 0..) |channel, i| {
- const value = @as(f64, @floatFromInt(channel)) / 255;
- linear[i] = if (value <= 0.04045) value / 12.92 else std.math.pow(f64, (value + 0.055) / 1.055, 2.4);
- }
- const r = linear[0];
- const g = linear[1];
- const b = linear[2];
- const l = std.math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b);
- const m = std.math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b);
- const n = std.math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b);
- return .{
- 0.2104542553 * l + 0.7936177850 * m - 0.0040720468 * n,
- 1.9779984951 * l - 2.4285922050 * m + 0.4505937099 * n,
- 0.0259040371 * l + 0.7827717662 * m - 0.8086757660 * n,
- };
- }
- };
for (themes[0..native_theme_count]) |th| {
try std.testing.expect(th.tag_name_fg != null and th.tag_active_name_fg != null);
const chrome = ChromeTheme.fromTheme(&th);
@@ -1175,8 +1112,8 @@ test "native filename tints change hue without changing perceived lightness" {
.{ chrome.tag_active_fg, chrome.tag_active_name_fg },
};
for (pairs) |pair| {
- const base = Perceptual.lab(pair[0]);
- const name = Perceptual.lab(pair[1]);
+ const base = toOklab(pair[0]);
+ const name = toOklab(pair[1]);
// Half a lightness point allows 8-bit quantization without a
// basename becoming visibly brighter or darker than its tag.
try std.testing.expectApproxEqAbs(base[0], name[0], 0.005);
@@ -1193,15 +1130,15 @@ test "native filename tints change hue without changing perceived lightness" {
test "native dark palettes choose near-black or deliberately soft contrast" {
for (themes[0..native_theme_count]) |th| {
- if (themeContrast(th.bg.?, .{ 0, 0, 0 }) > 10) continue; // light paper
+ if (contrast(th.bg.?, .{ 0, 0, 0 }) > 10) continue; // light paper
const soft = std.mem.eql(u8, th.name, "dusk") or std.mem.eql(u8, th.name, "lagoon") or
std.mem.eql(u8, th.name, "solarium") or std.mem.eql(u8, th.name, "forge_soft");
if (soft) {
- try std.testing.expect(themeContrast(th.fg.?, th.bg.?) >= 4.5);
- try std.testing.expect(themeContrast(th.fg.?, th.bg.?) <= 7);
+ try std.testing.expect(contrast(th.fg.?, th.bg.?) >= 4.5);
+ try std.testing.expect(contrast(th.fg.?, th.bg.?) <= 7);
} else {
for (th.bg.?) |channel| try std.testing.expect(channel <= 0x14);
- try std.testing.expect(themeContrast(th.fg.?, th.bg.?) >= 14);
+ try std.testing.expect(contrast(th.fg.?, th.bg.?) >= 14);
}
}
const forge = curated.forge.theme;
diff --git a/src/draw.zig b/src/draw.zig
index 3d0d4d3c..93a78090 100644
--- a/src/draw.zig
+++ b/src/draw.zig
@@ -35,8 +35,6 @@ const wordBoundsAtCol = pardes.wordBoundsAtCol;
const BOX_H = pardes.BOX_H;
const TAG_GAP = pardes.TAG_GAP;
const TAG_TEXT_INSET = pardes.TAG_TEXT_INSET;
-const TOPBAR_H = pardes.TOPBAR_H;
-const COLBAR_H = pardes.COLBAR_H;
const MAX_PANES = pardes.MAX_PANES;
const MAX_COLS = pardes.MAX_COLS;
const MAX_TAG_ROWS = pardes.MAX_TAG_ROWS;
@@ -1213,12 +1211,7 @@ fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r
// Window mode (layout.windowKey): the outlined pane's tag in the
// selection's colours.
if (p.window_pick == id) {
- const th = p.theme();
- for (storage) |*cell| {
- cell.style.bg = .{ .rgb = th.sel_bg };
- cell.style.fg = .{ .rgb = th.sel_fg };
- cell.default = false;
- }
+ for (0..rows) |row| temporary.tint(0, @intCast(row), temporary.cols, p.theme().sel_bg, p.theme().sel_fg);
}
const tag_fg: Color = .{ .rgb = if (active and p.settings.focus_tint) chrome.tag_active_fg else chrome.tag_fg };
// One layer, a row to each line the tag shows.
@@ -1268,11 +1261,11 @@ fn joinNotice(p: *Pardes, s: *Surface, arena: std.mem.Allocator, region: Region)
// cannot move it by less than a row, a pixel shell slides it too.
const motion: Messages.MessageMotion = if (Messages.noticeLife(pane, i)) |life| Messages.messageMotion(p, life) else .{};
const page = th.bg orelse chrome.tag_bg;
- const bg = Messages.blendRgb(chrome.tag_bg, page, motion.alpha);
+ const bg = colors.lerp(page, chrome.tag_bg, motion.alpha);
// Where an exec was sent to a REPL reads in the tag's name tint, set
// apart from what the editor says.
const ink = if (kind == .message and pane.msg_sent) chrome.tag_name_fg else chrome.tag_fg;
- const fg = Messages.blendRgb(ink, page, motion.alpha);
+ const fg = colors.lerp(page, ink, motion.alpha);
// Nothing to say, or too narrow for a layer: a blank chip on the grid.
if (text.len == 0 or r.w <= TAG_TEXT_INSET) {
s.fill(region.rect.x, region.rect.y, chip, 1, .{ .bg = .{ .rgb = bg }, .font_role = .tagline });
@@ -1428,15 +1421,9 @@ pub fn paintPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pa
const line = lines[row - top];
const from = if (row == first.row) first.col else 0;
const to = @min(line.len, if (row == last.row) last.col else line.len);
- var col = panes.File.rawDisplayCol(line, from) -| pane.tag_scroll;
- const end = panes.File.rawDisplayCol(line, to);
- const y = tag_y + @as(u16, @intCast(row - top));
- while (col + pane.tag_scroll < end and col < tw) : (col += 1) {
- const cell = s.at(tx + @as(u16, @intCast(col)), y);
- cell.default = false;
- cell.style.bg = .{ .rgb = th.tag_sel_bg orelse th.sel_bg };
- cell.style.fg = .{ .rgb = th.sel_fg };
- }
+ const col = panes.File.rawDisplayCol(line, from) -| pane.tag_scroll;
+ const end = @min(panes.File.rawDisplayCol(line, to) -| pane.tag_scroll, tw);
+ if (col < end) s.tint(tx + @as(u16, @intCast(col)), tag_y + @as(u16, @intCast(row - top)), @intCast(end - col), th.tag_sel_bg orelse th.sel_bg, th.sel_fg);
}
}
}
diff --git a/src/gui/gui.zig b/src/gui/gui.zig
index d3734fac..2d01db33 100644
--- a/src/gui/gui.zig
+++ b/src/gui/gui.zig
@@ -8794,37 +8794,25 @@ fn clipToBodies(g: *Gui, gpa: std.mem.Allocator, first: usize, bodies: []const [
/// the decor pipeline blends a colour that is not black): the largest `a`
/// that keeps text and page apart by min(their contrast, 4.5).
fn lightenCeiling(fg: [3]u8, bg: [3]u8, rgb: [3]u8) f32 {
- const contrast = struct {
- fn of(a: [3]u8, b: [3]u8) f32 {
- const la = luminance(a);
- const lb = luminance(b);
- return (@max(la, lb) + 0.05) / (@min(la, lb) + 0.05);
- }
- fn blend(under: [3]u8, over: [3]u8, a: f32) [3]u8 {
+ const contrast = pardes.colors.contrast;
+ const blend = struct {
+ fn of(under: [3]u8, over: [3]u8, a: f32) [3]u8 {
var out: [3]u8 = undefined;
for (&out, under, over) |*o, x, y| o.* = @intFromFloat(@round(@as(f32, @floatFromInt(x)) * (1 - a) + @as(f32, @floatFromInt(y)) * a));
return out;
}
- };
- const target = @min(contrast.of(fg, bg), 4.5);
+ }.of;
+ const target = @min(contrast(fg, bg), 4.5);
var lo: f32 = 0;
var hi: f32 = 1;
for (0..24) |_| {
const mid = (lo + hi) / 2;
- if (contrast.of(contrast.blend(fg, rgb, mid), contrast.blend(bg, rgb, mid)) >= target - 1e-3) lo = mid else hi = mid;
+ if (contrast(blend(fg, rgb, mid), blend(bg, rgb, mid)) >= target - 1e-3) lo = mid else hi = mid;
}
return lo;
}
-/// sRGB's relative luminance (WCAG).
-fn luminance(rgb: [3]u8) f32 {
- var sum: f32 = 0;
- for (rgb, [3]f32{ 0.2126, 0.7152, 0.0722 }) |channel, weight| {
- const v = @as(f32, @floatFromInt(channel)) / 255;
- sum += weight * (if (v <= 0.04045) v / 12.92 else std.math.pow(f32, (v + 0.055) / 1.055, 2.4));
- }
- return sum;
-}
+const luminance = pardes.colors.relativeLuminance;
/// How dark a shadow may make the page and its text, both together, before
/// the pair drops below its own contrast or 4.5, whichever is lower (§8.2):
@@ -8853,11 +8841,7 @@ test "a rim never lightens a native theme's text below its contrast or 4.5" {
return out;
}
}.of;
- const ratio = struct {
- fn of(x: [3]u8, y: [3]u8) f32 {
- return (@max(luminance(x), luminance(y)) + 0.05) / (@min(luminance(x), luminance(y)) + 0.05);
- }
- }.of;
+ const ratio = pardes.colors.contrast;
try std.testing.expect(ratio(blend(fg, light, a), blend(bg, light, a)) >= @min(ratio(fg, bg), 4.5) - 2e-3);
}
}
@@ -9206,11 +9190,7 @@ fn paneDecor(g: *Gui, gpa: std.mem.Allocator, regions: []const pardes.Region, gr
}
/// Halfway between two colours.
-fn mixRgb(a: [3]u8, b: [3]u8) [3]u8 {
- var out: [3]u8 = undefined;
- for (&out, a, b) |*o, x, y| o.* = @intCast((@as(u16, x) + y) / 2);
- return out;
-}
+const mixRgb = pardes.colors.mix;
/// A rule's width: the theme's own, or one pixel.
fn rulePx(chrome: *const pardes.Chrome) f32 {
diff --git a/src/surface.zig b/src/surface.zig
index d6ec016d..839e8f33 100644
--- a/src/surface.zig
+++ b/src/surface.zig
@@ -221,10 +221,6 @@ pub const ImageCacheKey = if (pdf_enabled) struct {
}
};
-const PdfFitMode = panes.Pdf.FitMode;
-
-const PdfTintMode = panes.Pdf.TintMode;
-
/// Dynamic placement exists only for native PDF pages. Static image panes need
/// only their pane identity, so feature-off builds carry a zero-bit payload.
pub const NativePlacement = if (pdf_enabled) struct {
@@ -562,67 +558,73 @@ pub const Surface = struct {
continue;
}
}
- if (col >= end) break;
- // n == 0: not a start byte at all. A short tail or a bad
- // continuation decodes to null the same way — one U+FFFD, one byte.
- const n = std.unicode.utf8ByteSequenceLength(text[i]) catch 0;
- const decoded: ?u21 = if (n > 0 and i + n <= text.len)
- (std.unicode.utf8Decode(text[i .. i + n]) catch null)
- else
- null;
- var cp_slice: []const u8 = "\u{FFFD}";
- var consumed: usize = 1;
- if (decoded != null) {
- var git = uucode.grapheme.utf8Iterator(text[i..]);
- if (git.nextGrapheme()) |g| {
- const candidate = text[i .. i + g.end];
- if (std.unicode.utf8ValidateSlice(candidate)) {
- cp_slice = candidate;
- consumed = candidate.len;
- } else {
- cp_slice = text[i .. i + n];
- consumed = n;
- }
- }
- }
- i += consumed;
- var cp = decoded orelse 0xFFFD;
- if (cp == '\r') continue;
- if (cp == '\t') {
- const spaces = @min(config.tab_now, end - col);
- s.fill(col, y, spaces, 1, style);
- col += spaces;
- continue;
- }
- // No other C0/C1 control or DEL reaches a font fallback either.
- if (cp < ' ' or cp == 0x7f or (cp >= 0x80 and cp <= 0x9f)) {
- cp = 0xFFFD;
- cp_slice = "\u{FFFD}";
- }
- const width: u16 = if (decoded == null or (cp < 0x80 and cp_slice.len == 1))
- 1
- else
- @max(1, vaxis.gwidth.gwidth(cp_slice, .unicode));
- if (width == 2 and col + 1 >= end) break;
- var shown = cp_slice;
- if (shown.len > @typeInfo(@FieldType(Cell, "text")).array.len) {
- const cap = @typeInfo(@FieldType(Cell, "text")).array.len;
- var prefix: usize = 0;
- while (prefix < shown.len) {
- const cp_len = std.unicode.utf8ByteSequenceLength(shown[prefix]) catch break;
- if (prefix + cp_len > cap) break;
- prefix += cp_len;
+ col = s.printGeneral(col, end, y, text, &i, style) orelse break;
+ }
+ return col;
+ }
+
+ /// `print`'s general arm: the grapheme at `i.*`, painted at `col`.
+ /// Advances `i.*` past it and returns the column after it, or null
+ /// when a wide glyph does not fit before `end`.
+ fn printGeneral(s: *Surface, col: u16, end: u16, y: u16, text: []const u8, i: *usize, style: CellStyle) ?u16 {
+ const start = i.*;
+ // n == 0: not a start byte at all. A short tail or a bad
+ // continuation decodes to null the same way — one U+FFFD, one byte.
+ const n = std.unicode.utf8ByteSequenceLength(text[start]) catch 0;
+ const decoded: ?u21 = if (n > 0 and start + n <= text.len)
+ (std.unicode.utf8Decode(text[start .. start + n]) catch null)
+ else
+ null;
+ var cp_slice: []const u8 = "\u{FFFD}";
+ var consumed: usize = 1;
+ if (decoded != null) {
+ var git = uucode.grapheme.utf8Iterator(text[start..]);
+ if (git.nextGrapheme()) |g| {
+ const candidate = text[start .. start + g.end];
+ if (std.unicode.utf8ValidateSlice(candidate)) {
+ cp_slice = candidate;
+ consumed = candidate.len;
+ } else {
+ cp_slice = text[start .. start + n];
+ consumed = n;
}
- shown = if (prefix > 0) shown[0..prefix] else "\u{FFFD}";
}
- s.set(col, y, shown, style);
- if (width == 2 and col + 1 < end) {
- // spacer: empty cell under the wide glyph's tail
- s.set(col + 1, y, "", style);
+ }
+ i.* += consumed;
+ var cp = decoded orelse 0xFFFD;
+ if (cp == '\r') return col;
+ if (cp == '\t') {
+ const spaces = @min(config.tab_now, end - col);
+ s.fill(col, y, spaces, 1, style);
+ return col + spaces;
+ }
+ // No other C0/C1 control or DEL reaches a font fallback either.
+ if (cp < ' ' or cp == 0x7f or (cp >= 0x80 and cp <= 0x9f)) {
+ cp = 0xFFFD;
+ cp_slice = "\u{FFFD}";
+ }
+ const width: u16 = if (decoded == null or (cp < 0x80 and cp_slice.len == 1))
+ 1
+ else
+ @max(1, vaxis.gwidth.gwidth(cp_slice, .unicode));
+ if (width == 2 and col + 1 >= end) return null;
+ var shown = cp_slice;
+ if (shown.len > @typeInfo(@FieldType(Cell, "text")).array.len) {
+ const cap = @typeInfo(@FieldType(Cell, "text")).array.len;
+ var prefix: usize = 0;
+ while (prefix < shown.len) {
+ const cp_len = std.unicode.utf8ByteSequenceLength(shown[prefix]) catch break;
+ if (prefix + cp_len > cap) break;
+ prefix += cp_len;
}
- col += width;
+ shown = if (prefix > 0) shown[0..prefix] else "\u{FFFD}";
}
- return col;
+ s.set(col, y, shown, style);
+ if (width == 2 and col + 1 < end) {
+ // spacer: empty cell under the wide glyph's tail
+ s.set(col + 1, y, "", style);
+ }
+ return col + width;
}
pub fn fill(s: *Surface, x: u16, y: u16, w: u16, h: u16, style: CellStyle) void {
@@ -633,6 +635,17 @@ pub const Surface = struct {
}
}
+ /// Recolour `n` cells from (x, y), keeping their glyphs: a selection's
+ /// ground, and its ink when `fg` is given.
+ pub fn tint(s: *Surface, x: u16, y: u16, n: u16, bg: [3]u8, fg: ?[3]u8) void {
+ for (x..x + n) |col| {
+ const cell = s.at(@intCast(col), y);
+ cell.default = false;
+ cell.style.bg = .{ .rgb = bg };
+ if (fg) |ink| cell.style.fg = .{ .rgb = ink };
+ }
+ }
+
pub fn clearRect(s: *Surface, x: u16, y: u16, w: u16, h: u16) void {
var yy = y;
while (yy < y + h) : (yy += 1) {
@@ -683,66 +696,12 @@ test "surface print keeps combining and wide graphemes in their display cells" {
}
test "the ASCII fast path in surface print paints what the general arm paints" {
+ // The general arm alone, every grapheme through it.
const ref = struct {
fn print(s: *Surface, x: u16, y: u16, w: u16, text: []const u8, style: CellStyle) u16 {
var col = x;
- const end = x + w;
var i: usize = 0;
- while (i < text.len) {
- if (col >= end) break;
- const n = std.unicode.utf8ByteSequenceLength(text[i]) catch 0;
- const decoded: ?u21 = if (n > 0 and i + n <= text.len)
- (std.unicode.utf8Decode(text[i .. i + n]) catch null)
- else
- null;
- var cp_slice: []const u8 = "\u{FFFD}";
- var consumed: usize = 1;
- if (decoded != null) {
- var git = uucode.grapheme.utf8Iterator(text[i..]);
- if (git.nextGrapheme()) |g| {
- const candidate = text[i .. i + g.end];
- if (std.unicode.utf8ValidateSlice(candidate)) {
- cp_slice = candidate;
- consumed = candidate.len;
- } else {
- cp_slice = text[i .. i + n];
- consumed = n;
- }
- }
- }
- i += consumed;
- var cp = decoded orelse 0xFFFD;
- if (cp == '\r') continue;
- if (cp == '\t') {
- const spaces = @min(config.tab_now, end - col);
- s.fill(col, y, spaces, 1, style);
- col += spaces;
- continue;
- }
- if (cp < ' ' or cp == 0x7f or (cp >= 0x80 and cp <= 0x9f)) {
- cp = 0xFFFD;
- cp_slice = "\u{FFFD}";
- }
- const width: u16 = if (decoded == null or (cp < 0x80 and cp_slice.len == 1))
- 1
- else
- @max(1, vaxis.gwidth.gwidth(cp_slice, .unicode));
- if (width == 2 and col + 1 >= end) break;
- var shown = cp_slice;
- if (shown.len > @typeInfo(@FieldType(Cell, "text")).array.len) {
- const cap = @typeInfo(@FieldType(Cell, "text")).array.len;
- var prefix: usize = 0;
- while (prefix < shown.len) {
- const cp_len = std.unicode.utf8ByteSequenceLength(shown[prefix]) catch break;
- if (prefix + cp_len > cap) break;
- prefix += cp_len;
- }
- shown = if (prefix > 0) shown[0..prefix] else "\u{FFFD}";
- }
- s.set(col, y, shown, style);
- if (width == 2 and col + 1 < end) s.set(col + 1, y, "", style);
- col += width;
- }
+ while (i < text.len and col < x + w) col = s.printGeneral(col, x + w, y, text, &i, style) orelse break;
return col;
}
}.print;
diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden
index b8e6bb61..346bb898 100644
--- a/test/snapshots/themesel.golden
+++ b/test/snapshots/themesel.golden
@@ -756,20 +756,20 @@
|29: 0-3 d,#1e1e1e, 4-99 #858585,#1e1e1e,
|30: 0-3 d,#1e1e1e, 4-6 #858585,#1e1e1e, 7-99 #d4d4d4,#1e1e1e,
== snap tail grid=100x31 cursor=7,29
-|17: 327 Theme wolf_alabaster_dark
-|18: 328 Theme wolf_alabaster_dark_bg
-|19: 329 Theme wolf_alabaster_dark_mono
-|20: 330 Theme wolf_alabaster_light
-|21: 331 Theme wolf_alabaster_light_bg
-|22: 332 Theme wolf_alabaster_light_mono
-|23: 333 Theme yellowed
-|24: 334 Theme yo
-|25: 335 Theme yo_berry
-|26: 336 Theme yo_light
-|27: 337 Theme zed_onedark
-|28: 338 Theme zed_onelight
-|29: 339 Theme zenburn
-|30: 340
+|17: 305 Theme wolf_alabaster_dark
+|18: 306 Theme wolf_alabaster_dark_bg
+|19: 307 Theme wolf_alabaster_dark_mono
+|20: 308 Theme wolf_alabaster_light
+|21: 309 Theme wolf_alabaster_light_bg
+|22: 310 Theme wolf_alabaster_light_mono
+|23: 311 Theme yellowed
+|24: 312 Theme yo
+|25: 313 Theme yo_berry
+|26: 314 Theme yo_light
+|27: 315 Theme zed_onedark
+|28: 316 Theme zed_onelight
+|29: 317 Theme zenburn
+|30: 318
== snap picked grid=100x31 cursor=7,3
|16: 14 line 14
|17: 15 line 15
diff --git a/tools/gen_themes.zig b/tools/gen_themes.zig
index be5fde2f..30808dfe 100644
--- a/tools/gen_themes.zig
+++ b/tools/gen_themes.zig
@@ -11,9 +11,10 @@
//!
//! Why vendored and not read out of ~/05-genizah: `zig build` must work on a
//! fresh clone with no network and no helix checkout. It is the WHOLE of what
-//! both projects ship — helix's 214 runtime themes and zed's three families,
-//! 1.5MB of text — because "which ones are worth having" is not a question a
-//! build tool gets to answer on the user's behalf.
+//! both projects ship — helix's runtime themes and zed's three families —
+//! because "which ones are worth having" is not a question a build tool gets
+//! to answer on the user's behalf. The one exception is helix's copy of a
+//! theme pardes ports by hand (src/themes/: dracula, nord, ...): not vendored.
//!
//! NAMES. A helix theme is its file stem; a zed variant is its `name` slugged
//! with `_zed` on the end. Both projects ship gruvbox, ayu and one, so the
@@ -21,7 +22,10 @@
//! variant is one rule instead of eight exceptions — it also keeps a name from
//! moving when the other source gains or loses a file. helix's own `acme.toml`
//! is vendored as `acme_helix.toml` for the same reason, since pardes ships an
-//! acme of its own; the file is otherwise untouched. Two themes answering to
+//! acme of its own; the file is otherwise untouched. So are `monokai`,
+//! `ayu_dark` and `nord` as `<name>_helix.toml`, kept (unlike helix's other
+//! copies of themes ported here) because helix themes inherit them; those
+//! `inherits` lines name the renamed file. Two themes answering to
//! one name is a bug (`Theme <name>` would silently pick one), so src/colors.zig
//! asserts the ring's names are distinct at comptime.
//!
@@ -29,7 +33,7 @@
//! helix-editor/helix runtime/themes, each file keeping its author's header);
//! *.json are zed's (zed-industries/zed assets/themes). The licences sit beside
//! them as `<name>.LICENSE` — `helix.LICENSE` covering the runtime set, one per
-//! zed family, plus the twenty-two helix keeps in `runtime/themes/licenses/`
+//! zed family, plus the twenty-one helix keeps in `runtime/themes/licenses/`
//! for the themes it took from somewhere else (their names group by SOURCE, not
//! by file: `everforest.LICENSE` covers both everforest themes). build.zig's
//! directory read skips anything that is not a .toml or a .json, which is what
diff --git a/vendor/themes/ayu_dark.toml b/vendor/themes/ayu_dark_helix.toml
index a2fbc316..a2fbc316 100644
--- a/vendor/themes/ayu_dark.toml
+++ b/vendor/themes/ayu_dark_helix.toml
diff --git a/vendor/themes/ayu_evolve.toml b/vendor/themes/ayu_evolve.toml
index b9c5d822..7a1b1728 100644
--- a/vendor/themes/ayu_evolve.toml
+++ b/vendor/themes/ayu_evolve.toml
@@ -1,4 +1,4 @@
-inherits = 'ayu_dark'
+inherits = 'ayu_dark_helix'
"keyword.control" = "orange"
"keyword.storage" = "yellow"
diff --git a/vendor/themes/ayu_light.toml b/vendor/themes/ayu_light.toml
deleted file mode 100644
index c3ab1d4f..00000000
--- a/vendor/themes/ayu_light.toml
+++ /dev/null
@@ -1,94 +0,0 @@
-# Author: André Sá <[email protected]>
-# Based on the AYU theme colors from https://github.com/dempfi/ayu
-
-# Syntax highlighting
-"type" = "blue"
-"type.builtin" = "blue"
-"constructor" = "green"
-"constant" = "magenta"
-"string" = "green"
-"string.regexp" = "orange"
-"string.special" = "yellow"
-"comment" = { fg = "gray", modifiers = ["italic"] }
-"variable" = "foreground"
-"label" = "orange"
-"punctuation" = "foreground"
-"keyword" = "orange"
-"keyword.control" = "yellow"
-"keyword.directive" = "yellow"
-"operator" = "orange"
-"function" = "yellow"
-"tag" = "blue"
-"namespace" = "blue"
-"markup.heading" = "orange"
-"markup.list" = "yellow"
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "orange", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.raw.block" = "orange"
-"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
-"markup.link.text" = "yellow"
-"markup.link.label" = "green"
-"markup.quote" = "yellow"
-"diff.plus" = "green"
-"diff.minus" = "red"
-"diff.delta" = "yellow"
-
-# Interface
-"ui.background"= { bg = "background" }
-"ui.cursor" = { fg = "dark_gray", bg = "yellow" }
-"ui.cursor.primary" = { fg = "dark_gray", bg = "orange" }
-"ui.cursor.match" = "orange"
-"ui.linenr" = "dark_gray"
-"ui.linenr.selected" = "gray"
-"ui.statusline" = { fg = "foreground", bg = "black" }
-"ui.statusline.normal" = { fg = "black", bg = "blue" }
-"ui.statusline.insert" = { fg = "black", bg = "orange" }
-"ui.statusline.select" = { fg = "black", bg = "magenta" }
-"ui.cursorline" = { bg = "black" }
-"ui.popup" = { fg = "#7B91b3", bg = "black" }
-"ui.window" = "dark_gray"
-"ui.help" = { fg = "#7B91b3", bg = "black" }
-"ui.text" = "foreground"
-"ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
-"ui.text.info" = "foreground"
-"ui.virtual.whitespace" = "dark_gray"
-"ui.virtual.ruler" = { bg = "black" }
-"ui.virtual.inlay-hint" = { fg = "#f4a028", bg = "#fcf2e3" } # bg original #ffaa3333
-"ui.menu" = { fg = "foreground", bg = "black" }
-"ui.menu.selected" = { bg = "gray", fg = "background" }
-"ui.selection" = { bg = "dark_gray" }
-"warning" = "yellow"
-"error" = { fg = "red", modifiers = ["bold"] }
-"info" = { fg = "blue", modifiers = ["bold"] }
-"hint" = { fg = "blue", modifiers = ["bold"] }
-"diagnostic.hint"= { underline = { color = "blue", style = "curl" } }
-"diagnostic.info"= { underline = { color = "blue", style = "curl" } }
-"diagnostic.warning"= { underline = { color = "yellow", style = "curl" } }
-"diagnostic.error"= { underline = { color = "red", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-"ui.bufferline" = { fg = "gray", bg = "background" }
-"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
-"ui.debug" = { fg = "orange", bg = "background" }
-"ui.highlight.frameline" = { bg = "#cfe0f2" }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] }
-
-"special" = "orange"
-
-[palette]
-background = "#fafafa"
-foreground = "#5c6166"
-
-black = "#e7eaed"
-white = "#fcfcfc"
-blue = "#399ee6"
-light_blue = "#55b4d4"
-cyan = "#478acc"
-dark_gray = "#d8d8d7"
-gray = "#828c9a"
-green = "#86b300"
-magenta = "#a37acc"
-orange = "#fa8d3e"
-red = "#f07171"
-yellow = "#ffaa33"
diff --git a/vendor/themes/ayu_mirage.toml b/vendor/themes/ayu_mirage.toml
deleted file mode 100644
index 0fd53a4b..00000000
--- a/vendor/themes/ayu_mirage.toml
+++ /dev/null
@@ -1,92 +0,0 @@
-# Author: André Sá <[email protected]>
-# Based on the AYU theme colors from https://github.com/dempfi/ayu
-
-# Syntax highlighting
-"type" = "blue"
-"type.builtin" = "blue"
-"constructor" = "green"
-"constant" = "magenta"
-"string" = "green"
-"string.regexp" = "orange"
-"string.special" = "yellow"
-"comment" = { fg = "gray", modifiers = ["italic"] }
-"variable" = "foreground"
-"label" = "orange"
-"punctuation" = "foreground"
-"keyword" = "orange"
-"keyword.control" = "yellow"
-"keyword.directive" = "yellow"
-"operator" = "orange"
-"function" = "yellow"
-"tag" = "blue"
-"namespace" = "blue"
-"markup.heading" = "orange"
-"markup.list" = "yellow"
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "orange", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.raw.block" = "orange"
-"markup.link.url" = "blue"
-"markup.link.text" = "yellow"
-"markup.link.label" = "green"
-"markup.quote" = "yellow"
-"diff.plus" = "green"
-"diff.minus" = "red"
-"diff.delta" = "yellow"
-
-# Interface
-"ui.background"= { bg = "background" }
-"ui.cursor" = { fg = "dark_gray", bg = "yellow" }
-"ui.cursor.primary" = { fg = "dark_gray", bg = "orange" }
-"ui.cursor.match" = "orange"
-"ui.linenr" = "dark_gray"
-"ui.linenr.selected" = "gray"
-"ui.statusline" = { fg = "foreground", bg = "black" }
-"ui.statusline.normal" = { fg = "black", bg = "blue" }
-"ui.statusline.insert" = { fg = "black", bg = "orange" }
-"ui.statusline.select" = { fg = "black", bg = "magenta" }
-"ui.cursorline" = { bg = "black" }
-"ui.popup" = { fg = "#7B91b3", bg = "black" }
-"ui.window" = "dark_gray"
-"ui.help" = { fg = "#7B91b3", bg = "black" }
-"ui.text" = "foreground"
-"ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
-"ui.text.info" = "foreground"
-"ui.virtual.whitespace" = "dark_gray"
-"ui.virtual.ruler" = { bg = "black" }
-"ui.virtual.inlay-hint" = { fg = "#ffcc66", bg = "#47433d" } # original bg #ffcc6633
-"ui.menu" = { fg = "foreground", bg = "black" }
-"ui.menu.selected" = { bg = "gray", fg = "background" }
-"ui.selection" = { bg = "dark_gray" }
-"warning" = "yellow"
-"error" = { fg = "red", modifiers = ["bold"] }
-"info" = { fg = "blue", modifiers = ["bold"] }
-"hint" = { fg = "blue", modifiers = ["bold"] }
-"diagnostic.hint"= { underline = { color = "blue", style = "curl" } }
-"diagnostic.info"= { underline = { color = "blue", style = "curl" } }
-"diagnostic.warning"= { underline = { color = "yellow", style = "curl" } }
-"diagnostic.error"= { underline = { color = "red", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-"ui.bufferline" = { fg = "gray", bg = "background" }
-"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
-"ui.debug" = { fg = "orange", bg = "background" }
-"ui.highlight.frameline" = { bg = "#0067a3" }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["italic", "bold"] }
-
-"special" = "orange"
-
-[palette]
-background = "#1f2430"
-foreground = "#cccac2"
-
-black = "#1a1f29"
-blue = "#73d0ff"
-dark_gray = "#323843"
-cyan = "#444b55"
-gray = "#565b66"
-green = "#d5ff80"
-magenta = "#dfbfff"
-orange = "#ffad66"
-red = "#f28779"
-yellow = "#ffcc77"
diff --git a/vendor/themes/catppuccin_frappe.toml b/vendor/themes/catppuccin_frappe.toml
deleted file mode 100644
index 232e19c3..00000000
--- a/vendor/themes/catppuccin_frappe.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-inherits = "catppuccin_mocha"
-
-[palette]
-rosewater = "#f2d5cf"
-flamingo = "#eebebe"
-pink = "#f4b8e4"
-mauve = "#ca9ee6"
-red = "#e78284"
-maroon = "#ea999c"
-peach = "#ef9f76"
-yellow = "#e5c890"
-green = "#a6d189"
-teal = "#81c8be"
-sky = "#99d1db"
-sapphire = "#85c1dc"
-blue = "#8caaee"
-lavender = "#babbf1"
-text = "#c6d0f5"
-subtext1 = "#b5bfe2"
-subtext0 = "#a5adce"
-overlay2 = "#949cbb"
-overlay1 = "#838ba7"
-overlay0 = "#737994"
-surface2 = "#626880"
-surface1 = "#51576d"
-surface0 = "#414559"
-base = "#303446"
-mantle = "#292c3c"
-crust = "#232634"
-
-cursorline = "#3b3f52"
-secondary_cursor = "#b8a5a6"
-secondary_cursor_select = "#9192be"
-secondary_cursor_normal = "#b8a5a6"
-secondary_cursor_insert = "#83a275"
diff --git a/vendor/themes/catppuccin_latte.toml b/vendor/themes/catppuccin_latte.toml
deleted file mode 100644
index be47423d..00000000
--- a/vendor/themes/catppuccin_latte.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-inherits = "catppuccin_mocha"
-
-[palette]
-rosewater = "#dc8a78"
-flamingo = "#dd7878"
-pink = "#ea76cb"
-mauve = "#8839ef"
-red = "#d20f39"
-maroon = "#e64553"
-peach = "#fe640b"
-yellow = "#df8e1d"
-green = "#40a02b"
-teal = "#179299"
-sky = "#04a5e5"
-sapphire = "#209fb5"
-blue = "#1e66f5"
-lavender = "#7287fd"
-text = "#4c4f69"
-subtext1 = "#5c5f77"
-subtext0 = "#6c6f85"
-overlay2 = "#7c7f93"
-overlay1 = "#8c8fa1"
-overlay0 = "#9ca0b0"
-surface2 = "#acb0be"
-surface1 = "#bcc0cc"
-surface0 = "#ccd0da"
-base = "#eff1f5"
-mantle = "#e6e9ef"
-crust = "#dce0e8"
-
-cursorline = "#e8ecf1"
-secondary_cursor = "#e1a99d"
-secondary_cursor_select = "#97a7fb"
-secondary_cursor_normal = "#e1a99d"
-secondary_cursor_insert = "#74b867"
diff --git a/vendor/themes/catppuccin_macchiato.toml b/vendor/themes/catppuccin_macchiato.toml
deleted file mode 100644
index 4f3f49cf..00000000
--- a/vendor/themes/catppuccin_macchiato.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-inherits = "catppuccin_mocha"
-
-[palette]
-rosewater = "#f4dbd6"
-flamingo = "#f0c6c6"
-pink = "#f5bde6"
-mauve = "#c6a0f6"
-red = "#ed8796"
-maroon = "#ee99a0"
-peach = "#f5a97f"
-yellow = "#eed49f"
-green = "#a6da95"
-teal = "#8bd5ca"
-sky = "#91d7e3"
-sapphire = "#7dc4e4"
-blue = "#8aadf4"
-lavender = "#b7bdf8"
-text = "#cad3f5"
-subtext1 = "#b8c0e0"
-subtext0 = "#a5adcb"
-overlay2 = "#939ab7"
-overlay1 = "#8087a2"
-overlay0 = "#6e738d"
-surface2 = "#5b6078"
-surface1 = "#494d64"
-surface0 = "#363a4f"
-base = "#24273a"
-mantle = "#1e2030"
-crust = "#181926"
-
-cursorline = "#303347"
-secondary_cursor = "#b6a6a7"
-secondary_cursor_select = "#8b91bf"
-secondary_cursor_normal = "#b6a6a7"
-secondary_cursor_insert = "#80a57a"
diff --git a/vendor/themes/catppuccin_mocha.toml b/vendor/themes/catppuccin_mocha.toml
deleted file mode 100644
index e4cbea7f..00000000
--- a/vendor/themes/catppuccin_mocha.toml
+++ /dev/null
@@ -1,168 +0,0 @@
-# NOTE: For contributors looking to modify the theme, please submit a pull request at https://github.com/catppuccin/helix instead of updating this file. Changes are frequently synchronized from the catppuccin/helix theme repository.
-# Syntax highlighting
-# -------------------
-"attribute" = "yellow"
-
-"type" = "yellow"
-"type.builtin" = "mauve"
-"type.enum.variant" = "teal"
-
-"constructor" = "sapphire"
-
-"constant" = "peach"
-"constant.character" = "teal"
-"constant.character.escape" = "pink"
-
-"string" = "green"
-"string.regexp" = "pink"
-"string.special" = "blue"
-"string.special.symbol" = "red"
-
-"comment" = { fg = "overlay2", modifiers = ["italic"] }
-
-"variable" = "text"
-"variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
-"variable.builtin" = "red"
-"variable.other.member" = "blue"
-
-"label" = "sapphire" # used for lifetimes
-
-"punctuation" = "overlay2"
-"punctuation.special" = "sky"
-
-"keyword" = "mauve"
-"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
-
-"operator" = "sky"
-
-"function" = "blue"
-"function.macro" = "rosewater"
-
-"tag" = "blue"
-
-"namespace" = { fg = "yellow", modifiers = ["italic"] }
-
-"special" = "blue" # fuzzy highlight
-
-"markup.heading.1" = "red"
-"markup.heading.2" = "peach"
-"markup.heading.3" = "yellow"
-"markup.heading.4" = "green"
-"markup.heading.5" = "sapphire"
-"markup.heading.6" = "lavender"
-"markup.list" = "teal"
-"markup.list.unchecked" = "overlay2"
-"markup.list.checked" = "green"
-"markup.bold" = { fg = "red", modifiers = ["bold"] }
-"markup.italic" = { fg = "red", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "blue", modifiers = ["italic", "underlined"] }
-"markup.link.text" = "lavender"
-"markup.link.label" = "sapphire"
-"markup.raw" = "green"
-"markup.quote" = "pink"
-
-"diff.plus" = "green"
-"diff.minus" = "red"
-"diff.delta" = "blue"
-
-# User Interface
-# --------------
-"ui.background" = { fg = "text", bg = "base" }
-
-"ui.linenr" = { fg = "surface1" }
-"ui.linenr.selected" = { fg = "lavender" }
-
-"ui.statusline" = { fg = "subtext1", bg = "mantle" }
-"ui.statusline.inactive" = { fg = "surface2", bg = "mantle" }
-"ui.statusline.normal" = { fg = "base", bg = "rosewater", modifiers = ["bold"] }
-"ui.statusline.insert" = { fg = "base", bg = "green", modifiers = ["bold"] }
-"ui.statusline.select" = { fg = "base", bg = "lavender", modifiers = ["bold"] }
-
-"ui.popup" = { fg = "text", bg = "surface0" }
-"ui.window" = { fg = "crust" }
-"ui.help" = { fg = "overlay2", bg = "surface0" }
-
-"ui.bufferline" = { fg = "subtext0", bg = "mantle" }
-"ui.bufferline.active" = { fg = "mauve", bg = "base", underline = { color = "mauve", style = "line" } }
-"ui.bufferline.background" = { bg = "crust" }
-
-"ui.text" = "text"
-"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
-"ui.text.inactive" = { fg = "overlay1" }
-"ui.text.directory" = { fg = "blue" }
-
-"ui.virtual" = "overlay0"
-"ui.virtual.ruler" = { bg = "surface0" }
-"ui.virtual.indent-guide" = "surface0"
-"ui.virtual.inlay-hint" = { fg = "surface1", bg = "mantle" }
-"ui.virtual.jump-label" = { fg = "rosewater", modifiers = ["bold"] }
-
-"ui.selection" = { bg = "surface1" }
-
-"ui.cursor" = { fg = "base", bg = "secondary_cursor" }
-"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
-"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
-
-"ui.cursor.primary.normal" = { fg = "base", bg = "rosewater" }
-"ui.cursor.primary.insert" = { fg = "base", bg = "green" }
-"ui.cursor.primary.select" = { fg = "base", bg = "lavender" }
-
-"ui.cursor.normal" = { fg = "base", bg = "secondary_cursor_normal" }
-"ui.cursor.insert" = { fg = "base", bg = "secondary_cursor_insert" }
-"ui.cursor.select" = { fg = "base", bg = "secondary_cursor_select" }
-
-"ui.cursorline.primary" = { bg = "cursorline" }
-
-"ui.highlight" = { bg = "surface1", modifiers = ["bold"] }
-
-"ui.menu" = { fg = "overlay2", bg = "surface0" }
-"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
-
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
-"diagnostic.info" = { underline = { color = "sky", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "teal", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-error = "red"
-warning = "yellow"
-info = "sky"
-hint = "teal"
-
-rainbow = ["red", "peach", "yellow", "green", "sapphire", "lavender"]
-
-[palette]
-rosewater = "#f5e0dc"
-flamingo = "#f2cdcd"
-pink = "#f5c2e7"
-mauve = "#cba6f7"
-red = "#f38ba8"
-maroon = "#eba0ac"
-peach = "#fab387"
-yellow = "#f9e2af"
-green = "#a6e3a1"
-teal = "#94e2d5"
-sky = "#89dceb"
-sapphire = "#74c7ec"
-blue = "#89b4fa"
-lavender = "#b4befe"
-text = "#cdd6f4"
-subtext1 = "#bac2de"
-subtext0 = "#a6adc8"
-overlay2 = "#9399b2"
-overlay1 = "#7f849c"
-overlay0 = "#6c7086"
-surface2 = "#585b70"
-surface1 = "#45475a"
-surface0 = "#313244"
-base = "#1e1e2e"
-mantle = "#181825"
-crust = "#11111b"
-
-cursorline = "#2a2b3c"
-secondary_cursor = "#b5a6a8"
-secondary_cursor_select = "#878ec0"
-secondary_cursor_normal = "#b5a6a8"
-secondary_cursor_insert = "#7ea87f"
diff --git a/vendor/themes/dark_plus.toml b/vendor/themes/dark_plus.toml
deleted file mode 100644
index fcb25e77..00000000
--- a/vendor/themes/dark_plus.toml
+++ /dev/null
@@ -1,138 +0,0 @@
-# Author: David Else <[email protected]>
-
-# SYNTAX
-"attribute" = "variable"
-"comment" = "dark_green"
-"constant" = "constant"
-"constant.builtin" = "blue2"
-"constant.character" = "orange"
-"constant.character.escape" = "gold"
-"constant.numeric" = "pale_green"
-"constructor" = "type"
-"diff.delta" = "blue4"
-"diff.minus" = "orange_red"
-"diff.plus" = "dark_green2"
-"function" = "fn_declaration"
-"function.builtin" = "fn_declaration"
-"function.macro" = "blue2"
-"keyword" = "blue2"
-"keyword.control" = "special"
-"keyword.directive" = "special"
-"label" = "blue2"
-"module" = "type"
-"namespace" = "type"
-"operator" = "text"
-"punctuation" = "text"
-"punctuation.delimiter" = "text"
-"special" = "light_blue"
-"string" = "orange"
-"string.regexp" = "gold"
-"tag" = "blue2"
-"type" = "type"
-"type.builtin" = "type"
-"type.enum.variant" = "constant"
-"variable" = "variable"
-"variable.mutable" = { fg = "variable", underline.style= "line" }
-"variable.builtin" = "blue2"
-"variable.builtin.mutable" = { fg = "blue2", underline.style= "line" }
-"variable.other.member" = "variable"
-"variable.parameter" = "variable"
-"variable.parameter.mutable" = { fg = "variable", underline.style= "line" }
-
-# MARKUP
-"markup.heading" = { fg = "blue2", modifiers = ["bold"] }
-"markup.list" = "blue3"
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { underline.style= "line" }
-"markup.link.text" = "orange"
-"markup.quote" = "dark_green"
-"markup.raw" = "orange"
-
-# UI
-"ui.background" = { fg = "light_gray", bg = "dark_gray2" }
-"ui.window" = { bg = "widget" }
-"ui.popup" = { fg = "text", bg = "widget" }
-"ui.help" = { fg = "text", bg = "widget" }
-"ui.menu" = { fg = "text", bg = "widget" }
-"ui.menu.selected" = { bg = "dark_blue2" }
-# TODO: Alternate bg colour for `ui.cursor.match` and `ui.selection`.
-"ui.cursor" = { fg = "cursor", modifiers = ["reversed"] }
-"ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] }
-"ui.cursor.match" = { bg = "#3a3d41", underline.style = "line" }
-"ui.selection" = { bg = "#3a3d41" }
-"ui.selection.primary" = { bg = "dark_blue" }
-"ui.linenr" = { fg = "dark_gray" }
-"ui.linenr.selected" = { fg = "light_gray2" }
-"ui.cursorline.primary" = { bg = "dark_gray3" }
-"ui.statusline" = { fg = "white", bg = "blue" }
-"ui.statusline.inactive" = { fg = "white", bg = "widget" }
-"ui.statusline.insert" = { fg = "white", bg = "yellow" }
-"ui.statusline.select" = { fg = "white", bg = "magenta" }
-"ui.bufferline" = { fg = "text", bg = "widget" }
-"ui.bufferline.active" = { fg = "white", bg = "blue" }
-"ui.bufferline.background" = { bg = "background" }
-"ui.text" = { fg = "text" }
-"ui.text.focus" = { fg = "white" }
-"ui.text.directory" = { fg = "blue2" }
-"ui.text.inactive" = { fg = "dark_gray" }
-"ui.virtual.whitespace" = { fg = "#3e3e3d" }
-"ui.virtual.wrap" = { fg = "#3e3e3d" }
-"ui.virtual.ruler" = { bg = "borders" }
-"ui.virtual.indent-guide" = { fg = "dark_gray4" }
-"ui.virtual.inlay-hint" = { fg = "dark_gray5"}
-"ui.virtual.jump-label" = { fg = "yellow", modifiers = ["bold"] }
-"ui.highlight.frameline" = { bg = "#4b4b18" }
-"ui.debug.active" = { fg = "#ffcc00" }
-"ui.debug.breakpoint" = { fg = "#e51400" }
-"ui.picker.header.column" = { underline.style = "line" }
-"ui.picker.header.column.active" = { fg ="white", underline.style = "line" }
-"warning" = { fg = "gold2" }
-"error" = { fg = "red" }
-"info" = { fg = "light_blue" }
-"hint" = { fg = "light_gray3" }
-"diagnostic.error".underline = { color = "red", style = "curl" }
-"diagnostic".underline = { color = "gold", style = "curl" }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-rainbow = ["#FFD700", "#DA70D6", "#179FFF"]
-
-[palette]
-white = "#ffffff"
-orange = "#ce9178"
-gold = "#d7ba7d"
-gold2 = "#cca700"
-pale_green = "#b5cea8"
-dark_green = "#6A9955"
-dark_green2 = "#487e02"
-light_gray = "#d4d4d4"
-light_gray2 = "#c6c6c6"
-light_gray3 = "#eeeeee"
-dark_gray = "#858585"
-dark_gray2 = "#1e1e1e"
-dark_gray3 = "#282828"
-dark_gray4 = "#404040"
-dark_gray5 = "#8b949e"
-blue = "#007acc"
-blue2 = "#569CD6"
-blue3 = "#6796E6"
-blue4 = "#1b81a8"
-light_blue = "#75beff"
-dark_blue = "#264f78"
-dark_blue2 = "#094771"
-red = "#ff1212"
-orange_red = "#f14c4c"
-
-type = "#4EC9B0"
-special = "#C586C0"
-variable = "#9CDCFE"
-fn_declaration = "#DCDCAA"
-constant = "#4FC1FF"
-
-background = "#1e1e1e"
-text = "#d4d4d4"
-cursor = "#a6a6a6"
-widget = "#252526"
-borders = "#323232"
diff --git a/vendor/themes/doom-one.LICENSE b/vendor/themes/doom-one.LICENSE
deleted file mode 100644
index 1d0112f1..00000000
--- a/vendor/themes/doom-one.LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-MIT License
-
-Copyright (c) 2025 NTBBloodbath
-
-This theme has been ported by spentbliss <[email protected]>.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/themes/doom-one.toml b/vendor/themes/doom-one.toml
deleted file mode 100644
index 60dbd874..00000000
--- a/vendor/themes/doom-one.toml
+++ /dev/null
@@ -1,127 +0,0 @@
-# Author: spentbliss <[email protected]>
-# License: MIT (originally by NTBBloodbath)
-
-"ui.background" = { bg = "bg", fg = "fg" }
-"ui.text" = "fg"
-"ui.text.focus" = { bg = "bg_highlight", fg = "cyan" }
-"ui.cursor" = { bg = "cyan", fg = "bg" }
-"ui.linenr" = "grey"
-"ui.linenr.selected" = "yellow"
-"ui.statusline" = { fg = "blue" }
-"ui.selection" = { bg = "bg_highlight" }
-"ui.selection.primary" = { bg = "bg_highlight" }
-"ui.virtual.ruler" = { bg = "bg_highlight" }
-"ui.virtual.jump-label" = { fg = "cyan", modifiers = ["bold"] }
-
-# Markdown Highlighting
-"markup.raw" = { fg = "blue", bg = "bg" }
-"markup.raw.inline" = { fg = "orange" }
-"markup.heading.1" = { fg = "#E99BEA", bg = "#4F4258"}
-"markup.heading.2" = { fg = "#51AFEF", bg = "#2F4456" }
-"markup.heading.3" = { fg = "#A9A1E1", bg = "#3F4153" }
-"markup.heading.4" = { fg = "#98BE65", bg = "#3C453D" }
-"markup.heading.5" = { fg = "#ECBE7B", bg = "#4B4641" }
-"markup.heading.6" = { fg = "#DA8549", bg = "#483C39" }
-"markup.list" = { fg = "magenta" }
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "orange" }
-"markup.strikethrough" = { fg = "red", modifiers = ["crossed_out"] }
-"markup.link" = { fg = "cyan" }
-"markup.quote" = { fg = "fg" }
-
-# Syntax Highlighting for Code
-"comment" = { fg = "grey" }
-"comment.line" = { fg = "grey" }
-"comment.block" = { fg = "grey" }
-"comment.documentation" = { fg = "blue" }
-
-"keyword" = "blue"
-"keyword.control" = "blue"
-"keyword.operator" = "fg"
-"keyword.function" = "blue"
-"keyword.directive" = "green"
-"keyword.storage" = "blue"
-
-"type" = "yellow"
-"type.builtin" = "yellow"
-"type.enum.variant" = "purple"
-
-"function" = "magenta"
-"function.builtin" = "fg"
-"function.method" = "fg"
-"function.macro" = "purple"
-
-"variable" = "fg"
-"variable.builtin" = "red"
-"variable.parameter" = "fg"
-
-"string" = "green"
-"string.special" = "green"
-
-"constant" = "orange"
-"constant.builtin" = "orange"
-"constant.numeric" = "orange"
-"constant.character" = "orange"
-"constant.boolean" = "orange"
-
-"attribute" = "magenta"
-"operator" = "blue"
-"tag" = { fg = "magenta", modifiers = ["bold"] }
-"tag.special" = { fg = "orange", modifiers = ["bold"] }
-"namespace" = "blue"
-"macro" = "orange"
-"label" = "red"
-
-# Interface specific
-"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 = "bg", bg = "blue" }
-"ui.statusline.insert" = { fg = "bg", bg = "green" }
-"ui.statusline.select" = { fg = "bg", bg = "purple" }
-
-# Git changes indicator
-"diff.plus" = "green"
-"diff.plus.gutter" = "green"
-"diff.minus" = "red"
-"diff.minus.gutter" = "red"
-"diff.delta" = "green"
-"diff.delta.gutter" = "green"
-"diff.delta.moved" = "orange"
-"diff.delta.conflict" = "purple"
-
-# 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 for documentation or file picker
-"ui.popup" = { fg = "fg", bg = "bg" }
-"ui.popup.info" = { fg = "fg", bg = "bg_alt" }
-"ui.menu" = { fg = "fg", bg = "bg" }
-"ui.menu.selected" = { fg = "cyan", bg = "bg_highlight" }
-
-# Additional overrides
-"ui.virtual.whitespace" = "grey"
-"ui.virtual.indent-guide" = { fg = "grey" }
-
-[palette]
-bg = "#282C34"
-fg = "#BBC2CF"
-grey = "#5B6268"
-blue = "#51AFEF"
-green = "#98BE65"
-cyan = "#46D9FF"
-red = "#FF6C6B"
-yellow = "#ECBE7B"
-purple = "#A8A1E1"
-magenta = "#C678DD"
-orange = "#DA8548"
-bg_alt = "#21242B"
-bg_highlight = "#3C4048"
diff --git a/vendor/themes/dracula.toml b/vendor/themes/dracula.toml
deleted file mode 100644
index 8b4abe16..00000000
--- a/vendor/themes/dracula.toml
+++ /dev/null
@@ -1,159 +0,0 @@
-# Author : Sebastian Zivota <[email protected]>
-# Author : Chirikumbrah
-
-"annotation" = { fg = "foreground" }
-
-"attribute" = { fg = "green", modifiers = ["italic"] }
-
-"comment" = { fg = "comment" }
-"comment.block" = { fg = "comment" }
-"comment.block.documentation" = { fg = "comment" }
-"comment.line" = { fg = "comment" }
-"comment.line.documentation" = { fg = "comment" }
-
-"constant" = { fg = "purple" }
-"constant.builtin" = { fg = "purple" }
-"constant.builtin.boolean" = { fg = "purple" }
-"constant.character" = { fg = "cyan" }
-"constant.character.escape" = { fg = "pink" }
-"constant.macro" = { fg = "purple" }
-"constant.numeric" = { fg = "purple" }
-"constructor" = { fg = "purple" }
-
-"definition" = { underline = { color = "cyan" } }
-
-"diagnostic" = { underline = { color = "orange", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "purple", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
-"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-"error" = { fg = "red" }
-"hint" = { fg = "purple" }
-"info" = { fg = "cyan" }
-"warning" = { fg = "yellow" }
-
-"diff.delta" = { fg = "orange" }
-"diff.minus" = { fg = "red" }
-"diff.plus" = { fg = "green" }
-
-# d
-"function" = { fg = "green" }
-"function.builtin" = { fg = "green" }
-"function.call" = { fg = "green" }
-"function.macro" = { fg = "purple" }
-"function.method" = { fg = "green" }
-
-"keyword" = { fg = "pink" }
-"keyword.control.conditional" = { fg = "pink" }
-"keyword.control.exception" = { fg = "purple" }
-"keyword.control.import" = { fg = "pink" }
-"keyword.control.repeat" = { fg = "pink" }
-"keyword.directive" = { fg = "green" }
-"keyword.function" = { fg = "pink" }
-"keyword.operator" = { fg = "pink" }
-"keyword.return" = { fg = "pink" }
-"keyword.storage" = { fg = "pink" }
-"keyword.storage.modifier" = { fg = "pink" }
-"keyword.storage.type" = { fg = "cyan", modifiers = ["italic"] }
-
-"label" = { fg = "cyan" }
-
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.heading" = { fg = "purple", modifiers = ["bold"] }
-"markup.italic" = { fg = "yellow", modifiers = ["italic"] }
-"markup.link.text" = { fg = "pink" }
-"markup.link.url" = { fg = "cyan" }
-"markup.list" = { fg = "cyan" }
-"markup.quote" = { fg = "yellow", modifiers = ["italic"] }
-"markup.raw" = { fg = "foreground" }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-
-"punctuation" = { fg = "foreground" }
-"punctuation.bracket" = { fg = "foreground" }
-"punctuation.delimiter" = { fg = "foreground" }
-"punctuation.special" = { fg = "pink" }
-
-"special" = { fg = "pink" }
-
-"string" = { fg = "yellow" }
-"string.regexp" = { fg = "red" }
-"string.special" = { fg = "orange" }
-"string.symbol" = { fg = "yellow" }
-
-"tag" = { fg = "pink" }
-"tag.attribute" = { fg = "purple" }
-"tag.delimiter" = { fg = "foreground" }
-
-"type" = { fg = "cyan", modifiers = ["italic"] }
-"type.builtin" = { fg = "cyan" }
-"type.enum.variant" = { fg = "foreground", modifiers = ["italic"] }
-
-"ui.background" = { fg = "foreground", bg = "background" }
-"ui.cursor" = { fg = "background", bg = "purple", modifiers = ["dim"] }
-"ui.cursor.insert" = { fg = "background", bg = "green", modifiers = ["dim"] }
-"ui.cursor.match" = { fg = "foreground", bg = "grey" }
-"ui.cursor.normal" = { fg = "background", bg = "purple", modifiers = ["dim"] }
-"ui.cursor.primary.insert" = { fg = "background", bg = "green" }
-"ui.cursor.primary.normal" = { fg = "background", bg = "purple" }
-"ui.cursor.primary.select" = { fg = "background", bg = "cyan" }
-"ui.cursor.select" = { fg = "background", bg = "cyan", modifiers = ["dim"] }
-"ui.cursorline.primary" = { bg = "cursorline" }
-"ui.debug" = { fg = "red" }
-"ui.help" = { fg = "foreground", bg = "black" }
-"ui.highlight.frameline" = { fg = "background", bg = "red" }
-"ui.linenr" = { fg = "comment" }
-"ui.linenr.selected" = { fg = "foreground" }
-"ui.menu" = { fg = "foreground", bg = "current_line" }
-"ui.menu.scroll" = { fg = "foreground", bg = "current_line" }
-"ui.menu.selected" = { fg = "current_line", bg = "purple", modifiers = ["dim"] }
-"ui.popup" = { fg = "foreground", bg = "black" }
-"ui.selection" = { bg = "selection" }
-"ui.selection.primary" = { bg = "current_line" }
-"ui.statusline" = { fg = "foreground", bg = "darker" }
-"ui.statusline.inactive" = { fg = "comment", bg = "darker" }
-"ui.statusline.insert" = { fg = "black", bg = "green", modifiers = ["bold"] }
-"ui.statusline.normal" = { fg = "black", bg = "purple", modifiers = ["bold"] }
-"ui.statusline.select" = { fg = "black", bg = "cyan", modifiers = ["bold"] }
-"ui.text" = { fg = "foreground" }
-"ui.text.focus" = { fg = "cyan" }
-"ui.text.directory" = { fg = "cyan" }
-"ui.virtual.indent-guide" = { fg = "indent" }
-"ui.virtual.inlay-hint" = { fg = "cyan" }
-"ui.virtual.inlay-hint.parameter" = { fg = "cyan", modifiers = ["italic", "dim"] }
-"ui.virtual.inlay-hint.type" = { fg = "cyan", modifiers = ["italic", "dim"] }
-"ui.virtual.jump-label" = { fg = "pink", modifiers = ["bold"] }
-"ui.virtual.ruler" = { bg = "black" }
-"ui.virtual.whitespace" = { fg = "whitespace" }
-"ui.virtual.wrap" = { fg = "current_line" }
-"ui.window" = { fg = "foreground" }
-
-"variable" = { fg = "foreground" }
-"variable.builtin" = { fg = "purple", modifiers = ["italic"] }
-"variable.other" = { fg = "foreground" }
-"variable.other.member" = { fg = "foreground" }
-"variable.parameter" = { fg = "orange", modifiers = ["italic"] }
-
-
-[palette]
-background = "#282A36"
-black = "#191A21"
-comment = "#6272A4"
-current_line = "#44475a"
-cursorline = "#2d303e"
-cyan = "#8be9fd"
-darker = "#222430"
-foreground = "#f8f8f2"
-green = "#50fa7b"
-grey = "#666771"
-indent = "#56596a"
-orange = "#ffb86c"
-pink = "#ff79c6"
-purple = "#BD93F9"
-red = "#ff5555"
-selection = "#363848"
-whitespace = "#586693"
-yellow = "#f1fa8c"
-
diff --git a/vendor/themes/molokai.toml b/vendor/themes/molokai.toml
index 0e48f775..a2562180 100644
--- a/vendor/themes/molokai.toml
+++ b/vendor/themes/molokai.toml
@@ -1,6 +1,6 @@
# Author : Maxwell Anderson <[email protected]>
-inherits = "monokai"
+inherits = "monokai_helix"
"comment" = "comment"
"comment.block.documentation" = { fg = "comment", modifiers = ["bold"] }
diff --git a/vendor/themes/monokai_aqua.toml b/vendor/themes/monokai_aqua.toml
index b818a09e..61672230 100644
--- a/vendor/themes/monokai_aqua.toml
+++ b/vendor/themes/monokai_aqua.toml
@@ -1,4 +1,4 @@
-inherits = "monokai"
+inherits = "monokai_helix"
"keyword.control.import" = { fg = "cyan", modifiers = ["italic"] }
"keyword.function" = { fg = "cyan", modifiers = ["italic"] }
diff --git a/vendor/themes/monokai.toml b/vendor/themes/monokai_helix.toml
index dfa7040c..dfa7040c 100644
--- a/vendor/themes/monokai.toml
+++ b/vendor/themes/monokai_helix.toml
diff --git a/vendor/themes/monokai_pro.toml b/vendor/themes/monokai_pro.toml
deleted file mode 100644
index 97f2a57c..00000000
--- a/vendor/themes/monokai_pro.toml
+++ /dev/null
@@ -1,134 +0,0 @@
-# Author : WindSoilder<[email protected]>
-# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro
-# Credit goes to the original creator: https://monokai.pro
-
-"ui.linenr.selected" = { bg = "base3" }
-"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
-"ui.menu" = { fg = "base8", bg = "base3" }
-"ui.menu.selected" = { fg = "base2", bg = "yellow" }
-"ui.virtual.whitespace" = "base5"
-"ui.virtual.ruler" = { bg = "base1" }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
-
-"info" = "base8"
-"hint" = "base8"
-
-# background color
-"ui.background" = { bg = "base2" }
-
-# status bars, panels, modals, autocompletion
-"ui.statusline" = { fg = "base8", bg = "base4" }
-"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
-"ui.statusline.normal" = { fg = "base4", bg = "blue" }
-"ui.statusline.insert" = { fg = "base4", bg = "green" }
-"ui.statusline.select" = { fg = "base4", bg = "purple" }
-"ui.popup" = { bg = "base3" }
-"ui.window" = { bg = "base3" }
-"ui.help" = { fg = "base8", bg = "base3" }
-
-# active line, highlighting
-"ui.selection" = { bg = "base4" }
-"ui.cursor.match" = { bg = "base4" }
-"ui.cursorline" = { bg = "base1" }
-
-# bufferline, inlay hints
-"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
-"ui.bufferline.active" = { fg = "base8", bg = "base4" }
-"ui.virtual.inlay-hint" = { fg = "base6" }
-
-# comments, nord3 based lighter color
-"comment" = { fg = "base5", modifiers = ["italic"] }
-"ui.linenr" = { fg = "base5" }
-
-# cursor, variables, constants, attributes, fields
-"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] }
-"attribute" = "blue"
-"variable" = "base8"
-"constant" = "orange"
-"variable.builtin" = "red"
-"constant.builtin" = "red"
-"namespace" = "base8"
-
-# base text, punctuation
-"ui.text" = { fg = "base8" }
-"punctuation" = "base6"
-
-# classes, types, primitives
-"type" = "green"
-"type.builtin" = { fg = "red"}
-"label" = "base8"
-
-# declaration, methods, routines
-"constructor" = "blue"
-"function" = "green"
-"function.macro" = { fg = "blue" }
-"function.builtin" = { fg = "cyan" }
-
-# operator, tags, units, punctuations
-"operator" = "red"
-"variable.other.member" = "base8"
-
-# keywords, special
-"keyword" = { fg = "red" }
-"keyword.directive" = "blue"
-"variable.parameter" = "#f59762"
-
-# error
-"error" = "red"
-
-# annotations, decorators
-"special" = "#f59762"
-"module" = "#f59762"
-
-# warnings, escape characters, regex
-"warning" = "orange"
-"constant.character.escape" = { fg = "base8" }
-
-# strings
-"string" = "yellow"
-
-# integer, floating point
-"constant.numeric" = "purple"
-
-# vcs
-"diff.plus" = "green"
-"diff.delta" = "orange"
-"diff.minus" = "red"
-
-# make diagnostic underlined, to distinguish with selection text.
-"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
-"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
-"markup.heading" = "green"
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "orange", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
-"markup.link.text" = "yellow"
-"markup.quote" = "green"
-
-[palette]
-# primary colors
-"red" = "#ff6188"
-"orange" = "#fc9867"
-"yellow" = "#ffd866"
-"green" = "#a9dc76"
-"blue" = "#78dce8"
-"purple" = "#ab9df2"
-# base colors, sorted from darkest to lightest
-"base0" = "#19181a"
-"base1" = "#221f22"
-"base2" = "#2d2a2e"
-"base3" = "#403e41"
-"base4" = "#5b595c"
-"base5" = "#727072"
-"base6" = "#939293"
-"base7" = "#c1c0c0"
-"base8" = "#fcfcfa"
-# variants (for when transparency isn't supported)
-"base8x0c" = "#363337" # using base2 as bg
diff --git a/vendor/themes/monokai_pro_machine.toml b/vendor/themes/monokai_pro_machine.toml
deleted file mode 100644
index e1f74b1c..00000000
--- a/vendor/themes/monokai_pro_machine.toml
+++ /dev/null
@@ -1,131 +0,0 @@
-# Author : WindSoilder<[email protected]>
-# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro
-# Credit goes to the original creator: https://monokai.pro
-
-"ui.linenr.selected" = { bg = "base3" }
-"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
-"ui.menu" = { fg = "base8", bg = "base3" }
-"ui.menu.selected" = { fg = "base2", bg = "yellow" }
-"ui.virtual.whitespace" = "base5"
-"ui.virtual.ruler" = { bg = "base1" }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
-
-"info" = "base8"
-"hint" = "base8"
-
-# background color
-"ui.background" = { bg = "base2" }
-"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
-
-# status bars, panels, modals, autocompletion
-"ui.statusline" = { fg = "base8", bg = "base4" }
-"ui.popup" = { bg = "base3" }
-"ui.window" = { bg = "base3" }
-"ui.help" = { fg = "base8", bg = "base3" }
-
-# active line, highlighting
-"ui.selection" = { bg = "base4" }
-"ui.cursor.match" = { bg = "base4" }
-"ui.cursorline" = { bg = "base1" }
-
-# bufferline, inlay hints
-"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
-"ui.bufferline.active" = { fg = "base8", bg = "base4" }
-"ui.virtual.inlay-hint" = { fg = "base6" }
-
-# comments, nord3 based lighter color
-"comment" = { fg = "base5", modifiers = ["italic"] }
-"ui.linenr" = { fg = "base5" }
-
-# cursor, variables, constants, attributes, fields
-"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] }
-"attribute" = "blue"
-"variable" = "base8"
-"constant" = "orange"
-"variable.builtin" = "red"
-"constant.builtin" = "red"
-"namespace" = "base8"
-
-# base text, punctuation
-"ui.text" = { fg = "base8" }
-"punctuation" = "base6"
-
-# classes, types, primitives
-"type" = "green"
-"type.builtin" = { fg = "red"}
-"label" = "base8"
-
-# declaration, methods, routines
-"constructor" = "blue"
-"function" = "green"
-"function.macro" = { fg = "blue" }
-"function.builtin" = { fg = "cyan" }
-
-# operator, tags, units, punctuations
-"operator" = "red"
-"variable.other.member" = "base8"
-
-# keywords, special
-"keyword" = { fg = "red" }
-"keyword.directive" = "blue"
-"variable.parameter" = "#f59762"
-
-# error
-"error" = "red"
-
-# annotations, decorators
-"special" = "#f59762"
-"module" = "#f59762"
-
-# warnings, escape characters, regex
-"warning" = "orange"
-"constant.character.escape" = { fg = "base8" }
-
-# strings
-"string" = "yellow"
-
-# integer, floating point
-"constant.numeric" = "purple"
-
-# vcs
-"diff.plus" = "green"
-"diff.delta" = "orange"
-"diff.minus" = "red"
-
-# make diagnostic underlined, to distinguish with selection text.
-"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
-"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
-"markup.heading" = "green"
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "orange", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
-"markup.link.text" = "yellow"
-"markup.quote" = "green"
-
-[palette]
-# primary colors
-"red" = "#ff6d7e"
-"orange" = "#ffb270"
-"yellow" = "#ffed72"
-"green" = "#a2e57b"
-"blue" = "#7cd5f1"
-"purple" = "#baa0f8"
-# base colors
-"base0" = "#161b1e"
-"base1" = "#1d2528"
-"base2" = "#273136"
-"base3" = "#3a4449"
-"base4" = "#545f62"
-"base5" = "#6b7678"
-"base6" = "#798384"
-"base7" = "#b8c4c3"
-"base8" = "#f2fffc"
-# variants
-"base8x0c" = "#303a3e"
diff --git a/vendor/themes/monokai_pro_octagon.toml b/vendor/themes/monokai_pro_octagon.toml
deleted file mode 100644
index cfa85b65..00000000
--- a/vendor/themes/monokai_pro_octagon.toml
+++ /dev/null
@@ -1,134 +0,0 @@
-# Author : WindSoilder<[email protected]>
-# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro
-# Credit goes to the original creator: https://monokai.pro
-
-"ui.linenr.selected" = { bg = "base3" }
-"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
-"ui.menu" = { fg = "base8", bg = "base3" }
-"ui.menu.selected" = { fg = "base2", bg = "yellow" }
-"ui.virtual.whitespace" = "base5"
-"ui.virtual.ruler" = { bg = "base1" }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
-
-"info" = "base8"
-"hint" = "base8"
-
-# background color
-"ui.background" = { bg = "base2" }
-"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
-
-# status bars, panels, modals, autocompletion
-"ui.statusline" = { fg = "base8", bg = "base4" }
-"ui.statusline.normal" = { fg = "base4", bg = "blue" }
-"ui.statusline.insert" = { fg = "base4", bg = "green" }
-"ui.statusline.select" = { fg = "base4", bg = "purple" }
-"ui.popup" = { bg = "base3" }
-"ui.window" = { bg = "base3" }
-"ui.help" = { fg = "base8", bg = "base3" }
-
-# active line, highlighting
-"ui.selection" = { bg = "base4" }
-"ui.cursor.match" = { bg = "base4" }
-"ui.cursorline" = { bg = "base1" }
-
-# bufferline, inlay hints
-"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
-"ui.bufferline.active" = { fg = "base8", bg = "base4" }
-"ui.virtual.inlay-hint" = { fg = "base6" }
-
-# comments, nord3 based lighter color
-"comment" = { fg = "base5", modifiers = ["italic"] }
-"ui.linenr" = { fg = "base5" }
-
-# cursor, variables, constants, attributes, fields
-"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] }
-"attribute" = "blue"
-"variable" = "base8"
-"constant" = "orange"
-"variable.builtin" = "red"
-"constant.builtin" = "red"
-"namespace" = "base8"
-
-# base text, punctuation
-"ui.text" = { fg = "base8" }
-"punctuation" = "base6"
-
-# classes, types, primitives
-"type" = "green"
-"type.builtin" = { fg = "red"}
-"label" = "base8"
-
-# declaration, methods, routines
-"constructor" = "blue"
-"function" = "green"
-"function.macro" = { fg = "blue" }
-"function.builtin" = { fg = "cyan" }
-
-# operator, tags, units, punctuations
-"operator" = "red"
-"variable.other.member" = "base8"
-
-# keywords, special
-"keyword" = { fg = "red" }
-"keyword.directive" = "blue"
-"variable.parameter" = "#f59762"
-
-# error
-"error" = "red"
-
-# annotations, decorators
-"special" = "#f59762"
-"module" = "#f59762"
-
-# warnings, escape characters, regex
-"warning" = "orange"
-"constant.character.escape" = { fg = "base8" }
-
-# strings
-"string" = "yellow"
-
-# integer, floating point
-"constant.numeric" = "purple"
-
-# vcs
-"diff.plus" = "green"
-"diff.delta" = "orange"
-"diff.minus" = "red"
-
-# make diagnostic underlined, to distinguish with selection text.
-"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
-"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
-"markup.heading" = "green"
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "orange", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
-"markup.link.text" = "yellow"
-"markup.quote" = "green"
-
-[palette]
-# primary colors
-"red" = "#ff657a"
-"orange" = "#ff9b5e"
-"yellow" = "#ffd76d"
-"green" = "#bad761"
-"blue" = "#9cd1bb"
-"purple" = "#c39ac9"
-# base colors
-"base0" = "#161821"
-"base1" = "#1e1f2b"
-"base2" = "#282a3a"
-"base3" = "#3a3d4b"
-"base4" = "#535763"
-"base5" = "#696d77"
-"base6" = "#767b81"
-"base7" = "#b2b9bd"
-"base8" = "#eaf2f1"
-# variants
-"base8x0c" = "#303342"
diff --git a/vendor/themes/monokai_pro_ristretto.toml b/vendor/themes/monokai_pro_ristretto.toml
deleted file mode 100644
index a6ba6fcf..00000000
--- a/vendor/themes/monokai_pro_ristretto.toml
+++ /dev/null
@@ -1,131 +0,0 @@
-# Author : WindSoilder<[email protected]>
-# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro
-# Credit goes to the original creator: https://monokai.pro
-
-"ui.linenr.selected" = { bg = "base3" }
-"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
-"ui.menu" = { fg = "base8", bg = "base3" }
-"ui.menu.selected" = { fg = "base2", bg = "yellow" }
-"ui.virtual.whitespace" = "base5"
-"ui.virtual.ruler" = { bg = "base1" }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
-
-"info" = "base8"
-"hint" = "base8"
-
-# background color
-"ui.background" = { bg = "base2" }
-"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
-
-# status bars, panels, modals, autocompletion
-"ui.statusline" = { fg = "base8", bg = "base4" }
-"ui.popup" = { bg = "base3" }
-"ui.window" = { bg = "base3" }
-"ui.help" = { fg = "base8", bg = "base3" }
-
-# active line, highlighting
-"ui.selection" = { bg = "base4" }
-"ui.cursor.match" = { bg = "base4" }
-"ui.cursorline" = { bg = "base1" }
-
-# bufferline, inlay hints
-"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
-"ui.bufferline.active" = { fg = "base8", bg = "base4" }
-"ui.virtual.inlay-hint" = { fg = "base6" }
-
-# comments, nord3 based lighter color
-"comment" = { fg = "base5", modifiers = ["italic"] }
-"ui.linenr" = { fg = "base5" }
-
-# cursor, variables, constants, attributes, fields
-"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] }
-"attribute" = "blue"
-"variable" = "base8"
-"constant" = "orange"
-"variable.builtin" = "red"
-"constant.builtin" = "red"
-"namespace" = "base8"
-
-# base text, punctuation
-"ui.text" = { fg = "base8" }
-"punctuation" = "base6"
-
-# classes, types, primitives
-"type" = "green"
-"type.builtin" = { fg = "red"}
-"label" = "base8"
-
-# declaration, methods, routines
-"constructor" = "blue"
-"function" = "green"
-"function.macro" = { fg = "blue" }
-"function.builtin" = { fg = "cyan" }
-
-# operator, tags, units, punctuations
-"operator" = "red"
-"variable.other.member" = "base8"
-
-# keywords, special
-"keyword" = { fg = "red" }
-"keyword.directive" = "blue"
-"variable.parameter" = "#f59762"
-
-# error
-"error" = "red"
-
-# annotations, decorators
-"special" = "#f59762"
-"module" = "#f59762"
-
-# warnings, escape characters, regex
-"warning" = "orange"
-"constant.character.escape" = { fg = "base8" }
-
-# strings
-"string" = "yellow"
-
-# integer, floating point
-"constant.numeric" = "purple"
-
-# vcs
-"diff.plus" = "green"
-"diff.delta" = "orange"
-"diff.minus" = "red"
-
-# make diagnostic underlined, to distinguish with selection text.
-"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
-"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
-"markup.heading" = "green"
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "orange", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
-"markup.link.text" = "yellow"
-"markup.quote" = "green"
-
-[palette]
-# primary colors
-"red" = "#fd6883"
-"orange" = "#f38d70"
-"yellow" = "#f9cc6c"
-"green" = "#adda78"
-"blue" = "#85dacc"
-"purple" = "#a8a9eb"
-# base colors
-"base0" = "#191515"
-"base1" = "#211c1c"
-"base2" = "#2c2525"
-"base3" = "#403838"
-"base4" = "#5b5353"
-"base5" = "#72696a"
-"base6" = "#8c8384"
-"base7" = "#c3b7b8"
-"base8" = "#fff1f3"
-# variants
-"base8x0c" = "#352e2e"
diff --git a/vendor/themes/monokai_pro_spectrum.toml b/vendor/themes/monokai_pro_spectrum.toml
deleted file mode 100644
index 1bfcb688..00000000
--- a/vendor/themes/monokai_pro_spectrum.toml
+++ /dev/null
@@ -1,131 +0,0 @@
-# Author : WindSoilder<[email protected]>
-# The unofficial Monokai Pro theme, simply migrate from jetbrains monokai pro theme: https://github.com/subtheme-dev/monokai-pro
-# Credit goes to the original creator: https://monokai.pro
-
-"ui.linenr.selected" = { bg = "base3" }
-"ui.text.focus" = { fg = "yellow", modifiers= ["bold"] }
-"ui.menu" = { fg = "base8", bg = "base3" }
-"ui.menu.selected" = { fg = "base2", bg = "yellow" }
-"ui.virtual.whitespace" = "base4"
-"ui.virtual.ruler" = { bg = "base1" }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
-
-"info" = "base8"
-"hint" = "base8"
-
-# background color
-"ui.background" = { bg = "base2" }
-
-# status bars, panels, modals, autocompletion
-"ui.statusline" = { fg = "base8", bg = "base4" }
-"ui.statusline.inactive" = { fg = "base8", bg = "base8x0c" }
-"ui.popup" = { bg = "base3" }
-"ui.window" = { bg = "base3" }
-"ui.help" = { fg = "base8", bg = "base3" }
-
-# active line, highlighting
-"ui.selection" = { bg = "base4" }
-"ui.cursor.match" = { bg = "base4" }
-"ui.cursorline" = { bg = "base1" }
-
-# bufferline, inlay hints
-"ui.bufferline" = { fg = "base6", bg = "base8x0c" }
-"ui.bufferline.active" = { fg = "base8", bg = "base4" }
-"ui.virtual.inlay-hint" = { fg = "base6" }
-
-# comments, nord3 based lighter color
-"comment" = { fg = "base5", modifiers = ["italic"] }
-"ui.linenr" = { fg = "base5" }
-
-# cursor, variables, constants, attributes, fields
-"ui.cursor.primary" = { fg = "base7", modifiers = ["reversed"] }
-"attribute" = "blue"
-"variable" = "base8"
-"constant" = "orange"
-"variable.builtin" = "red"
-"constant.builtin" = "red"
-"namespace" = "base8"
-
-# base text, punctuation
-"ui.text" = { fg = "base8" }
-"punctuation" = "base6"
-
-# classes, types, primitives
-"type" = "green"
-"type.builtin" = { fg = "red"}
-"label" = "base8"
-
-# declaration, methods, routines
-"constructor" = "blue"
-"function" = "green"
-"function.macro" = { fg = "blue" }
-"function.builtin" = { fg = "blue" }
-
-# operator, tags, units, punctuations
-"operator" = "red"
-"variable.other.member" = "base8"
-
-# keywords, special
-"keyword" = { fg = "red" }
-"keyword.directive" = "blue"
-"variable.parameter" = "#f59762"
-
-# error
-"error" = { fg = "red", modifiers = ["bold"] }
-
-# annotations, decorators
-"special" = "#f59762"
-"module" = "#f59762"
-
-# warnings, escape characters, regex
-"warning" = "orange"
-"constant.character.escape" = { fg = "base8" }
-
-# strings
-"string" = "yellow"
-
-# integer, floating point
-"constant.numeric" = "purple"
-
-# vcs
-"diff.plus" = "green"
-"diff.delta" = "orange"
-"diff.minus" = "red"
-
-# make diagnostic underlined, to distinguish with selection text.
-"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
-"diagnostic.info" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "base8", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-# markup highlight, no need for `markup.raw` and `markup.list`, make them to be default
-"markup.heading" = "green"
-"markup.bold" = { fg = "orange", modifiers = ["bold"] }
-"markup.italic" = { fg = "orange", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "orange", modifiers = ["underlined"] }
-"markup.link.text" = "yellow"
-"markup.quote" = "green"
-
-[palette]
-# primary colors
-"red" = "#fc618d"
-"orange" = "#fd9353"
-"yellow" = "#fce566"
-"green" = "#7bd88f"
-"blue" = "#5ad4e6"
-"purple" = "#948ae3"
-# base colors
-"base0" = "#131313"
-"base1" = "#191919"
-"base2" = "#222222"
-"base3" = "#363537"
-"base4" = "#525053"
-"base5" = "#69676c"
-"base6" = "#8b888f"
-"base7" = "#bab6c0"
-"base8" = "#f7f1ff"
-# variants
-"base8x0c" = "#2b2b2b"
diff --git a/vendor/themes/nord-night.toml b/vendor/themes/nord-night.toml
index b759738b..92fc35bf 100644
--- a/vendor/themes/nord-night.toml
+++ b/vendor/themes/nord-night.toml
@@ -4,7 +4,7 @@
# The Background and the Primary Text color have been slightly darkened.
# The Aurora color palette has been used more generously.
-inherits = 'nord'
+inherits = 'nord_helix'
'constant' = 'nord13'
'constant.builtin.boolean' = 'nord13'
diff --git a/vendor/themes/nord.toml b/vendor/themes/nord_helix.toml
index db7b6190..db7b6190 100644
--- a/vendor/themes/nord.toml
+++ b/vendor/themes/nord_helix.toml
diff --git a/vendor/themes/rose_pine.toml b/vendor/themes/rose_pine.toml
deleted file mode 100644
index 33c71486..00000000
--- a/vendor/themes/rose_pine.toml
+++ /dev/null
@@ -1,197 +0,0 @@
-# Author: Rosé Pine <[email protected]>
-# Upstream: https://github.com/rose-pine/helix
-# Contributing:
-# Please submit changes to https://github.com/rose-pine/helix.
-# The Rosé Pine team will update Helix, including you as a co-author.
-
-"ui.background" = { bg = "base" }
-"ui.background.separator" = { bg = "base" }
-
-"ui.cursor" = { fg = "text", bg = "highlight_high" }
-# "ui.cursor.select" = {}
-"ui.cursor.match" = { fg = "text", bg = "highlight_med" }
-"ui.cursor.primary" = { fg = "text", bg = "muted" }
-
-# "ui.gutter" = {}
-# "ui.gutter.selected" = {}
-
-"ui.linenr" = { fg = "muted" }
-"ui.linenr.selected" = { fg = "text" }
-
-"ui.bufferline" = { fg = "muted", bg = "base" }
-"ui.bufferline.active" = { fg = "text", bg = "overlay" }
-"ui.statusline" = { fg = "subtle", bg = "surface" }
-"ui.statusline.inactive" = { fg = "muted", bg = "surface" }
-"ui.statusline.normal" = { fg = "rose", bg = "rose_10" }
-"ui.statusline.insert" = { fg = "foam", bg = "foam_10" }
-"ui.statusline.select" = { fg = "iris", bg = "iris_10" }
-# "ui.statusline.separator" = {}
-
-"ui.popup" = { bg = "surface" }
-"ui.popup.info" = { bg = "surface" }
-
-"ui.window" = { fg = "overlay", bg = "base" }
-"ui.help" = { fg = "subtle", bg = "overlay" }
-
-"ui.text" = { fg = "text" }
-"ui.text.focus" = { bg = "overlay" }
-"ui.text.info" = { fg = "subtle" }
-"ui.text.directory" = { fg = "iris" }
-
-"ui.virtual.jump-label" = { fg = "love", modifiers = ["bold"] }
-"ui.virtual.ruler" = { bg = "overlay" }
-"ui.virtual.whitespace" = { fg = "highlight_high" }
-"ui.virtual.indent-guide" = { fg = "muted" }
-"ui.virtual.inlay-hint" = { fg = "subtle" }
-
-"ui.menu" = { fg = "subtle", bg = "surface" }
-"ui.menu.selected" = { fg = "text", bg = "overlay" }
-"ui.menu.scroll" = { fg = "muted", bg = "highlight_med" }
-
-"ui.selection" = { bg = "overlay" }
-"ui.selection.primary" = { bg = "highlight_med" }
-
-"ui.cursorline.primary" = { bg = "highlight_low" }
-"ui.cursorline.secondary" = { bg = "surface" }
-
-"warning" = "gold"
-"error" = "love"
-"info" = "foam"
-"hint" = "iris"
-"debug" = "rose"
-
-"diagnostic" = { underline = { color = "subtle", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "iris", style = "curl" } }
-"diagnostic.info" = { underline = { color = "foam", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "gold", style = "curl" } }
-"diagnostic.error" = { underline = { color = "love", style = "curl" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-"special" = "rose"
-
-"attribute" = "iris"
-
-"type" = "foam"
-# "type.builtin" = ""
-
-"constructor" = "foam"
-
-"constant" = "foam"
-"constant.builtin" = "love"
-"constant.builtin.boolean" = "rose"
-"constant.character" = "gold"
-"constant.character.escape" = "pine"
-"constant.numeric" = "gold"
-# "constant.numeric.integer" = ""
-# "constant.numeric.float" = ""
-
-"string" = "gold"
-# "string.regexp" = ""
-# "string.special" = ""
-# "string.special.path" = ""
-# "string.special.url" = ""
-# "string.special.symbol" = ""
-
-"comment" = { fg = "muted", modifiers = ["italic"] }
-# "comment.line" = ""
-# "comment.line.documentation" = ""
-# "comment.block" = ""
-# "comment.block.documentation" = ""
-
-"variable" = "text"
-"variable.builtin" = "love"
-"variable.parameter" = "iris"
-# "variable.other" = ""
-"variable.other.member" = "foam"
-
-"label" = "foam"
-
-"punctuation" = "subtle"
-# "punctuation.delimiter" = ""
-# "punctuation.bracket" = ""
-# "punctuation.special" = ""
-
-"keyword" = "pine"
-# "keyword.control" = ""
-# "keyword.control.conditional" = ""
-# "keyword.control.repeat" = ""
-# "keyword.control.import" = ""
-# "keyword.control.return" = ""
-# "keyword.control.exception" = ""
-"keyword.operator" = "subtle"
-# "keyword.directive" = ""
-# "keyword.function" = ""
-# "keyword.storage" = ""
-# "keyword.storage.type" = ""
-# "keyword.storage.modifier" = ""
-
-"operator" = "subtle"
-
-"function" = "rose" # maybe pine
-"function.builtin" = "love"
-# "function.method" = ""
-# "function.macro" = ""
-# "function.special" = ""
-
-"tag" = "foam"
-
-"namespace" = "text"
-
-"markup.heading.marker" = "muted"
-"markup.heading" = { fg = "iris", modifiers = ["bold"] }
-"markup.heading.1" = { fg = "iris", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "foam", modifiers = ["bold"] }
-"markup.heading.3" = { fg = "rose", modifiers = ["bold"] }
-"markup.heading.4" = { fg = "gold", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "pine", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "foam", modifiers = ["bold"] }
-# "markup.heading.completion" = ""
-# "markup.heading.hover" = ""
-"markup.list" = "muted"
-# "markup.list.unnumbered" = ""
-# "markup.list.numbered" = ""
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link" = "iris"
-"markup.link.url" = { fg = "iris", underline = { color = "iris", style = "line" } }
-"markup.link.label" = "subtle"
-"markup.link.text" = "text"
-"markup.quote" = "subtle"
-"markup.raw" = "subtle"
-# "markup.raw.inline" = {}
-# "markup.raw.inline.completion" = {}
-# "markup.raw.inline.hover" = {}
-# "markup.raw.block" = {}
-# "markup.normal" = ""
-# "markup.normal.completion" = ""
-# "markup.normal.hover" = ""
-
-"diff" = "overlay"
-"diff.plus" = "foam"
-"diff.minus" = "love"
-"diff.delta" = "highlight_high"
-# "diff.delta.moved" = ""
-
-[palette]
-base = "#191724"
-surface = "#1f1d2e"
-overlay = "#26233a"
-muted = "#6e6a86"
-subtle = "#908caa"
-text = "#e0def4"
-love = "#eb6f92"
-love_10 = "#311f30"
-gold = "#f6c177"
-gold_10 = "#30282c"
-rose = "#ebbcba"
-rose_10 = "#2f2834"
-pine = "#31748f"
-pine_10 = "#1a2030"
-foam = "#9ccfd8"
-foam_10 = "#252937"
-iris = "#c4a7e7"
-iris_10 = "#2b2539"
-highlight_low = "#21202e"
-highlight_med = "#403d52"
-highlight_high = "#524f67"
diff --git a/vendor/themes/rose_pine_dawn.toml b/vendor/themes/rose_pine_dawn.toml
deleted file mode 100644
index d3949e1a..00000000
--- a/vendor/themes/rose_pine_dawn.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Author: Rosé Pine <[email protected]>
-# Upstream: https://github.com/rose-pine/helix
-# Contributing:
-# Please submit changes to https://github.com/rose-pine/helix.
-# The Rosé Pine team will update Helix, including you as a co-author.
-
-inherits = "rose_pine"
-
-[palette]
-base = "#faf4ed"
-surface = "#fffaf3"
-overlay = "#f2e9e1"
-muted = "#9893a5"
-subtle = "#797593"
-text = "#575279"
-love = "#b4637a"
-love_10 = "#f6e4e0"
-gold = "#ea9d34"
-gold_10 = "#fbead8"
-rose = "#d7827e"
-rose_10 = "#fae8e1"
-pine = "#286983"
-pine_10 = "#e5e6e2"
-foam = "#56949f"
-foam_10 = "#eaeae5"
-iris = "#907aa9"
-iris_10 = "#f1e8e6"
-highlight_low = "#f4ede8"
-highlight_med = "#dfdad9"
-highlight_high = "#cecacd"
diff --git a/vendor/themes/rose_pine_moon.toml b/vendor/themes/rose_pine_moon.toml
deleted file mode 100644
index f1d04dd3..00000000
--- a/vendor/themes/rose_pine_moon.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Author: Rosé Pine <[email protected]>
-# Upstream: https://github.com/rose-pine/helix
-# Contributing:
-# Please submit changes to https://github.com/rose-pine/helix.
-# The Rosé Pine team will update Helix, including you as a co-author.
-
-inherits = "rose_pine"
-
-[palette]
-base = "#232136"
-surface = "#2a273f"
-overlay = "#393552"
-muted = "#6e6a86"
-subtle = "#908caa"
-text = "#e0def4"
-love = "#eb6f92"
-love_10 = "#3a2841"
-gold = "#f6c177"
-gold_10 = "#39313e"
-rose = "#ea9a97"
-rose_10 = "#392d41"
-pine = "#3e8fb0"
-pine_10 = "#252c44"
-foam = "#9ccfd8"
-foam_10 = "#2e3248"
-iris = "#c4a7e7"
-iris_10 = "#342e4a"
-highlight_low = "#2a283e"
-highlight_med = "#44415a"
-highlight_high = "#56526e"
diff --git a/vendor/themes/solarized_dark.toml b/vendor/themes/solarized_dark.toml
deleted file mode 100644
index c4f6815a..00000000
--- a/vendor/themes/solarized_dark.toml
+++ /dev/null
@@ -1,135 +0,0 @@
-"attribute" = { fg = "violet" }
-"keyword" = { fg = "green" }
-"keyword.directive" = { fg = "orange" }
-"namespace" = { fg = "violet" }
-"operator" = { fg = "green" }
-"special" = { fg = "orange" }
-"variable.builtin" = { fg = "cyan", modifiers = ["bold"] }
-"variable.function" = { fg = "blue" }
-"type" = { fg = "yellow" }
-"type.builtin" = { fg = "yellow", modifiers = ["bold"] }
-"constructor" = { fg = "blue" }
-"function" = { fg = "blue" }
-"function.macro" = { fg = "magenta" }
-"function.builtin" = { fg = "blue", modifiers = ["bold"] }
-"function.special" = { fg = "magenta" }
-"comment" = { fg = "base01" }
-"string" = { fg = "cyan" }
-"constant" = { fg = "cyan" }
-"constant.builtin" = { fg = "cyan", modifiers = ["bold"] }
-"constant.character.escape" = { fg = "red", modifiers = ["bold"] }
-"label" = { fg = "green" }
-"module" = { fg = "violet" }
-"tag" = { fg = "magenta" }
-
-# TODO
-"markup.heading" = "blue"
-"markup.list" = "red"
-"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
-"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
-"markup.link.text" = "red"
-"markup.quote" = "cyan"
-"markup.raw" = "green"
-
-"diff.plus" = { fg = "green" }
-"diff.delta" = { fg = "yellow" }
-"diff.minus" = { fg = "red" }
-
-# 背景
-"ui.background" = { bg = "base03" }
-
-"ui.virtual.whitespace" = { fg = "base01" }
-"ui.virtual.inlay-hint" = { fg = "base01", modifiers = ["italic"] }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
-
-# 行号栏
-"ui.linenr" = { fg = "base0", bg = "base02" }
-# 当前行号栏
-"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
-#cursorline
-"ui.cursorline" = { bg = "base03" }
-
-# 状态栏
-"ui.statusline" = { fg = "base03", bg = "base0" }
-"ui.statusline.normal" = { bg = "blue" }
-"ui.statusline.insert" = { bg = "green" }
-"ui.statusline.select" = { bg = "yellow" }
-
-# 非活动状态栏
-"ui.statusline.inactive" = { fg = "base1", bg = "base01" }
-
-# 补全窗口, preview窗口
-"ui.popup" = { bg = "base02" }
-# 影响 补全选中 cmd弹出信息选中
-"ui.menu.selected" = { fg = "base02", bg = "base2"}
-"ui.menu" = { fg = "base0", bg = "base02" }
-# ??
-"ui.window" = { fg = "base3" }
-# 命令行 补全的帮助信息
-"ui.help" = { modifiers = ["reversed"] }
-
-# 快捷键窗口
-"ui.popup.info" = {fg = "base02", bg = "base1", modifiers = ["bold"]}
-# 快捷键字体
-"ui.text.info" = {fg = "base02", modifiers = ["bold"]}
-
-# 普通ui的字体样式
-"ui.text" = { fg = "base1" }
-# 影响 picker列表选中, 快捷键帮助窗口文本
-"ui.text.focus" = { fg = "blue", modifiers = ["bold"]}
-
-# 主光标/selectio
-"ui.cursor.primary" = { fg = "base03", bg = "base1" }
-"ui.cursor.select" = { fg = "base02", bg = "cyan" }
-"ui.cursorline.primary" = { bg = "base02" }
-"ui.cursorline.secondary" = { bg = "base025" }
-
-"ui.selection" = { bg = "base0175" }
-"ui.selection.primary" = { bg = "base015" }
-
-"ui.virtual.indent-guide" = { fg = "base02" }
-"ui.virtual.ruler" = { bg = "base02" }
-
-# normal模式的光标
-"ui.cursor" = {fg = "base02", bg = "cyan"}
-"ui.cursor.insert" = {fg = "base03", bg = "base3"}
-# 当前光标匹配的标点符号
-"ui.cursor.match" = { fg = "base03", bg = "base00" }
-
-"warning" = { fg = "orange", modifiers= ["bold", "underlined"] }
-"error" = { fg = "red", modifiers= ["bold", "underlined"] }
-"info" = { fg = "blue", modifiers= ["bold", "underlined"] }
-"hint" = { fg = "base01", modifiers= ["bold", "underlined"] }
-
-"diagnostic.warning" = { underline = { style = "curl", color = "orange" } }
-"diagnostic.error" = { underline = { style = "curl", color = "red" } }
-"diagnostic.info" = { underline = { style = "curl", color = "blue" } }
-"diagnostic.hint" = { underline = { style = "curl", color = "base01" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-[palette]
-# 深色 越来越深
-base03 = "#002b36"
-base025 = "#03303b"
-base02 = "#073642"
-base0175 = "#16404b"
-base015 = "#2c4f59"
-base01 = "#586e75"
-base00 = "#657b83"
-base0 = "#839496"
-base1 = "#93a1a1"
-base2 = "#eee8d5"
-base3 = "#fdf6e3"
-
-# 浅色 越來越浅
-yellow = "#b58900"
-orange = "#cb4b16"
-red = "#dc322f"
-magenta = "#d33682"
-violet = "#6c71c4"
-blue = "#268bd2"
-cyan = "#2aa198"
-green = "#859900"
diff --git a/vendor/themes/solarized_light.toml b/vendor/themes/solarized_light.toml
deleted file mode 100644
index 2db54ca1..00000000
--- a/vendor/themes/solarized_light.toml
+++ /dev/null
@@ -1,155 +0,0 @@
-"attribute" = { fg = "violet" }
-"keyword" = { fg = "green" }
-"keyword.directive" = { fg = "orange" }
-"namespace" = { fg = "violet" }
-"operator" = { fg = "green" }
-"special" = { fg = "orange" }
-"variable.builtin" = { fg = "cyan", modifiers = ["bold"] }
-"variable.function" = { fg = "blue" }
-"type" = { fg = "yellow" }
-"type.builtin" = { fg = "yellow", modifiers = ["bold"] }
-"constructor" = { fg = "blue" }
-"function" = { fg = "blue" }
-"function.macro" = { fg = "magenta" }
-"function.builtin" = { fg = "blue", modifiers = ["bold"] }
-"function.special" = { fg = "magenta" }
-"comment" = { fg = "base01" }
-"string" = { fg = "cyan" }
-"constant" = { fg = "cyan" }
-"constant.builtin" = { fg = "cyan", modifiers = ["bold"] }
-"constant.character.escape" = { fg = "red", modifiers = ["bold"] }
-"label" = { fg = "green" }
-"module" = { fg = "violet" }
-"tag" = { fg = "magenta" }
-
-# TODO
-"markup.heading" = "blue"
-"markup.list" = "red"
-"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
-"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
-"markup.link.text" = "red"
-"markup.quote" = "cyan"
-"markup.raw" = "green"
-
-"diff.plus" = { fg = "green" }
-"diff.delta" = { fg = "yellow" }
-"diff.minus" = { fg = "red" }
-
-# 背景
-# background
-"ui.background" = { bg = "base03" }
-
-"ui.virtual.whitespace" = { fg = "base01" }
-"ui.virtual.inlay-hint" = { fg = "base01", modifiers = ["italic"] }
-"ui.virtual.jump-label" = { fg = "red", modifiers = ["bold"] }
-
-# 行号栏
-# line number column
-"ui.linenr" = { fg = "base0", bg = "base02" }
-# 当前行号栏
-# current line number column
-"ui.linenr.selected" = { fg = "blue", modifiers = ["bold"] }
-# cursorline
-"ui.cursorline" = { bg = "base0" }
-
-# 状态栏
-# status bar
-"ui.statusline" = { fg = "base03", bg = "base0" }
-"ui.statusline.normal" = { bg = "blue" }
-"ui.statusline.insert" = { bg = "green" }
-"ui.statusline.select" = { bg = "yellow" }
-
-# 非活动状态栏
-# inactive status bar
-"ui.statusline.inactive" = { fg = "base1", bg = "base01" }
-
-# 补全窗口, preview窗口
-# Completion window, preview window
-"ui.popup" = { bg = "base02" }
-# 影响 补全选中 cmd弹出信息选中
-# Affect completion selection, cmd pop-up information selection
-"ui.menu.selected" = { fg = "base02", bg = "base2"}
-"ui.menu" = { fg = "base0", bg = "base02" }
-# ??
-"ui.window" = { fg = "base3" }
-# 命令行 补全的帮助信息
-# Command line completion help information
-"ui.help" = { modifiers = ["reversed"] }
-
-# 快捷键窗口
-# Shortcut window
-"ui.popup.info" = { bg = "base1" }
-# 快捷键字体
-# Shortcut font
-"ui.text.info" = {fg = "base02", modifiers = ["bold"]}
-
-# 普通ui的字体样式
-# Normal ui font style
-"ui.text" = { fg = "base1" }
-# 影响 picker列表选中, 快捷键帮助窗口文本
-# Affects picker list selection, shortcut key help window text
-"ui.text.focus" = { fg = "blue", modifiers = ["bold"]}
-
-# 主光标/selection
-# main cursor/selection
-"ui.cursor.primary" = { fg = "base03", bg = "base1" }
-"ui.cursor.select" = { fg = "base02", bg = "cyan" }
-
-"ui.cursorline.primary" = { bg = "base02" }
-"ui.cursorline.secondary" = { bg = "base025" }
-
-"ui.selection" = { bg = "base0175" }
-"ui.selection.primary" = { bg = "base015" }
-
-"ui.virtual.indent-guide" = { fg = "base02" }
-"ui.virtual.ruler" = { bg = "base02" }
-
-# normal模式的光标
-# normal mode cursor
-"ui.cursor" = {fg = "base02", bg = "cyan"}
-"ui.cursor.insert" = {fg = "base03", bg = "base3"}
-# 当前光标匹配的标点符号
-# The punctuation character matched by the current cursor
-"ui.cursor.match" = { fg = "base02", bg = "base015" }
-
-"warning" = { fg = "orange", modifiers= ["bold", "underlined"] }
-"error" = { fg = "red", modifiers= ["bold", "underlined"] }
-"info" = { fg = "blue", modifiers= ["bold", "underlined"] }
-"hint" = { fg = "base01", modifiers= ["bold", "underlined"] }
-
-"diagnostic.warning" = { underline = { style = "curl", color = "orange" } }
-"diagnostic.error" = { underline = { style = "curl", color = "red" } }
-"diagnostic.info" = { underline = { style = "curl", color = "blue" } }
-"diagnostic.hint" = { underline = { style = "curl", color = "base01" } }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
-"diagnostic.deprecated" = { modifiers = ["crossed_out"] }
-
-
-[palette]
-red = '#dc322f'
-green = '#859900'
-yellow = '#b58900'
-blue = '#268bd2'
-magenta = '#d33682'
-cyan = '#2aa198'
-orange = '#cb4b16'
-violet = '#6c71c4'
-
-# 深色 越来越深
-# dark getting darker
-base0 = '#657b83'
-base1 = '#586e75'
-base2 = '#073642'
-base3 = '#002b36'
-
-# 浅色 越來越浅
-# Lighter and lighter
-base00 = '#839496'
-base01 = '#93a1a1'
-base015 = '#c5c8bd'
-base0175 = '#dddbcc'
-base02 = '#eee8d5'
-base025 = '#f5eedb'
-base03 = '#fdf6e3'
diff --git a/vendor/themes/tokyonight_day.toml b/vendor/themes/tokyonight_day.toml
deleted file mode 100644
index 18c3b45f..00000000
--- a/vendor/themes/tokyonight_day.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Author: Paul Graydon <[email protected]>
-
-inherits = "tokyonight"
-
-[palette]
-red = "#f52a65"
-orange = "#b15c00"
-yellow = "#8c6c3e"
-light-green = "#587539"
-green = "#387068"
-aqua = "#188092"
-teal = "#118c74"
-turquoise = "#006a83"
-light-cyan = "#2e5857"
-cyan = "#007197"
-blue = "#2e7de9"
-purple = "#7847bd"
-magenta = "#9854f1"
-comment = "#848cb5"
-black = "#a1a6c5"
-
-add = "#aecde6"
-change = "#d6d8e3"
-delete = "#dfccd4"
-
-error = "#c64343"
-hint = "#118c74"
-info = "#07879d"
-
-fg = "#3760bf"
-fg-dark = "#6172b0"
-fg-gutter = "#a8aecb"
-fg-linenr = "#68709a"
-fg-selected = "#b3b8d1"
-border = "#e9e9ed"
-border-highlight = "#2496ac"
-bg = "#e1e2e7"
-bg-inlay = "#acd7eb"
-bg-selection = "#c4c8da"
-bg-menu = "#e9e9ec"
-bg-focus = "#b6bfe2"
diff --git a/vendor/themes/tokyonight_moon.toml b/vendor/themes/tokyonight_moon.toml
deleted file mode 100644
index 09b38db3..00000000
--- a/vendor/themes/tokyonight_moon.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Author: Paul Graydon <[email protected]>
-
-inherits = "tokyonight"
-
-[palette]
-red = "#ff757f"
-orange = "#ff966c"
-yellow = "#ffc777"
-light-green = "#c3e88d"
-green = "#4fd6be"
-aqua = "#65bcff"
-teal = "#4fd6be"
-turquoise = "#89ddff"
-light-cyan = "#b4f9f8"
-cyan = "#86e1fc"
-blue = "#82aaff"
-purple = "#fca7ea"
-magenta = "#c099ff"
-comment = "#636da6"
-black = "#444a73"
-
-add = "#b8db87"
-change = "#7ca1f2"
-delete = "#e26a75"
-
-error = "#c53b53"
-hint = "#4fd6be"
-info = "#0db9d7"
-
-fg = "#c8d3f5"
-fg-dark = "#828bb8"
-fg-gutter = "#3b4261"
-fg-linenr = "#737aa2"
-fg-selected = "#363c58"
-border = "#1b1d2b"
-border-highlight = "#589ed7"
-bg = "#222436"
-bg-inlay = "#273644"
-bg-selection = "#2f334d"
-bg-menu = "#1e2030"
-bg-focus = "#2d3f76"
diff --git a/vendor/themes/tokyonight_storm.toml b/vendor/themes/tokyonight_storm.toml
deleted file mode 100644
index 7bdddd8b..00000000
--- a/vendor/themes/tokyonight_storm.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Author: Paul Graydon <[email protected]>
-
-inherits = "tokyonight"
-
-[palette]
-border = "#1d202f"
-bg = "#24283b"
-bg-inlay = "#233745"
-bg-selection = "#373d5a"
-bg-menu = "#1f2335"
-bg-focus = "#2e3c64"
-border-highlight = "#29a4bd"