refactor: load onedarker theme externally (#2359)

2 files changed, 10 insertions, 6 deletions

diff --git a/lua/lvim/plugin-loader.lua b/lua/lvim/plugin-loader.lua
index 0fbe9971..a017b9b1 100644
--- a/lua/lvim/plugin-loader.lua
+++ b/lua/lvim/plugin-loader.lua
@@ -93,10 +93,6 @@ function plugin_loader.load(configurations)
     Log:warn "problems detected while loading plugins' configurations"
     Log:trace(debug.traceback())
   end
-
-  -- Colorscheme must get called after plugins are loaded or it will break new installs.
-  vim.g.colors_name = lvim.colorscheme
-  vim.cmd("colorscheme " .. lvim.colorscheme)
 end
 
 function plugin_loader.get_core_plugins()
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index c7d6963f..489d7097 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -52,13 +52,20 @@ return {
     commit = commit.nvim_lsp_installer,
   },
   {
+    "lunarvim/onedarker.nvim",
+    config = function()
+      require("onedarker").setup()
+    end,
+    disable = lvim.colorscheme ~= "onedarker",
+  },
+  {
     "rcarriga/nvim-notify",
     commit = commit.nvim_notify,
-    disable = not lvim.builtin.notify.active,
     config = function()
       require("lvim.core.notify").setup()
     end,
-    event = "BufRead",
+    requires = { "nvim-telescope/telescope.nvim" },
+    disable = not lvim.builtin.notify.active or not lvim.builtin.telescope.active,
   },
   { "Tastyep/structlog.nvim", commit = commit.structlog },
 
@@ -75,6 +82,7 @@ return {
   },
   {
     "nvim-telescope/telescope-fzf-native.nvim",
+    requires = { "nvim-telescope/telescope.nvim" },
     commit = commit.telescope_fzf_native,
     run = "make",
     disable = not lvim.builtin.telescope.active,