From e53ee104ec251b11b84045dec7782b9b7a03479f Mon Sep 17 00:00:00 2001 From: jdhao Date: Fri, 28 Jul 2023 22:27:54 +0200 Subject: [PATCH] feat: move lua conf under lua directory --- init.lua | 13 +++++++++---- {core => lua}/colorschemes.lua | 0 {core => lua}/globals.lua | 0 {core => lua}/mappings.lua | 0 4 files changed, 9 insertions(+), 4 deletions(-) rename {core => lua}/colorschemes.lua (100%) rename {core => lua}/globals.lua (100%) rename {core => lua}/mappings.lua (100%) diff --git a/init.lua b/init.lua index f294ab2..1cd6815 100644 --- a/init.lua +++ b/init.lua @@ -36,8 +36,13 @@ local core_conf_files = { } -- source all the core config files -for _, name in ipairs(core_conf_files) do - local path = string.format("%s/core/%s", vim.fn.stdpath("config"), name) - local source_cmd = "source " .. path - vim.cmd(source_cmd) +for _, file_name in ipairs(core_conf_files) do + if vim.endswith(file_name, 'vim') then + local path = string.format("%s/core/%s", vim.fn.stdpath("config"), file_name) + local source_cmd = "source " .. path + vim.cmd(source_cmd) + else + local module_name, _ = string.gsub(file_name, "%.lua", "") + require(module_name) + end end diff --git a/core/colorschemes.lua b/lua/colorschemes.lua similarity index 100% rename from core/colorschemes.lua rename to lua/colorschemes.lua diff --git a/core/globals.lua b/lua/globals.lua similarity index 100% rename from core/globals.lua rename to lua/globals.lua diff --git a/core/mappings.lua b/lua/mappings.lua similarity index 100% rename from core/mappings.lua rename to lua/mappings.lua