From eede574f9ef57137e6d7e4bab37b09db636c5a56 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 30 Aug 2021 16:13:43 +0530 Subject: [PATCH] Cleanup kitty themes (#91) Makes them suitable for inclusion in https://github.com/kovidgoyal/kitty-themes --- extras/kitty_tokyonight_day.conf | 84 ++++++++++++++++-------------- extras/kitty_tokyonight_night.conf | 84 ++++++++++++++++-------------- extras/kitty_tokyonight_storm.conf | 84 ++++++++++++++++-------------- lua/tokyonight/extra/init.lua | 14 +++-- lua/tokyonight/extra/kitty.lua | 84 ++++++++++++++++-------------- 5 files changed, 191 insertions(+), 159 deletions(-) diff --git a/extras/kitty_tokyonight_day.conf b/extras/kitty_tokyonight_day.conf index f87aab2..f2d7425 100644 --- a/extras/kitty_tokyonight_day.conf +++ b/extras/kitty_tokyonight_day.conf @@ -1,40 +1,46 @@ - # TokyoNight colors for Kitty - - background #e1e2e7 - foreground #3760bf - selection_background #99a7df - selection_foreground #3760bf - url_color #387068 - cursor #3760bf - - # Tabs - active_tab_background #2e7de9 - active_tab_foreground #d4d6e4 - inactive_tab_background #c4c8da - inactive_tab_foreground #8990b3 - #tab_bar_background #e9e9ed - - # normal - color0 #e9e9ed - color1 #f52a65 - color2 #587539 - color3 #8c6c3e - color4 #2e7de9 - color5 #9854f1 - color6 #007197 - color7 #6172b0 - - # bright - color8 #a1a6c5 - color9 #f52a65 - color10 #587539 - color11 #8c6c3e - color12 #2e7de9 - color13 #9854f1 - color14 #007197 - color15 #3760bf - - # extended colors - color16 #b15c00 - color17 #c64343 +# vim:ft=kitty + +## name: Tokyo Night Day +## license: MIT +## author: Folke Lemaitre +## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_day.conf + + +background #e1e2e7 +foreground #3760bf +selection_background #99a7df +selection_foreground #3760bf +url_color #387068 +cursor #3760bf + +# Tabs +active_tab_background #2e7de9 +active_tab_foreground #d4d6e4 +inactive_tab_background #c4c8da +inactive_tab_foreground #8990b3 +#tab_bar_background #e9e9ed + +# normal +color0 #e9e9ed +color1 #f52a65 +color2 #587539 +color3 #8c6c3e +color4 #2e7de9 +color5 #9854f1 +color6 #007197 +color7 #6172b0 + +# bright +color8 #a1a6c5 +color9 #f52a65 +color10 #587539 +color11 #8c6c3e +color12 #2e7de9 +color13 #9854f1 +color14 #007197 +color15 #3760bf + +# extended colors +color16 #b15c00 +color17 #c64343 \ No newline at end of file diff --git a/extras/kitty_tokyonight_night.conf b/extras/kitty_tokyonight_night.conf index 3d9e2f0..6990002 100644 --- a/extras/kitty_tokyonight_night.conf +++ b/extras/kitty_tokyonight_night.conf @@ -1,40 +1,46 @@ - # TokyoNight colors for Kitty - - background #1a1b26 - foreground #c0caf5 - selection_background #33467C - selection_foreground #c0caf5 - url_color #73daca - cursor #c0caf5 - - # Tabs - active_tab_background #7aa2f7 - active_tab_foreground #1f2335 - inactive_tab_background #292e42 - inactive_tab_foreground #545c7e - #tab_bar_background #15161E - - # normal - color0 #15161E - color1 #f7768e - color2 #9ece6a - color3 #e0af68 - color4 #7aa2f7 - color5 #bb9af7 - color6 #7dcfff - color7 #a9b1d6 - - # bright - color8 #414868 - color9 #f7768e - color10 #9ece6a - color11 #e0af68 - color12 #7aa2f7 - color13 #bb9af7 - color14 #7dcfff - color15 #c0caf5 - - # extended colors - color16 #ff9e64 - color17 #db4b4b +# vim:ft=kitty + +## name: Tokyo Night +## license: MIT +## author: Folke Lemaitre +## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_night.conf + + +background #1a1b26 +foreground #c0caf5 +selection_background #33467C +selection_foreground #c0caf5 +url_color #73daca +cursor #c0caf5 + +# Tabs +active_tab_background #7aa2f7 +active_tab_foreground #1f2335 +inactive_tab_background #292e42 +inactive_tab_foreground #545c7e +#tab_bar_background #15161E + +# normal +color0 #15161E +color1 #f7768e +color2 #9ece6a +color3 #e0af68 +color4 #7aa2f7 +color5 #bb9af7 +color6 #7dcfff +color7 #a9b1d6 + +# bright +color8 #414868 +color9 #f7768e +color10 #9ece6a +color11 #e0af68 +color12 #7aa2f7 +color13 #bb9af7 +color14 #7dcfff +color15 #c0caf5 + +# extended colors +color16 #ff9e64 +color17 #db4b4b \ No newline at end of file diff --git a/extras/kitty_tokyonight_storm.conf b/extras/kitty_tokyonight_storm.conf index 8e3ab96..33c65bc 100644 --- a/extras/kitty_tokyonight_storm.conf +++ b/extras/kitty_tokyonight_storm.conf @@ -1,40 +1,46 @@ - # TokyoNight colors for Kitty - - background #24283b - foreground #c0caf5 - selection_background #364A82 - selection_foreground #c0caf5 - url_color #73daca - cursor #c0caf5 - - # Tabs - active_tab_background #7aa2f7 - active_tab_foreground #1f2335 - inactive_tab_background #292e42 - inactive_tab_foreground #545c7e - #tab_bar_background #1D202F - - # normal - color0 #1D202F - color1 #f7768e - color2 #9ece6a - color3 #e0af68 - color4 #7aa2f7 - color5 #bb9af7 - color6 #7dcfff - color7 #a9b1d6 - - # bright - color8 #414868 - color9 #f7768e - color10 #9ece6a - color11 #e0af68 - color12 #7aa2f7 - color13 #bb9af7 - color14 #7dcfff - color15 #c0caf5 - - # extended colors - color16 #ff9e64 - color17 #db4b4b +# vim:ft=kitty + +## name: Tokyo Night Storm +## license: MIT +## author: Folke Lemaitre +## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_storm.conf + + +background #24283b +foreground #c0caf5 +selection_background #364A82 +selection_foreground #c0caf5 +url_color #73daca +cursor #c0caf5 + +# Tabs +active_tab_background #7aa2f7 +active_tab_foreground #1f2335 +inactive_tab_background #292e42 +inactive_tab_foreground #545c7e +#tab_bar_background #1D202F + +# normal +color0 #1D202F +color1 #f7768e +color2 #9ece6a +color3 #e0af68 +color4 #7aa2f7 +color5 #bb9af7 +color6 #7dcfff +color7 #a9b1d6 + +# bright +color8 #414868 +color9 #f7768e +color10 #9ece6a +color11 #e0af68 +color12 #7aa2f7 +color13 #bb9af7 +color14 #7dcfff +color15 #c0caf5 + +# extended colors +color16 #ff9e64 +color17 #db4b4b \ No newline at end of file diff --git a/lua/tokyonight/extra/init.lua b/lua/tokyonight/extra/init.lua index d1a44f3..a584b92 100644 --- a/lua/tokyonight/extra/init.lua +++ b/lua/tokyonight/extra/init.lua @@ -19,15 +19,23 @@ local extras = { xresources = "Xresources", xfceterm = "theme", } -local styles = { "storm", "night", "day" } +-- map of style to style name +local styles = { + storm = " Storm", + night = "", + day = " Day", +} for extra, ext in pairs(extras) do local plugin = require("tokyonight.extra." .. extra) - for _, style in pairs(styles) do + for style, style_name in pairs(styles) do config.style = style config = config or require("tokyonight.config") config.transform_colors = true local colors = require("tokyonight.colors").setup(config) - write(plugin.generate(colors), extra .. "_tokyonight_" .. style .. "." .. ext) + local fname = extra .. "_tokyonight_" .. style .. "." .. ext + colors["_upstream_url"] = "https://github.com/folke/tokyonight.nvim/raw/main/extras/" .. fname + colors["_style_name"] = "Tokyo Night" .. style_name + write(plugin.generate(colors), fname) end end diff --git a/lua/tokyonight/extra/kitty.lua b/lua/tokyonight/extra/kitty.lua index 006c829..6ce7b88 100644 --- a/lua/tokyonight/extra/kitty.lua +++ b/lua/tokyonight/extra/kitty.lua @@ -6,45 +6,51 @@ local M = {} function M.generate(colors) local kitty = util.template( [[ - # TokyoNight colors for Kitty - - background ${bg} - foreground ${fg} - selection_background ${bg_visual} - selection_foreground ${fg} - url_color ${green1} - cursor ${fg} - - # Tabs - active_tab_background ${blue} - active_tab_foreground ${bg_dark} - inactive_tab_background ${bg_highlight} - inactive_tab_foreground ${dark3} - #tab_bar_background ${black} - - # normal - color0 ${black} - color1 ${red} - color2 ${green} - color3 ${yellow} - color4 ${blue} - color5 ${magenta} - color6 ${cyan} - color7 ${fg_dark} - - # bright - color8 ${terminal_black} - color9 ${red} - color10 ${green} - color11 ${yellow} - color12 ${blue} - color13 ${magenta} - color14 ${cyan} - color15 ${fg} - - # extended colors - color16 ${orange} - color17 ${red1} +# vim:ft=kitty + +## name: ${_style_name} +## license: MIT +## author: Folke Lemaitre +## upstream: ${_upstream_url} + + +background ${bg} +foreground ${fg} +selection_background ${bg_visual} +selection_foreground ${fg} +url_color ${green1} +cursor ${fg} + +# Tabs +active_tab_background ${blue} +active_tab_foreground ${bg_dark} +inactive_tab_background ${bg_highlight} +inactive_tab_foreground ${dark3} +#tab_bar_background ${black} + +# normal +color0 ${black} +color1 ${red} +color2 ${green} +color3 ${yellow} +color4 ${blue} +color5 ${magenta} +color6 ${cyan} +color7 ${fg_dark} + +# bright +color8 ${terminal_black} +color9 ${red} +color10 ${green} +color11 ${yellow} +color12 ${blue} +color13 ${magenta} +color14 ${cyan} +color15 ${fg} + +# extended colors +color16 ${orange} +color17 ${red1} ]], colors )