3 files changed, 13 insertions, 44 deletions
diff --git a/lua/lvim/config/_deprecated.lua b/lua/lvim/config/_deprecated.lua
index d4b15f30..5ce851c2 100644
--- a/lua/lvim/config/_deprecated.lua
+++ b/lua/lvim/config/_deprecated.lua
@@ -17,7 +17,7 @@ local function deprecate(name, alternative)
   end)
 end
 
-function M.handle()
+function M.pre_user_config()
   local mt = {
     __newindex = function(_, k, _)
       deprecate(k)
@@ -32,33 +32,9 @@ function M.handle()
       lvim.builtin.theme.tokyonight.options[k] = v
     end,
   })
-
-  ---@deprecated
-  lvim.builtin.notify = {}
-  setmetatable(lvim.builtin.notify, {
-    __newindex = function(_, k, _)
-      deprecate("lvim.builtin.notify." .. k, "See LunarVim#3294")
-    end,
-  })
-
-  ---@deprecated
-  lvim.builtin.dashboard = {}
-  setmetatable(lvim.builtin.dashboard, {
-    __newindex = function(_, k, _)
-      deprecate("lvim.builtin.dashboard." .. k, "Use `lvim.builtin.alpha` instead. See LunarVim#1906")
-    end,
-  })
-
-  ---@deprecated
-  lvim.lsp.popup_border = {}
-  setmetatable(lvim.lsp.popup_border, mt)
-
-  ---@deprecated
-  lvim.lang = {}
-  setmetatable(lvim.lang, mt)
 end
 
-function M.post_load()
+function M.post_user_config()
   if lvim.lsp.override and not vim.tbl_isempty(lvim.lsp.override) then
     deprecate("lvim.lsp.override", "Use `lvim.lsp.automatic_configuration.skipped_servers` instead")
     vim.tbl_map(function(c)
@@ -156,4 +132,11 @@ function M.post_load()
   end
 end
 
+M.post_builtin = {
+  -- example:
+  -- which_key = function ()
+  --
+  -- end
+}
+
 return M
diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua
index 9f4bb45e..7823d9f2 100644
--- a/lua/lvim/config/init.lua
+++ b/lua/lvim/config/init.lua
@@ -18,7 +18,7 @@ function M:init()
   require("lvim.keymappings").load_defaults()
 
   local builtins = require "lvim.core.builtins"
-  builtins.config { user_config_file = user_config_file }
+  builtins.init()
 
   local settings = require "lvim.config.settings"
   settings.load_defaults()
@@ -26,21 +26,7 @@ function M:init()
   local autocmds = require "lvim.core.autocmds"
   autocmds.load_defaults()
 
-  local lvim_lsp_config = require "lvim.lsp.config"
-  lvim.lsp = vim.deepcopy(lvim_lsp_config)
-
-  lvim.builtin.luasnip = {
-    sources = {
-      friendly_snippets = true,
-    },
-  }
-
-  lvim.builtin.bigfile = {
-    active = true,
-    config = {},
-  }
-
-  require("lvim.config._deprecated").handle()
+  require("lvim.config._deprecated").pre_user_config()
 end
 
 --- Override the configuration with a user provided one
@@ -65,7 +51,7 @@ function M:load(config_path)
 
   Log:set_level(lvim.log.level)
 
-  require("lvim.config._deprecated").post_load()
+  -- require("lvim.config._deprecated").post_load()
 
   autocmds.define_autocmds(lvim.autocommands)
 
diff --git a/lua/lvim/config/settings.lua b/lua/lvim/config/settings.lua
index 42281ca1..0d6de07c 100644
--- a/lua/lvim/config/settings.lua
+++ b/lua/lvim/config/settings.lua
@@ -51,7 +51,7 @@ M.load_default_options = function()
     sidescrolloff = 8, -- minimal number of screen lines to keep left and right of the cursor.
     showcmd = false,
     ruler = false,
-    laststatus = 3,
+    laststatus = 0,
   }
 
   ---  SETTINGS  ---