Fix lualine and load funHEADmaster

10 files changed, 28 insertions, 17 deletions

diff --git a/README.md b/README.md
index 77a3995..804a697 100644
--- a/README.md
+++ b/README.md
@@ -49,8 +49,7 @@ If you are using the lazy, then you can install and configure the plugin like th
 
 (λ config []
   (let [plugin (require :no-clown-fiesta)]
-    (plugin.setup opts)
-    (plugin.load)))
+    (plugin.load opts)))
 
 {1 :aktersnurra/no-clown-fiesta.nvim :lazy false :priority 1000 : config}
 ```
@@ -69,8 +68,7 @@ local opts = {
 
 local function config()
   local plugin = require "no-clown-fiesta"
-  plugin.setup(opts)
-  return plugin.load()
+  return plugin.load(opts)
 end
 
 return {
@@ -116,3 +114,11 @@ This plugin supports three different themes:
 - WhichKey
 - mini.statusline
 - DiffView
+
+### Lualine
+
+Enable theme by setting the `theme` options in the lualine options, e.g.:
+
+```fnl
+(local opts {:options {:theme :no-clown-fiesta}})
+```
diff --git a/colors/no-clown-fiesta-dark.lua b/colors/no-clown-fiesta-dark.lua
new file mode 100644
index 0000000..699885d
--- /dev/null
+++ b/colors/no-clown-fiesta-dark.lua
@@ -0,0 +1 @@
+require("no-clown-fiesta").load { theme = "dark" }
diff --git a/colors/no-clown-fiesta-dim.lua b/colors/no-clown-fiesta-dim.lua
new file mode 100644
index 0000000..cca04a1
--- /dev/null
+++ b/colors/no-clown-fiesta-dim.lua
@@ -0,0 +1 @@
+require("no-clown-fiesta").load { theme = "dim" }
diff --git a/colors/no-clown-fiesta-light.lua b/colors/no-clown-fiesta-light.lua
new file mode 100644
index 0000000..9bf978d
--- /dev/null
+++ b/colors/no-clown-fiesta-light.lua
@@ -0,0 +1 @@
+require("no-clown-fiesta").load { theme = "light" }
diff --git a/colors/no-clown-fiesta.lua b/colors/no-clown-fiesta.lua
index c935789..3a7818d 100644
--- a/colors/no-clown-fiesta.lua
+++ b/colors/no-clown-fiesta.lua
@@ -1 +1 @@
-require("lua.lualine.themes.no-clown-fiesta-low-contrast").load()
+require("no-clown-fiesta").load()
diff --git a/lua/lualine/themes/_no-clown-fiesta.lua b/lua/lualine/themes/_no-clown-fiesta.lua
index 7f45ede..7dc3e03 100644
--- a/lua/lualine/themes/_no-clown-fiesta.lua
+++ b/lua/lualine/themes/_no-clown-fiesta.lua
@@ -6,18 +6,18 @@ function M.get(theme)
   local palette = require("no-clown-fiesta.palettes").get(theme)
   return {
     normal = {
-      a = { fg = palette.fg, bg = palette.bg, gui = "bold" },
-      b = { fg = palette.fg, bg = palette.bg },
-      c = { fg = palette.fg, bg = palette.bg },
+      a = { fg = palette.cursor_bg, bg = palette.accent, gui = "bold" },
+      b = { fg = palette.fg, bg = palette.alt_bg },
+      c = { fg = palette.fg, bg = palette.alt_bg },
     },
-    insert = { a = { fg = palette.fg, bg = palette.bg, gui = "bold" } },
-    visual = { a = { fg = palette.fg, bg = palette.bg, gui = "bold" } },
-    command = { a = { fg = palette.fg, bg = palette.bg, gui = "bold" } },
-    replace = { a = { fg = palette.fg, bg = palette.bg, gui = "bold" } },
+    insert = { a = { fg = palette.accent, bg = palette.cursor_bg, gui = "bold" } },
+    visual = { a = { fg = palette.accent, bg = palette.cursor_bg, gui = "bold" } },
+    command = { a = { fg = palette.accent, bg = palette.info, gui = "bold" } },
+    replace = { a = { fg = palette.accent, bg = palette.red, gui = "bold" } },
     inactive = {
-      a = { fg = palette.gray, bg = palette.bg },
-      b = { fg = palette.gray, bg = palette.bg },
-      c = { fg = palette.gray, bg = palette.bg },
+      a = { fg = palette.gray, bg = palette.alt_bg },
+      b = { fg = palette.gray, bg = palette.alt_bg },
+      c = { fg = palette.gray, bg = palette.alt_bg },
     },
   }
 end
diff --git a/lua/lualine/themes/no-clown-fiesta-dim.lua b/lua/lualine/themes/no-clown-fiesta-dim.lua
new file mode 100644
index 0000000..04bda89
--- /dev/null
+++ b/lua/lualine/themes/no-clown-fiesta-dim.lua
@@ -0,0 +1 @@
+return require("lualine.themes._no-clown-fiesta").get "dim"
diff --git a/lua/lualine/themes/no-clown-fiesta-low-contrast.lua b/lua/lualine/themes/no-clown-fiesta-low-contrast.lua
deleted file mode 100644
index 1689141..0000000
--- a/lua/lualine/themes/no-clown-fiesta-low-contrast.lua
+++ /dev/null
@@ -1 +0,0 @@
-return require("lualine.themes._no-clown-fiesta").get "low-contrast"
diff --git a/lua/lualine/themes/no-clown-fiesta.lua b/lua/lualine/themes/no-clown-fiesta.lua
new file mode 100644
index 0000000..f5d479e
--- /dev/null
+++ b/lua/lualine/themes/no-clown-fiesta.lua
@@ -0,0 +1 @@
+return require("lualine.themes._no-clown-fiesta").get "dark"
diff --git a/lua/no-clown-fiesta/init.lua b/lua/no-clown-fiesta/init.lua
index e932e4b..7cb5549 100644
--- a/lua/no-clown-fiesta/init.lua
+++ b/lua/no-clown-fiesta/init.lua
@@ -7,7 +7,8 @@ function M.setup(opts)
   end
 end
 
-function M.load()
+function M.load(opts)
+  M.setup(opts)
   local settings = require "no-clown-fiesta.settings"
   local opts = settings.opts