From 64dceb2ae0d865abe9e545215cf08c1020e2ea21 Mon Sep 17 00:00:00 2001
From: Eduardo Trujillo <ed@chromabits.com>
Date: Mon, 20 Mar 2023 19:58:08 -0700
Subject: [PATCH] fix: Prioritize colorscheme loading to fix variant selection
 issue

---
 src/init.lua                  | 7 ++-----
 src/lua/config/tokyonight.lua | 6 +++---
 src/lua/plugins.lua           | 2 ++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/init.lua b/src/init.lua
index 7fbdb55..0f4ca05 100644
--- a/src/init.lua
+++ b/src/init.lua
@@ -1,16 +1,13 @@
 vim.g.mapleader = ","
 
--- Plugins
-require('plugins')
-
 -- Options
 require('options')
 
 -- Mappings
 require('mappings')
 
--- Color theme
---vim.api.nvim_command("colorscheme tokyonight")
+-- Plugins
+require('plugins')
 
 -- Misc
 vim.api.nvim_command("syntax on")
diff --git a/src/lua/config/tokyonight.lua b/src/lua/config/tokyonight.lua
index 663825c..f1f37e9 100644
--- a/src/lua/config/tokyonight.lua
+++ b/src/lua/config/tokyonight.lua
@@ -1,8 +1,10 @@
 return function()
   local tokyonight = require('tokyonight')
 
+  vim.api.nvim_command("colorscheme tokyonight-moon")
+
   tokyonight.setup({
-    style = "storm",
+    style = "moon",
     --transparent = true,
     styles = {
       sidebars = "dark",
@@ -12,6 +14,4 @@ return function()
     lualine_bold = true,
     use_background = false,
   })
-
-  vim.api.nvim_command("colorscheme tokyonight-moon")
 end
diff --git a/src/lua/plugins.lua b/src/lua/plugins.lua
index 5679d0c..322a6e4 100644
--- a/src/lua/plugins.lua
+++ b/src/lua/plugins.lua
@@ -37,6 +37,8 @@ require('lazy').setup({
   { "folke/lazy.nvim", enabled = false },
   {
     'folke/tokyonight.nvim',
+    lazy = false;
+    priority = 1000;
     config = require('config.tokyonight'),
   },
   {
-- 
GitLab