From a3b558b552a7cc932f92328a5fe053711155e242 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 5 Sep 2022 16:09:28 +0200
Subject: [PATCH] feat: added colorscheme names for styles

---
 colors/tokyonight-day.lua   | 1 +
 colors/tokyonight-night.lua | 1 +
 colors/tokyonight-storm.lua | 1 +
 colors/tokyonight.lua       | 1 +
 colors/tokyonight.vim       | 9 ---------
 lua/tokyonight/colors.lua   | 2 +-
 lua/tokyonight/config.lua   | 7 ++++---
 lua/tokyonight/init.lua     | 7 ++++++-
 8 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 colors/tokyonight-day.lua
 create mode 100644 colors/tokyonight-night.lua
 create mode 100644 colors/tokyonight-storm.lua
 create mode 100644 colors/tokyonight.lua
 delete mode 100644 colors/tokyonight.vim

diff --git a/colors/tokyonight-day.lua b/colors/tokyonight-day.lua
new file mode 100644
index 00000000..61bf56b0
--- /dev/null
+++ b/colors/tokyonight-day.lua
@@ -0,0 +1 @@
+require("tokyonight").load({ style = "day" })
diff --git a/colors/tokyonight-night.lua b/colors/tokyonight-night.lua
new file mode 100644
index 00000000..92f8f26b
--- /dev/null
+++ b/colors/tokyonight-night.lua
@@ -0,0 +1 @@
+require("tokyonight").load({ style = "night" })
diff --git a/colors/tokyonight-storm.lua b/colors/tokyonight-storm.lua
new file mode 100644
index 00000000..40710d93
--- /dev/null
+++ b/colors/tokyonight-storm.lua
@@ -0,0 +1 @@
+require("tokyonight").load({ style = "storm" })
diff --git a/colors/tokyonight.lua b/colors/tokyonight.lua
new file mode 100644
index 00000000..f5595815
--- /dev/null
+++ b/colors/tokyonight.lua
@@ -0,0 +1 @@
+require("tokyonight").load()
diff --git a/colors/tokyonight.vim b/colors/tokyonight.vim
deleted file mode 100644
index 4764076f..00000000
--- a/colors/tokyonight.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-" clear cache so this reloads changes.
-" useful for development
-" lua package.loaded['tokyonight'] = nil
-" lua package.loaded['tokyonight.theme'] = nil
-" lua package.loaded['tokyonight.colors'] = nil
-" lua package.loaded['tokyonight.util'] = nil
-lua package.loaded['tokyonight.config'] = nil
-
-lua require('tokyonight').colorscheme()
diff --git a/lua/tokyonight/colors.lua b/lua/tokyonight/colors.lua
index d7c9a5f1..552d439e 100644
--- a/lua/tokyonight/colors.lua
+++ b/lua/tokyonight/colors.lua
@@ -1,11 +1,11 @@
 local util = require("tokyonight.util")
-local config = require("tokyonight.config").options
 
 local M = {}
 
 ---@return ColorScheme
 function M.setup(opts)
   opts = opts or {}
+  local config = require("tokyonight.config").options
 
   -- Color Palette
   ---@class ColorScheme
diff --git a/lua/tokyonight/config.lua b/lua/tokyonight/config.lua
index 83821e0e..682db582 100644
--- a/lua/tokyonight/config.lua
+++ b/lua/tokyonight/config.lua
@@ -1,6 +1,3 @@
--- shim vim for kitty and other generators
-vim = vim or { g = {}, o = {} }
-
 local M = {}
 
 ---@class Config
@@ -32,6 +29,10 @@ function M.setup(options)
   M.options = vim.tbl_deep_extend("force", {}, defaults, options or {})
 end
 
+function M.extend(options)
+  M.options = vim.tbl_deep_extend("force", {}, M.options or defaults, options or {})
+end
+
 M.setup()
 
 return M
diff --git a/lua/tokyonight/init.lua b/lua/tokyonight/init.lua
index c4cbb620..6cd4ec06 100644
--- a/lua/tokyonight/init.lua
+++ b/lua/tokyonight/init.lua
@@ -3,8 +3,13 @@ local theme = require("tokyonight.theme")
 
 local M = {}
 
-function M.colorscheme()
+function M.load(opts)
+  if opts then
+    require("tokyonight.config").extend(opts)
+  end
   util.load(theme.setup())
 end
 
+M.colorscheme = M.load
+
 return M