From 7192b28a24d52b62029c414db46b9fd3a5de475e Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Sat, 19 Mar 2022 14:43:07 +0100
Subject: fix(lualine): conditional theme loading (#2363)

---
 lua/lvim/core/lualine/styles.lua | 3 ---
 lua/lvim/core/lualine/utils.lua  | 2 +-
 lua/lvim/plugins.lua             | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/core/lualine/styles.lua b/lua/lvim/core/lualine/styles.lua
index 0843aead..f5f5871a 100644
--- a/lua/lvim/core/lualine/styles.lua
+++ b/lua/lvim/core/lualine/styles.lua
@@ -127,9 +127,6 @@ end
 
 function M.update()
   local style = M.get_style(lvim.builtin.lualine.style)
-  if lvim.builtin.lualine.options.theme == nil then
-    lvim.builtin.lualine.options.theme = lvim.colorscheme
-  end
 
   lvim.builtin.lualine = vim.tbl_deep_extend("keep", lvim.builtin.lualine, style)
 end
diff --git a/lua/lvim/core/lualine/utils.lua b/lua/lvim/core/lualine/utils.lua
index cf80a99e..d685e044 100644
--- a/lua/lvim/core/lualine/utils.lua
+++ b/lua/lvim/core/lualine/utils.lua
@@ -1,7 +1,7 @@
 local M = {}
 
 function M.validate_theme()
-  local theme = lvim.builtin.lualine.options.theme
+  local theme = lvim.builtin.lualine.options.theme or "auto"
   if type(theme) == "table" then
     return
   end
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 489d7097..8c80e866 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -55,6 +55,7 @@ return {
     "lunarvim/onedarker.nvim",
     config = function()
       require("onedarker").setup()
+      lvim.builtin.lualine.options.theme = "onedarker"
     end,
     disable = lvim.colorscheme ~= "onedarker",
   },
-- 
cgit v1.2.3