wozersHEADmaster

1 files changed, 9 insertions, 13 deletions

diff --git a/init.lua b/init.lua
index d89096a..ead3224 100644
--- a/init.lua
+++ b/init.lua
@@ -1,10 +1,13 @@
 -- TODO: after switching to dep with lazy loading check out vim-startuptime
 -- again
 
+_G.core = require("core")
+
 -- enable performance stuff
-if vim.fn.has("nvim-0.9") == true then
-  vim.loader.enable()
-end
+vim.loader.enable()
+
+-- load user config
+require("conf")
 
 -- bootstrap plugin manager
 local path = vim.fn.stdpath("data").."/site/pack/deps/opt/dep"
@@ -14,14 +17,6 @@ if vim.fn.empty(vim.fn.glob(path)) > 0 then
 end
 vim.cmd("packadd dep")
 
--- load miscellaneous utilities
-local misc = require("core.misc")
-
--- load user config
-misc.include("conf.opts") -- setup options
-misc.include("conf.binds") -- setup keybinds
-misc.include("conf.autos") -- setup autos
-
 -- load plugins
 require("dep") {
   { "squibid/dep",
@@ -35,8 +30,9 @@ require("dep") {
 
     for _, file in ipairs(vim.api.nvim_get_runtime_file(
       "lua/conf/plugins/*.lua", true)) do
-      local ret = misc.include("conf.plugins."..file:gsub("^.*/",
-        ""):gsub("%.lua$", ""))
+      local ret = require("conf.plugins."..file:gsub("^.*/", ""):gsub("%.lua$",
+        ""))
+
       if type(ret) ~= "boolean" then
         plugs[#plugs + 1] = ret
       end