From dd8d4a04f423cd4c96dac825dcf2b489c301a003 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Mon, 20 Mar 2023 12:36:52 -0700 Subject: [PATCH] sync from https://github.com/folke/tokyonight.nvim Pull in the enhanced scheme that includes wezterm metadata and colors. Co-authored-by: Thomas Croft <103956335+thomascft@users.noreply.github.com> closes: https://github.com/wez/wezterm/pull/3208 --- config/src/scheme_data.rs | 9 +- docs/changelog.md | 3 +- docs/colorschemes/data.json | 315 ++++++++++++++++++++++++++++----- sync-color-schemes/src/main.rs | 17 +- 4 files changed, 291 insertions(+), 53 deletions(-) diff --git a/config/src/scheme_data.rs b/config/src/scheme_data.rs index 525c736be..e9e4cf60a 100644 --- a/config/src/scheme_data.rs +++ b/config/src/scheme_data.rs @@ -1,6 +1,6 @@ //! This file was generated by sync-color-schemes -pub const SCHEMES: [(&'static str, &'static str); 745] = [ +pub const SCHEMES: [(&'static str, &'static str); 746] = [ // Start here ("3024 (base16)", "[colors]\nansi = [\n \"#090300\",\n \"#db2d20\",\n \"#01a252\",\n \"#fded02\",\n \"#01a0e4\",\n \"#a16a94\",\n \"#b5e4f4\",\n \"#a5a2a2\",\n]\nbackground = \"#090300\"\nbrights = [\n \"#5c5855\",\n \"#db2d20\",\n \"#01a252\",\n \"#fded02\",\n \"#01a0e4\",\n \"#a16a94\",\n \"#b5e4f4\",\n \"#f7f7f7\",\n]\ncursor_bg = \"#a5a2a2\"\ncursor_border = \"#a5a2a2\"\ncursor_fg = \"#090300\"\nforeground = \"#a5a2a2\"\nselection_bg = \"#a5a2a2\"\nselection_fg = \"#090300\"\n\n[colors.indexed]\n16 = \"#e8bbd0\"\n17 = \"#cdab53\"\n18 = \"#3a3432\"\n19 = \"#4a4543\"\n20 = \"#807d7c\"\n21 = \"#d6d5d4\"\n\n[metadata]\naliases = [\"3024 (dark) (terminal.sexy)\"]\nauthor = \"Jan T. Sott (http://github.com/idleberg)\"\nname = \"3024 (base16)\"\norigin_url = \"https://github.com/chriskempson/base16-unclaimed-schemes\"\nwezterm_version = \"20220807-113146-c2fee766\"\n"), @@ -670,9 +670,10 @@ pub const SCHEMES: [(&'static str, &'static str); 745] = [ ("Tokyo Night (Gogh)", "[colors]\nansi = [\n \"#414868\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#a9b1d6\",\n]\nbackground = \"#1a1b26\"\nbrights = [\n \"#414868\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#c0caf5\",\n]\ncursor_bg = \"#c0caf5\"\ncursor_border = \"#c0caf5\"\ncursor_fg = \"#c0caf5\"\nforeground = \"#c0caf5\"\n\n[colors.indexed]\n\n[metadata]\naliases = [\"TokyoNight (Gogh)\"]\nname = \"Tokyo Night (Gogh)\"\norigin_url = \"https://github.com/Gogh-Co/Gogh\"\nwezterm_version = \"20220807-113146-c2fee766\"\n"), ("Tokyo Night Light (Gogh)", "[colors]\nansi = [\n \"#0f0f14\",\n \"#8c4351\",\n \"#485e30\",\n \"#8f5e15\",\n \"#34548a\",\n \"#5a4a78\",\n \"#0f4b6e\",\n \"#343b58\",\n]\nbackground = \"#d5d6db\"\nbrights = [\n \"#9699a3\",\n \"#8c4351\",\n \"#485e30\",\n \"#8f5e15\",\n \"#34548a\",\n \"#5a4a78\",\n \"#0f4b6e\",\n \"#343b58\",\n]\ncursor_bg = \"#565a6e\"\ncursor_border = \"#565a6e\"\ncursor_fg = \"#565a6e\"\nforeground = \"#565a6e\"\n\n[colors.indexed]\n\n[metadata]\naliases = [\"TokyoNightLight (Gogh)\"]\nname = \"Tokyo Night Light (Gogh)\"\norigin_url = \"https://github.com/Gogh-Co/Gogh\"\nwezterm_version = \"20220807-113146-c2fee766\"\n"), ("Tokyo Night Storm (Gogh)", "[colors]\nansi = [\n \"#414868\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#c0caf5\",\n]\nbackground = \"#24283b\"\nbrights = [\n \"#414868\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#c0caf5\",\n]\ncursor_bg = \"#c0caf5\"\ncursor_border = \"#c0caf5\"\ncursor_fg = \"#c0caf5\"\nforeground = \"#c0caf5\"\n\n[colors.indexed]\n\n[metadata]\naliases = [\"TokyoNightStorm (Gogh)\"]\nname = \"Tokyo Night Storm (Gogh)\"\norigin_url = \"https://github.com/Gogh-Co/Gogh\"\nwezterm_version = \"20220807-113146-c2fee766\"\n"), -("tokyonight", "[colors]\nansi = [\n \"#15161e\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#a9b1d6\",\n]\nbackground = \"#1a1b26\"\nbrights = [\n \"#414868\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#c0caf5\",\n]\ncursor_bg = \"#c0caf5\"\ncursor_border = \"#c0caf5\"\ncursor_fg = \"#15161e\"\nforeground = \"#c0caf5\"\nselection_bg = \"#33467c\"\nselection_fg = \"#c0caf5\"\n\n[colors.indexed]\n\n[metadata]\naliases = []\nname = \"tokyonight\"\norigin_url = \"https://github.com/mbadolato/iTerm2-Color-Schemes\"\nwezterm_version = \"Always\"\n"), -("tokyonight-day", "[colors]\nansi = [\n \"#e9e9ed\",\n \"#f52a65\",\n \"#587539\",\n \"#8c6c3e\",\n \"#2e7de9\",\n \"#9854f1\",\n \"#007197\",\n \"#6172b0\",\n]\nbackground = \"#e1e2e7\"\nbrights = [\n \"#a1a6c5\",\n \"#f52a65\",\n \"#587539\",\n \"#8c6c3e\",\n \"#2e7de9\",\n \"#9854f1\",\n \"#007197\",\n \"#3760bf\",\n]\ncursor_bg = \"#3760bf\"\ncursor_border = \"#3760bf\"\ncursor_fg = \"#e1e2e7\"\nforeground = \"#3760bf\"\nselection_bg = \"#99a7df\"\nselection_fg = \"#3760bf\"\n\n[colors.indexed]\n\n[metadata]\naliases = []\nname = \"tokyonight-day\"\norigin_url = \"https://github.com/mbadolato/iTerm2-Color-Schemes\"\nwezterm_version = \"Always\"\n"), -("tokyonight-storm", "[colors]\nansi = [\n \"#1d202f\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#a9b1d6\",\n]\nbackground = \"#24283b\"\nbrights = [\n \"#414868\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#c0caf5\",\n]\ncursor_bg = \"#c0caf5\"\ncursor_border = \"#c0caf5\"\ncursor_fg = \"#1d202f\"\nforeground = \"#c0caf5\"\nselection_bg = \"#364a82\"\nselection_fg = \"#c0caf5\"\n\n[colors.indexed]\n\n[metadata]\naliases = []\nname = \"tokyonight-storm\"\norigin_url = \"https://github.com/mbadolato/iTerm2-Color-Schemes\"\nwezterm_version = \"Always\"\n"), +("tokyonight_day", "[colors]\nansi = [\n \"#e9e9ed\",\n \"#f52a65\",\n \"#587539\",\n \"#8c6c3e\",\n \"#2e7de9\",\n \"#9854f1\",\n \"#007197\",\n \"#6172b0\",\n]\nbackground = \"#e1e2e7\"\nbrights = [\n \"#a1a6c5\",\n \"#f52a65\",\n \"#587539\",\n \"#8c6c3e\",\n \"#2e7de9\",\n \"#9854f1\",\n \"#007197\",\n \"#3760bf\",\n]\ncursor_bg = \"#3760bf\"\ncursor_border = \"#3760bf\"\ncursor_fg = \"#e1e2e7\"\nforeground = \"#3760bf\"\nselection_bg = \"#99a7df\"\nselection_fg = \"#3760bf\"\n\n[colors.indexed]\n\n[colors.tab_bar]\nbackground = \"#191b28\"\ninactive_tab_edge = \"#e9e9ec\"\n\n[colors.tab_bar.active_tab]\nbg_color = \"#e1e2e7\"\nfg_color = \"#2e7de9\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.inactive_tab]\nbg_color = \"#e9e9ec\"\nfg_color = \"#8990b3\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.inactive_tab_hover]\nbg_color = \"#e9e9ec\"\nfg_color = \"#2e7de9\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.new_tab]\nbg_color = \"#191b28\"\nfg_color = \"#2e7de9\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.new_tab_hover]\nbg_color = \"#2e7de9\"\nfg_color = \"#e9e9ec\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[metadata]\naliases = [\"tokyonight-day\"]\nname = \"tokyonight_day\"\norigin_url = \"https://github.com/folke/tokyonight.nvim\"\nwezterm_version = \"Always\"\n"), +("tokyonight_moon", "[colors]\nansi = [\n \"#1b1d2b\",\n \"#ff757f\",\n \"#c3e88d\",\n \"#ffc777\",\n \"#82aaff\",\n \"#c099ff\",\n \"#86e1fc\",\n \"#828bb8\",\n]\nbackground = \"#222436\"\nbrights = [\n \"#444a73\",\n \"#ff757f\",\n \"#c3e88d\",\n \"#ffc777\",\n \"#82aaff\",\n \"#c099ff\",\n \"#86e1fc\",\n \"#c8d3f5\",\n]\ncursor_bg = \"#c8d3f5\"\ncursor_border = \"#c8d3f5\"\ncursor_fg = \"#222436\"\nforeground = \"#c8d3f5\"\nselection_bg = \"#3654a7\"\nselection_fg = \"#c8d3f5\"\n\n[colors.indexed]\n\n[colors.tab_bar]\nbackground = \"#191b28\"\ninactive_tab_edge = \"#1e2030\"\n\n[colors.tab_bar.active_tab]\nbg_color = \"#222436\"\nfg_color = \"#82aaff\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.inactive_tab]\nbg_color = \"#1e2030\"\nfg_color = \"#545c7e\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.inactive_tab_hover]\nbg_color = \"#1e2030\"\nfg_color = \"#82aaff\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.new_tab]\nbg_color = \"#191b28\"\nfg_color = \"#82aaff\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.new_tab_hover]\nbg_color = \"#82aaff\"\nfg_color = \"#1e2030\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[metadata]\naliases = []\nname = \"tokyonight_moon\"\norigin_url = \"https://github.com/folke/tokyonight.nvim\"\nwezterm_version = \"nightly builds only\"\n"), +("tokyonight_night", "[colors]\nansi = [\n \"#15161e\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#a9b1d6\",\n]\nbackground = \"#1a1b26\"\nbrights = [\n \"#414868\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#c0caf5\",\n]\ncursor_bg = \"#c0caf5\"\ncursor_border = \"#c0caf5\"\ncursor_fg = \"#1a1b26\"\nforeground = \"#c0caf5\"\nselection_bg = \"#33467c\"\nselection_fg = \"#c0caf5\"\n\n[colors.indexed]\n\n[colors.tab_bar]\nbackground = \"#191b28\"\ninactive_tab_edge = \"#16161e\"\n\n[colors.tab_bar.active_tab]\nbg_color = \"#1a1b26\"\nfg_color = \"#7aa2f7\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.inactive_tab]\nbg_color = \"#16161e\"\nfg_color = \"#545c7e\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.inactive_tab_hover]\nbg_color = \"#16161e\"\nfg_color = \"#7aa2f7\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.new_tab]\nbg_color = \"#191b28\"\nfg_color = \"#7aa2f7\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.new_tab_hover]\nbg_color = \"#7aa2f7\"\nfg_color = \"#16161e\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[metadata]\naliases = [\"tokyonight\"]\nname = \"tokyonight_night\"\norigin_url = \"https://github.com/folke/tokyonight.nvim\"\nwezterm_version = \"Always\"\n"), +("tokyonight_storm", "[colors]\nansi = [\n \"#1d202f\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#a9b1d6\",\n]\nbackground = \"#24283b\"\nbrights = [\n \"#414868\",\n \"#f7768e\",\n \"#9ece6a\",\n \"#e0af68\",\n \"#7aa2f7\",\n \"#bb9af7\",\n \"#7dcfff\",\n \"#c0caf5\",\n]\ncursor_bg = \"#c0caf5\"\ncursor_border = \"#c0caf5\"\ncursor_fg = \"#24283b\"\nforeground = \"#c0caf5\"\nselection_bg = \"#364a82\"\nselection_fg = \"#c0caf5\"\n\n[colors.indexed]\n\n[colors.tab_bar]\nbackground = \"#191b28\"\ninactive_tab_edge = \"#1f2335\"\n\n[colors.tab_bar.active_tab]\nbg_color = \"#24283b\"\nfg_color = \"#7aa2f7\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.inactive_tab]\nbg_color = \"#1f2335\"\nfg_color = \"#545c7e\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.inactive_tab_hover]\nbg_color = \"#1f2335\"\nfg_color = \"#7aa2f7\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.new_tab]\nbg_color = \"#191b28\"\nfg_color = \"#7aa2f7\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[colors.tab_bar.new_tab_hover]\nbg_color = \"#7aa2f7\"\nfg_color = \"#1f2335\"\nintensity = \"Normal\"\nitalic = false\nstrikethrough = false\nunderline = \"None\"\n\n[metadata]\naliases = [\"tokyonight-storm\"]\nname = \"tokyonight_storm\"\norigin_url = \"https://github.com/folke/tokyonight.nvim\"\nwezterm_version = \"Always\"\n"), ("Tomorrow", "[colors]\nansi = [\n \"#000000\",\n \"#c82829\",\n \"#718c00\",\n \"#eab700\",\n \"#4271ae\",\n \"#8959a8\",\n \"#3e999f\",\n \"#ffffff\",\n]\nbackground = \"#ffffff\"\nbrights = [\n \"#000000\",\n \"#c82829\",\n \"#718c00\",\n \"#eab700\",\n \"#4271ae\",\n \"#8959a8\",\n \"#3e999f\",\n \"#ffffff\",\n]\ncursor_bg = \"#4d4d4c\"\ncursor_border = \"#4d4d4c\"\ncursor_fg = \"#ffffff\"\nforeground = \"#4d4d4c\"\nselection_bg = \"#d6d6d6\"\nselection_fg = \"#4d4d4c\"\n\n[colors.indexed]\n\n[metadata]\naliases = []\nname = \"Tomorrow\"\norigin_url = \"https://github.com/mbadolato/iTerm2-Color-Schemes\"\nwezterm_version = \"Always\"\n"), ("Tomorrow (dark) (terminal.sexy)", "[colors]\nansi = [\n \"#1d1f21\",\n \"#cc6666\",\n \"#b5bd68\",\n \"#f0c674\",\n \"#81a2be\",\n \"#b294bb\",\n \"#8abeb7\",\n \"#c5c8c6\",\n]\nbackground = \"#1d1f21\"\nbrights = [\n \"#969896\",\n \"#cc6666\",\n \"#b5bd68\",\n \"#f0c674\",\n \"#81a2be\",\n \"#b294bb\",\n \"#8abeb7\",\n \"#ffffff\",\n]\nforeground = \"#c5c8c6\"\n\n[colors.indexed]\n\n[metadata]\naliases = []\nauthor = \"Chris Kempson\"\nname = \"Tomorrow (dark) (terminal.sexy)\"\norigin_url = \"https://github.com/stayradiated/terminal.sexy\"\nwezterm_version = \"20220807-113146-c2fee766\"\n"), ("Tomorrow (Gogh)", "[colors]\nansi = [\n \"#000000\",\n \"#c82828\",\n \"#718c00\",\n \"#eab700\",\n \"#4171ae\",\n \"#8959a8\",\n \"#3e999f\",\n \"#fffefe\",\n]\nbackground = \"#ffffff\"\nbrights = [\n \"#000000\",\n \"#c82828\",\n \"#708b00\",\n \"#e9b600\",\n \"#4170ae\",\n \"#8958a7\",\n \"#3d999f\",\n \"#fffefe\",\n]\ncursor_bg = \"#4c4c4c\"\ncursor_border = \"#4c4c4c\"\ncursor_fg = \"#4c4c4c\"\nforeground = \"#4d4d4c\"\n\n[colors.indexed]\n\n[metadata]\naliases = []\nname = \"Tomorrow (Gogh)\"\norigin_url = \"https://github.com/Gogh-Co/Gogh\"\nwezterm_version = \"20220807-113146-c2fee766\"\n"), diff --git a/docs/changelog.md b/docs/changelog.md index 5dc4cfe69..2a1c9989e 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -56,7 +56,8 @@ As features stabilize some brief notes about them will accumulate here. [rose-pine](colorschemes/r/index.md#rose-pine), [rose-pine-dawn](colorschemes/r/index.md#rose-pine-dawn), [rose-pine-moon](colorschemes/r/index.md#rose-pine-moon), - [Solarized (dark) (terminal.sexy)](colorschemes/s/index.md#solarized-dark-terminal-sexy) + [Solarized (dark) (terminal.sexy)](colorschemes/s/index.md#solarized-dark-terminal-sexy), + [tokyonight_moon](colorschemes/t/index.md#tokyonight-moon) * [window:focus()](config/lua/window/focus.md), [ActivateWindow](config/lua/keyassignment/ActivateWindow.md), [ActivateWindowRelative](config/lua/keyassignment/ActivateWindowRelative.md), diff --git a/docs/colorschemes/data.json b/docs/colorschemes/data.json index 6979377fb..003c98284 100644 --- a/docs/colorschemes/data.json +++ b/docs/colorschemes/data.json @@ -27751,45 +27751,6 @@ "wezterm_version": "20220807-113146-c2fee766" } }, - { - "colors": { - "ansi": [ - "#15161e", - "#f7768e", - "#9ece6a", - "#e0af68", - "#7aa2f7", - "#bb9af7", - "#7dcfff", - "#a9b1d6" - ], - "background": "#1a1b26", - "brights": [ - "#414868", - "#f7768e", - "#9ece6a", - "#e0af68", - "#7aa2f7", - "#bb9af7", - "#7dcfff", - "#c0caf5" - ], - "cursor_bg": "#c0caf5", - "cursor_border": "#c0caf5", - "cursor_fg": "#15161e", - "foreground": "#c0caf5", - "indexed": {}, - "selection_bg": "#33467c", - "selection_fg": "#c0caf5" - }, - "metadata": { - "aliases": [], - "name": "tokyonight", - "origin_url": "https://github.com/mbadolato/iTerm2-Color-Schemes", - "prefix": "t", - "wezterm_version": "Always" - } - }, { "colors": { "ansi": [ @@ -27819,12 +27780,226 @@ "foreground": "#3760bf", "indexed": {}, "selection_bg": "#99a7df", - "selection_fg": "#3760bf" + "selection_fg": "#3760bf", + "tab_bar": { + "active_tab": { + "bg_color": "#e1e2e7", + "fg_color": "#2e7de9", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "background": "#191b28", + "inactive_tab": { + "bg_color": "#e9e9ec", + "fg_color": "#8990b3", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "inactive_tab_edge": "#e9e9ec", + "inactive_tab_hover": { + "bg_color": "#e9e9ec", + "fg_color": "#2e7de9", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "new_tab": { + "bg_color": "#191b28", + "fg_color": "#2e7de9", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "new_tab_hover": { + "bg_color": "#2e7de9", + "fg_color": "#e9e9ec", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + } + } + }, + "metadata": { + "aliases": [ + "tokyonight-day" + ], + "name": "tokyonight_day", + "origin_url": "https://github.com/folke/tokyonight.nvim", + "prefix": "t", + "wezterm_version": "Always" + } + }, + { + "colors": { + "ansi": [ + "#1b1d2b", + "#ff757f", + "#c3e88d", + "#ffc777", + "#82aaff", + "#c099ff", + "#86e1fc", + "#828bb8" + ], + "background": "#222436", + "brights": [ + "#444a73", + "#ff757f", + "#c3e88d", + "#ffc777", + "#82aaff", + "#c099ff", + "#86e1fc", + "#c8d3f5" + ], + "cursor_bg": "#c8d3f5", + "cursor_border": "#c8d3f5", + "cursor_fg": "#222436", + "foreground": "#c8d3f5", + "indexed": {}, + "selection_bg": "#3654a7", + "selection_fg": "#c8d3f5", + "tab_bar": { + "active_tab": { + "bg_color": "#222436", + "fg_color": "#82aaff", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "background": "#191b28", + "inactive_tab": { + "bg_color": "#1e2030", + "fg_color": "#545c7e", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "inactive_tab_edge": "#1e2030", + "inactive_tab_hover": { + "bg_color": "#1e2030", + "fg_color": "#82aaff", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "new_tab": { + "bg_color": "#191b28", + "fg_color": "#82aaff", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "new_tab_hover": { + "bg_color": "#82aaff", + "fg_color": "#1e2030", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + } + } }, "metadata": { "aliases": [], - "name": "tokyonight-day", - "origin_url": "https://github.com/mbadolato/iTerm2-Color-Schemes", + "name": "tokyonight_moon", + "origin_url": "https://github.com/folke/tokyonight.nvim", + "prefix": "t", + "wezterm_version": "nightly builds only" + } + }, + { + "colors": { + "ansi": [ + "#15161e", + "#f7768e", + "#9ece6a", + "#e0af68", + "#7aa2f7", + "#bb9af7", + "#7dcfff", + "#a9b1d6" + ], + "background": "#1a1b26", + "brights": [ + "#414868", + "#f7768e", + "#9ece6a", + "#e0af68", + "#7aa2f7", + "#bb9af7", + "#7dcfff", + "#c0caf5" + ], + "cursor_bg": "#c0caf5", + "cursor_border": "#c0caf5", + "cursor_fg": "#1a1b26", + "foreground": "#c0caf5", + "indexed": {}, + "selection_bg": "#33467c", + "selection_fg": "#c0caf5", + "tab_bar": { + "active_tab": { + "bg_color": "#1a1b26", + "fg_color": "#7aa2f7", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "background": "#191b28", + "inactive_tab": { + "bg_color": "#16161e", + "fg_color": "#545c7e", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "inactive_tab_edge": "#16161e", + "inactive_tab_hover": { + "bg_color": "#16161e", + "fg_color": "#7aa2f7", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "new_tab": { + "bg_color": "#191b28", + "fg_color": "#7aa2f7", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "new_tab_hover": { + "bg_color": "#7aa2f7", + "fg_color": "#16161e", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + } + } + }, + "metadata": { + "aliases": [ + "tokyonight" + ], + "name": "tokyonight_night", + "origin_url": "https://github.com/folke/tokyonight.nvim", "prefix": "t", "wezterm_version": "Always" } @@ -27854,16 +28029,62 @@ ], "cursor_bg": "#c0caf5", "cursor_border": "#c0caf5", - "cursor_fg": "#1d202f", + "cursor_fg": "#24283b", "foreground": "#c0caf5", "indexed": {}, "selection_bg": "#364a82", - "selection_fg": "#c0caf5" + "selection_fg": "#c0caf5", + "tab_bar": { + "active_tab": { + "bg_color": "#24283b", + "fg_color": "#7aa2f7", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "background": "#191b28", + "inactive_tab": { + "bg_color": "#1f2335", + "fg_color": "#545c7e", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "inactive_tab_edge": "#1f2335", + "inactive_tab_hover": { + "bg_color": "#1f2335", + "fg_color": "#7aa2f7", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "new_tab": { + "bg_color": "#191b28", + "fg_color": "#7aa2f7", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + }, + "new_tab_hover": { + "bg_color": "#7aa2f7", + "fg_color": "#1f2335", + "intensity": "Normal", + "italic": false, + "strikethrough": false, + "underline": "None" + } + } }, "metadata": { - "aliases": [], - "name": "tokyonight-storm", - "origin_url": "https://github.com/mbadolato/iTerm2-Color-Schemes", + "aliases": [ + "tokyonight-storm" + ], + "name": "tokyonight_storm", + "origin_url": "https://github.com/folke/tokyonight.nvim", "prefix": "t", "wezterm_version": "Always" } diff --git a/sync-color-schemes/src/main.rs b/sync-color-schemes/src/main.rs index 5992cc18e..f781dcac5 100644 --- a/sync-color-schemes/src/main.rs +++ b/sync-color-schemes/src/main.rs @@ -148,6 +148,14 @@ fn bake_for_config(mut schemeses: Vec) -> anyhow::Result<()> { if let Some(version) = version_by_color_scheme .get(&ident) .or_else(|| version_by_name.get(&scheme.name)) + .or_else(|| { + for a in &scheme.data.metadata.aliases { + if let Some(v) = version_by_name.get(a) { + return Some(v); + } + } + None + }) { scheme .data @@ -225,7 +233,7 @@ pub const SCHEMES: [(&'static str, &'static str); {count}] = [\n } } if !new_items.is_empty() { - println!("* Color schemes: {}", new_items.join(", ")); + println!("* Color schemes: {}", new_items.join(",\n ")); } // And the data for the docs @@ -376,6 +384,13 @@ async fn main() -> anyhow::Result<()> { &mut schemeses, ) .await?; + sync_toml( + "https://github.com/folke/tokyonight.nvim", + "main", + "", + &mut schemeses, + ) + .await?; accumulate( &mut schemeses, iterm2::sync_iterm2().await.context("sync iterm2")?,