💝 Tidy vimConfig set

lua/onedark/config.lua

@@ -8,13 +8,16 @@ vim = vim or {g = {}, o = {}}
 
 local function opt(key, default)
   key = "onedark_" .. key
-  if vim.g[key] == nil then return default end
-  if vim.g[key] == 0 then
+  if vim.g[key] == nil then
+    return default
+  else
     vimConfig = true
-    return false
+    if vim.g[key] == 0 then
+      return false
+    else
+      return vim.g[key]
+    end
   end
-  vimConfig = true
-  return vim.g[key]
 end
 
 config = {

lua/onedark/init.lua

@@ -3,16 +3,19 @@ local theme = require("onedark.theme")
 local configModule = require("onedark.config")
 
 local function setup(userConfig)
-  if userConfig then
-    configModule.applyConfiguration(userConfig)
-  elseif configModule.vimConfig then
+  -- Warning, If config set inside 'vim.g'
+  if configModule.vimConfig then
     vim.schedule(function()
       vim.api.nvim_err_writeln(
           [[ful1e5/onedark: onedark will stop supporting vimscript soon, change your config to lua or wrap it around lua << EOF ... EOF]]) -- luacheck: ignore
     end)
   end
+
+  -- Applying user configuration
+  if userConfig then configModule.applyConfiguration(userConfig) end
+
+  -- Load colorscheme
   util.load(theme.setup(configModule.config))
-  vim.cmd [[colorscheme onedark]]
 end
 
 return {setup = setup}