Cleanup kitty themes (#91)

Makes them suitable for inclusion in
https://github.com/kovidgoyal/kitty-themes

extras/kitty_tokyonight_day.conf

@@ -1,40 +1,46 @@
-  # TokyoNight colors for Kitty
+# vim:ft=kitty
 
-  background #e1e2e7
+## name: Tokyo Night Day
-  foreground #3760bf
+## license: MIT
-  selection_background #99a7df
+## author: Folke Lemaitre
-  selection_foreground #3760bf
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_day.conf
-  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
+background #e1e2e7
-  color0 #e9e9ed
+foreground #3760bf
-  color1 #f52a65
+selection_background #99a7df
-  color2 #587539
+selection_foreground #3760bf
-  color3 #8c6c3e
+url_color #387068
-  color4 #2e7de9
+cursor #3760bf
-  color5 #9854f1
-  color6 #007197
-  color7 #6172b0
 
-  # bright
+# Tabs
-  color8 #a1a6c5
+active_tab_background #2e7de9
-  color9 #f52a65
+active_tab_foreground #d4d6e4
-  color10 #587539
+inactive_tab_background #c4c8da
-  color11 #8c6c3e
+inactive_tab_foreground #8990b3
-  color12 #2e7de9
+#tab_bar_background #e9e9ed
-  color13 #9854f1
-  color14 #007197
-  color15 #3760bf
 
-  # extended colors
+# normal
-  color16 #b15c00
+color0 #e9e9ed
-  color17 #c64343
+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
   

extras/kitty_tokyonight_night.conf

@@ -1,40 +1,46 @@
-  # TokyoNight colors for Kitty
+# vim:ft=kitty
 
-  background #1a1b26
+## name: Tokyo Night
-  foreground #c0caf5
+## license: MIT
-  selection_background #33467C
+## author: Folke Lemaitre
-  selection_foreground #c0caf5
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_night.conf
-  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
+background #1a1b26
-  color0 #15161E
+foreground #c0caf5
-  color1 #f7768e
+selection_background #33467C
-  color2 #9ece6a
+selection_foreground #c0caf5
-  color3 #e0af68
+url_color #73daca
-  color4 #7aa2f7
+cursor #c0caf5
-  color5 #bb9af7
-  color6 #7dcfff
-  color7 #a9b1d6
 
-  # bright
+# Tabs
-  color8 #414868
+active_tab_background #7aa2f7
-  color9 #f7768e
+active_tab_foreground #1f2335
-  color10 #9ece6a
+inactive_tab_background #292e42
-  color11 #e0af68
+inactive_tab_foreground #545c7e
-  color12 #7aa2f7
+#tab_bar_background #15161E
-  color13 #bb9af7
-  color14 #7dcfff
-  color15 #c0caf5
 
-  # extended colors
+# normal
-  color16 #ff9e64
+color0 #15161E
-  color17 #db4b4b
+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
   

extras/kitty_tokyonight_storm.conf

@@ -1,40 +1,46 @@
-  # TokyoNight colors for Kitty
+# vim:ft=kitty
 
-  background #24283b
+## name: Tokyo Night Storm
-  foreground #c0caf5
+## license: MIT
-  selection_background #364A82
+## author: Folke Lemaitre
-  selection_foreground #c0caf5
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_storm.conf
-  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
+background #24283b
-  color0 #1D202F
+foreground #c0caf5
-  color1 #f7768e
+selection_background #364A82
-  color2 #9ece6a
+selection_foreground #c0caf5
-  color3 #e0af68
+url_color #73daca
-  color4 #7aa2f7
+cursor #c0caf5
-  color5 #bb9af7
-  color6 #7dcfff
-  color7 #a9b1d6
 
-  # bright
+# Tabs
-  color8 #414868
+active_tab_background #7aa2f7
-  color9 #f7768e
+active_tab_foreground #1f2335
-  color10 #9ece6a
+inactive_tab_background #292e42
-  color11 #e0af68
+inactive_tab_foreground #545c7e
-  color12 #7aa2f7
+#tab_bar_background #1D202F
-  color13 #bb9af7
-  color14 #7dcfff
-  color15 #c0caf5
 
-  # extended colors
+# normal
-  color16 #ff9e64
+color0 #1D202F
-  color17 #db4b4b
+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
   

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

lua/tokyonight/extra/kitty.lua

@@ -6,45 +6,51 @@ local M = {}
 function M.generate(colors)
   local kitty = util.template(
     [[
-  # TokyoNight colors for Kitty
+# vim:ft=kitty
 
-  background ${bg}
+## name: ${_style_name}
-  foreground ${fg}
+## license: MIT
-  selection_background ${bg_visual}
+## author: Folke Lemaitre
-  selection_foreground ${fg}
+## upstream: ${_upstream_url}
-  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
+background ${bg}
-  color0 ${black}
+foreground ${fg}
-  color1 ${red}
+selection_background ${bg_visual}
-  color2 ${green}
+selection_foreground ${fg}
-  color3 ${yellow}
+url_color ${green1}
-  color4 ${blue}
+cursor ${fg}
-  color5 ${magenta}
-  color6 ${cyan}
-  color7 ${fg_dark}
 
-  # bright
+# Tabs
-  color8 ${terminal_black}
+active_tab_background ${blue}
-  color9 ${red}
+active_tab_foreground ${bg_dark}
-  color10 ${green}
+inactive_tab_background ${bg_highlight}
-  color11 ${yellow}
+inactive_tab_foreground ${dark3}
-  color12 ${blue}
+#tab_bar_background ${black}
-  color13 ${magenta}
-  color14 ${cyan}
-  color15 ${fg}
 
-  # extended colors
+# normal
-  color16 ${orange}
+color0 ${black}
-  color17 ${red1}
+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
   )