From 1d1d1722e035389dc3bfc2489133fa58533c310f Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Sun, 18 Sep 2022 23:51:39 +0200 Subject: [PATCH] refactor!: move extras in seperate directories --- .../tokyonight_day.yml} | 0 .../tokyonight_moon.yml} | 0 .../tokyonight_night.yml} | 0 .../tokyonight_storm.yml} | 0 extras/{fish_tokyonight_day.fish => fish/tokyonight_day.fish} | 0 .../{fish_tokyonight_moon.fish => fish/tokyonight_moon.fish} | 0 .../{fish_tokyonight_night.fish => fish/tokyonight_night.fish} | 0 .../{fish_tokyonight_storm.fish => fish/tokyonight_storm.fish} | 0 extras/{foot_tokyonight_day.ini => foot/tokyonight_day.ini} | 0 extras/{foot_tokyonight_moon.ini => foot/tokyonight_moon.ini} | 0 .../{foot_tokyonight_night.ini => foot/tokyonight_night.ini} | 0 .../{foot_tokyonight_storm.ini => foot/tokyonight_storm.ini} | 0 .../tokyonight_day.itermcolors} | 0 .../tokyonight_moon.itermcolors} | 0 .../tokyonight_night.itermcolors} | 0 .../tokyonight_storm.itermcolors} | 0 .../{kitty_tokyonight_day.conf => kitty/tokyonight_day.conf} | 2 +- .../{kitty_tokyonight_moon.conf => kitty/tokyonight_moon.conf} | 2 +- .../tokyonight_night.conf} | 2 +- .../tokyonight_storm.conf} | 2 +- extras/{lua_tokyonight_day.lua => lua/tokyonight_day.lua} | 0 extras/{lua_tokyonight_moon.lua => lua/tokyonight_moon.lua} | 0 extras/{lua_tokyonight_night.lua => lua/tokyonight_night.lua} | 0 extras/{lua_tokyonight_storm.lua => lua/tokyonight_storm.lua} | 0 .../{tilix_tokyonight_day.json => tilix/tokyonight_day.json} | 0 .../{tilix_tokyonight_moon.json => tilix/tokyonight_moon.json} | 0 .../tokyonight_night.json} | 0 .../tokyonight_storm.json} | 0 extras/{tmux_tokyonight_day.tmux => tmux/tokyonight_day.tmux} | 0 .../{tmux_tokyonight_moon.tmux => tmux/tokyonight_moon.tmux} | 0 .../{tmux_tokyonight_night.tmux => tmux/tokyonight_night.tmux} | 0 .../{tmux_tokyonight_storm.tmux => tmux/tokyonight_storm.tmux} | 0 .../tokyonight_day.toml} | 0 .../tokyonight_moon.toml} | 0 .../tokyonight_night.toml} | 0 .../tokyonight_storm.toml} | 0 .../tokyonight_day.theme} | 0 .../tokyonight_moon.theme} | 0 .../tokyonight_night.theme} | 0 .../tokyonight_storm.theme} | 0 .../tokyonight_day.Xresources} | 0 .../tokyonight_moon.Xresources} | 0 .../tokyonight_night.Xresources} | 0 .../tokyonight_storm.Xresources} | 0 lua/tokyonight/extra/init.lua | 3 ++- 45 files changed, 6 insertions(+), 5 deletions(-) rename extras/{alacritty_tokyonight_day.yml => alacritty/tokyonight_day.yml} (100%) rename extras/{alacritty_tokyonight_moon.yml => alacritty/tokyonight_moon.yml} (100%) rename extras/{alacritty_tokyonight_night.yml => alacritty/tokyonight_night.yml} (100%) rename extras/{alacritty_tokyonight_storm.yml => alacritty/tokyonight_storm.yml} (100%) rename extras/{fish_tokyonight_day.fish => fish/tokyonight_day.fish} (100%) rename extras/{fish_tokyonight_moon.fish => fish/tokyonight_moon.fish} (100%) rename extras/{fish_tokyonight_night.fish => fish/tokyonight_night.fish} (100%) rename extras/{fish_tokyonight_storm.fish => fish/tokyonight_storm.fish} (100%) rename extras/{foot_tokyonight_day.ini => foot/tokyonight_day.ini} (100%) rename extras/{foot_tokyonight_moon.ini => foot/tokyonight_moon.ini} (100%) rename extras/{foot_tokyonight_night.ini => foot/tokyonight_night.ini} (100%) rename extras/{foot_tokyonight_storm.ini => foot/tokyonight_storm.ini} (100%) rename extras/{iterm_tokyonight_day.itermcolors => iterm/tokyonight_day.itermcolors} (100%) rename extras/{iterm_tokyonight_moon.itermcolors => iterm/tokyonight_moon.itermcolors} (100%) rename extras/{iterm_tokyonight_night.itermcolors => iterm/tokyonight_night.itermcolors} (100%) rename extras/{iterm_tokyonight_storm.itermcolors => iterm/tokyonight_storm.itermcolors} (100%) rename extras/{kitty_tokyonight_day.conf => kitty/tokyonight_day.conf} (96%) rename extras/{kitty_tokyonight_moon.conf => kitty/tokyonight_moon.conf} (95%) rename extras/{kitty_tokyonight_night.conf => kitty/tokyonight_night.conf} (95%) rename extras/{kitty_tokyonight_storm.conf => kitty/tokyonight_storm.conf} (95%) rename extras/{lua_tokyonight_day.lua => lua/tokyonight_day.lua} (100%) rename extras/{lua_tokyonight_moon.lua => lua/tokyonight_moon.lua} (100%) rename extras/{lua_tokyonight_night.lua => lua/tokyonight_night.lua} (100%) rename extras/{lua_tokyonight_storm.lua => lua/tokyonight_storm.lua} (100%) rename extras/{tilix_tokyonight_day.json => tilix/tokyonight_day.json} (100%) rename extras/{tilix_tokyonight_moon.json => tilix/tokyonight_moon.json} (100%) rename extras/{tilix_tokyonight_night.json => tilix/tokyonight_night.json} (100%) rename extras/{tilix_tokyonight_storm.json => tilix/tokyonight_storm.json} (100%) rename extras/{tmux_tokyonight_day.tmux => tmux/tokyonight_day.tmux} (100%) rename extras/{tmux_tokyonight_moon.tmux => tmux/tokyonight_moon.tmux} (100%) rename extras/{tmux_tokyonight_night.tmux => tmux/tokyonight_night.tmux} (100%) rename extras/{tmux_tokyonight_storm.tmux => tmux/tokyonight_storm.tmux} (100%) rename extras/{wezterm_tokyonight_day.toml => wezterm/tokyonight_day.toml} (100%) rename extras/{wezterm_tokyonight_moon.toml => wezterm/tokyonight_moon.toml} (100%) rename extras/{wezterm_tokyonight_night.toml => wezterm/tokyonight_night.toml} (100%) rename extras/{wezterm_tokyonight_storm.toml => wezterm/tokyonight_storm.toml} (100%) rename extras/{xfceterm_tokyonight_day.theme => xfceterm/tokyonight_day.theme} (100%) rename extras/{xfceterm_tokyonight_moon.theme => xfceterm/tokyonight_moon.theme} (100%) rename extras/{xfceterm_tokyonight_night.theme => xfceterm/tokyonight_night.theme} (100%) rename extras/{xfceterm_tokyonight_storm.theme => xfceterm/tokyonight_storm.theme} (100%) rename extras/{xresources_tokyonight_day.Xresources => xresources/tokyonight_day.Xresources} (100%) rename extras/{xresources_tokyonight_moon.Xresources => xresources/tokyonight_moon.Xresources} (100%) rename extras/{xresources_tokyonight_night.Xresources => xresources/tokyonight_night.Xresources} (100%) rename extras/{xresources_tokyonight_storm.Xresources => xresources/tokyonight_storm.Xresources} (100%) diff --git a/extras/alacritty_tokyonight_day.yml b/extras/alacritty/tokyonight_day.yml similarity index 100% rename from extras/alacritty_tokyonight_day.yml rename to extras/alacritty/tokyonight_day.yml diff --git a/extras/alacritty_tokyonight_moon.yml b/extras/alacritty/tokyonight_moon.yml similarity index 100% rename from extras/alacritty_tokyonight_moon.yml rename to extras/alacritty/tokyonight_moon.yml diff --git a/extras/alacritty_tokyonight_night.yml b/extras/alacritty/tokyonight_night.yml similarity index 100% rename from extras/alacritty_tokyonight_night.yml rename to extras/alacritty/tokyonight_night.yml diff --git a/extras/alacritty_tokyonight_storm.yml b/extras/alacritty/tokyonight_storm.yml similarity index 100% rename from extras/alacritty_tokyonight_storm.yml rename to extras/alacritty/tokyonight_storm.yml diff --git a/extras/fish_tokyonight_day.fish b/extras/fish/tokyonight_day.fish similarity index 100% rename from extras/fish_tokyonight_day.fish rename to extras/fish/tokyonight_day.fish diff --git a/extras/fish_tokyonight_moon.fish b/extras/fish/tokyonight_moon.fish similarity index 100% rename from extras/fish_tokyonight_moon.fish rename to extras/fish/tokyonight_moon.fish diff --git a/extras/fish_tokyonight_night.fish b/extras/fish/tokyonight_night.fish similarity index 100% rename from extras/fish_tokyonight_night.fish rename to extras/fish/tokyonight_night.fish diff --git a/extras/fish_tokyonight_storm.fish b/extras/fish/tokyonight_storm.fish similarity index 100% rename from extras/fish_tokyonight_storm.fish rename to extras/fish/tokyonight_storm.fish diff --git a/extras/foot_tokyonight_day.ini b/extras/foot/tokyonight_day.ini similarity index 100% rename from extras/foot_tokyonight_day.ini rename to extras/foot/tokyonight_day.ini diff --git a/extras/foot_tokyonight_moon.ini b/extras/foot/tokyonight_moon.ini similarity index 100% rename from extras/foot_tokyonight_moon.ini rename to extras/foot/tokyonight_moon.ini diff --git a/extras/foot_tokyonight_night.ini b/extras/foot/tokyonight_night.ini similarity index 100% rename from extras/foot_tokyonight_night.ini rename to extras/foot/tokyonight_night.ini diff --git a/extras/foot_tokyonight_storm.ini b/extras/foot/tokyonight_storm.ini similarity index 100% rename from extras/foot_tokyonight_storm.ini rename to extras/foot/tokyonight_storm.ini diff --git a/extras/iterm_tokyonight_day.itermcolors b/extras/iterm/tokyonight_day.itermcolors similarity index 100% rename from extras/iterm_tokyonight_day.itermcolors rename to extras/iterm/tokyonight_day.itermcolors diff --git a/extras/iterm_tokyonight_moon.itermcolors b/extras/iterm/tokyonight_moon.itermcolors similarity index 100% rename from extras/iterm_tokyonight_moon.itermcolors rename to extras/iterm/tokyonight_moon.itermcolors diff --git a/extras/iterm_tokyonight_night.itermcolors b/extras/iterm/tokyonight_night.itermcolors similarity index 100% rename from extras/iterm_tokyonight_night.itermcolors rename to extras/iterm/tokyonight_night.itermcolors diff --git a/extras/iterm_tokyonight_storm.itermcolors b/extras/iterm/tokyonight_storm.itermcolors similarity index 100% rename from extras/iterm_tokyonight_storm.itermcolors rename to extras/iterm/tokyonight_storm.itermcolors diff --git a/extras/kitty_tokyonight_day.conf b/extras/kitty/tokyonight_day.conf similarity index 96% rename from extras/kitty_tokyonight_day.conf rename to extras/kitty/tokyonight_day.conf index 6a11bc7..ba10859 100644 --- a/extras/kitty_tokyonight_day.conf +++ b/extras/kitty/tokyonight_day.conf @@ -3,7 +3,7 @@ ## name: Tokyo Night Day ## license: MIT ## author: Folke Lemaitre -## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_day.conf +## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_day.conf background #e1e2e7 diff --git a/extras/kitty_tokyonight_moon.conf b/extras/kitty/tokyonight_moon.conf similarity index 95% rename from extras/kitty_tokyonight_moon.conf rename to extras/kitty/tokyonight_moon.conf index fd81b85..15ca9e5 100644 --- a/extras/kitty_tokyonight_moon.conf +++ b/extras/kitty/tokyonight_moon.conf @@ -3,7 +3,7 @@ ## name: Tokyo Night Moon ## license: MIT ## author: Folke Lemaitre -## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_moon.conf +## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_moon.conf background #222436 diff --git a/extras/kitty_tokyonight_night.conf b/extras/kitty/tokyonight_night.conf similarity index 95% rename from extras/kitty_tokyonight_night.conf rename to extras/kitty/tokyonight_night.conf index 1a89c4b..d14010a 100644 --- a/extras/kitty_tokyonight_night.conf +++ b/extras/kitty/tokyonight_night.conf @@ -3,7 +3,7 @@ ## name: Tokyo Night ## license: MIT ## author: Folke Lemaitre -## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_night.conf +## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf background #1a1b26 diff --git a/extras/kitty_tokyonight_storm.conf b/extras/kitty/tokyonight_storm.conf similarity index 95% rename from extras/kitty_tokyonight_storm.conf rename to extras/kitty/tokyonight_storm.conf index 2a764ba..aed67c9 100644 --- a/extras/kitty_tokyonight_storm.conf +++ b/extras/kitty/tokyonight_storm.conf @@ -3,7 +3,7 @@ ## name: Tokyo Night Storm ## license: MIT ## author: Folke Lemaitre -## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_storm.conf +## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf background #24283b diff --git a/extras/lua_tokyonight_day.lua b/extras/lua/tokyonight_day.lua similarity index 100% rename from extras/lua_tokyonight_day.lua rename to extras/lua/tokyonight_day.lua diff --git a/extras/lua_tokyonight_moon.lua b/extras/lua/tokyonight_moon.lua similarity index 100% rename from extras/lua_tokyonight_moon.lua rename to extras/lua/tokyonight_moon.lua diff --git a/extras/lua_tokyonight_night.lua b/extras/lua/tokyonight_night.lua similarity index 100% rename from extras/lua_tokyonight_night.lua rename to extras/lua/tokyonight_night.lua diff --git a/extras/lua_tokyonight_storm.lua b/extras/lua/tokyonight_storm.lua similarity index 100% rename from extras/lua_tokyonight_storm.lua rename to extras/lua/tokyonight_storm.lua diff --git a/extras/tilix_tokyonight_day.json b/extras/tilix/tokyonight_day.json similarity index 100% rename from extras/tilix_tokyonight_day.json rename to extras/tilix/tokyonight_day.json diff --git a/extras/tilix_tokyonight_moon.json b/extras/tilix/tokyonight_moon.json similarity index 100% rename from extras/tilix_tokyonight_moon.json rename to extras/tilix/tokyonight_moon.json diff --git a/extras/tilix_tokyonight_night.json b/extras/tilix/tokyonight_night.json similarity index 100% rename from extras/tilix_tokyonight_night.json rename to extras/tilix/tokyonight_night.json diff --git a/extras/tilix_tokyonight_storm.json b/extras/tilix/tokyonight_storm.json similarity index 100% rename from extras/tilix_tokyonight_storm.json rename to extras/tilix/tokyonight_storm.json diff --git a/extras/tmux_tokyonight_day.tmux b/extras/tmux/tokyonight_day.tmux similarity index 100% rename from extras/tmux_tokyonight_day.tmux rename to extras/tmux/tokyonight_day.tmux diff --git a/extras/tmux_tokyonight_moon.tmux b/extras/tmux/tokyonight_moon.tmux similarity index 100% rename from extras/tmux_tokyonight_moon.tmux rename to extras/tmux/tokyonight_moon.tmux diff --git a/extras/tmux_tokyonight_night.tmux b/extras/tmux/tokyonight_night.tmux similarity index 100% rename from extras/tmux_tokyonight_night.tmux rename to extras/tmux/tokyonight_night.tmux diff --git a/extras/tmux_tokyonight_storm.tmux b/extras/tmux/tokyonight_storm.tmux similarity index 100% rename from extras/tmux_tokyonight_storm.tmux rename to extras/tmux/tokyonight_storm.tmux diff --git a/extras/wezterm_tokyonight_day.toml b/extras/wezterm/tokyonight_day.toml similarity index 100% rename from extras/wezterm_tokyonight_day.toml rename to extras/wezterm/tokyonight_day.toml diff --git a/extras/wezterm_tokyonight_moon.toml b/extras/wezterm/tokyonight_moon.toml similarity index 100% rename from extras/wezterm_tokyonight_moon.toml rename to extras/wezterm/tokyonight_moon.toml diff --git a/extras/wezterm_tokyonight_night.toml b/extras/wezterm/tokyonight_night.toml similarity index 100% rename from extras/wezterm_tokyonight_night.toml rename to extras/wezterm/tokyonight_night.toml diff --git a/extras/wezterm_tokyonight_storm.toml b/extras/wezterm/tokyonight_storm.toml similarity index 100% rename from extras/wezterm_tokyonight_storm.toml rename to extras/wezterm/tokyonight_storm.toml diff --git a/extras/xfceterm_tokyonight_day.theme b/extras/xfceterm/tokyonight_day.theme similarity index 100% rename from extras/xfceterm_tokyonight_day.theme rename to extras/xfceterm/tokyonight_day.theme diff --git a/extras/xfceterm_tokyonight_moon.theme b/extras/xfceterm/tokyonight_moon.theme similarity index 100% rename from extras/xfceterm_tokyonight_moon.theme rename to extras/xfceterm/tokyonight_moon.theme diff --git a/extras/xfceterm_tokyonight_night.theme b/extras/xfceterm/tokyonight_night.theme similarity index 100% rename from extras/xfceterm_tokyonight_night.theme rename to extras/xfceterm/tokyonight_night.theme diff --git a/extras/xfceterm_tokyonight_storm.theme b/extras/xfceterm/tokyonight_storm.theme similarity index 100% rename from extras/xfceterm_tokyonight_storm.theme rename to extras/xfceterm/tokyonight_storm.theme diff --git a/extras/xresources_tokyonight_day.Xresources b/extras/xresources/tokyonight_day.Xresources similarity index 100% rename from extras/xresources_tokyonight_day.Xresources rename to extras/xresources/tokyonight_day.Xresources diff --git a/extras/xresources_tokyonight_moon.Xresources b/extras/xresources/tokyonight_moon.Xresources similarity index 100% rename from extras/xresources_tokyonight_moon.Xresources rename to extras/xresources/tokyonight_moon.Xresources diff --git a/extras/xresources_tokyonight_night.Xresources b/extras/xresources/tokyonight_night.Xresources similarity index 100% rename from extras/xresources_tokyonight_night.Xresources rename to extras/xresources/tokyonight_night.Xresources diff --git a/extras/xresources_tokyonight_storm.Xresources b/extras/xresources/tokyonight_storm.Xresources similarity index 100% rename from extras/xresources_tokyonight_storm.Xresources rename to extras/xresources/tokyonight_storm.Xresources diff --git a/lua/tokyonight/extra/init.lua b/lua/tokyonight/extra/init.lua index b5583da..dc1877e 100644 --- a/lua/tokyonight/extra/init.lua +++ b/lua/tokyonight/extra/init.lua @@ -2,6 +2,7 @@ local M = {} local function write(str, fileName) print("[write] extra/" .. fileName) + vim.fn.mkdir(vim.fs.dirname("extras/" .. fileName), "p") local file = io.open("extras/" .. fileName, "w") file:write(str) file:close() @@ -38,7 +39,7 @@ function M.setup() for style, style_name in pairs(styles) do config.setup({ style = style }) local colors = require("tokyonight.colors").setup({ transform = true }) - local fname = 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)