From b41998828df5fb601c0e068b00e4794f1ec95294 Mon Sep 17 00:00:00 2001 From: jdhao Date: Sun, 28 Aug 2022 12:43:50 +0800 Subject: [PATCH] refactor a bit 1. change theme to colorscheme 2. update plugin load logic --- core/{themes.lua => colorschemes.lua} | 0 core/plugins.vim | 2 +- init.lua | 12 ++++++------ lua/lua-init.lua | 5 ----- 4 files changed, 7 insertions(+), 12 deletions(-) rename core/{themes.lua => colorschemes.lua} (100%) delete mode 100644 lua/lua-init.lua diff --git a/core/themes.lua b/core/colorschemes.lua similarity index 100% rename from core/themes.lua rename to core/colorschemes.lua diff --git a/core/plugins.vim b/core/plugins.vim index fd4a6a8..1a1cd65 100644 --- a/core/plugins.vim +++ b/core/plugins.vim @@ -1,7 +1,7 @@ scriptencoding utf-8 " Plugin specification and lua stuff -lua require('lua-init') +lua require('plugins') " Use short names for common plugin manager commands to simplify typing. " To use these shortcuts: first activate command line with `:`, then input the diff --git a/init.lua b/init.lua index 3d95fd4..9299a2d 100644 --- a/init.lua +++ b/init.lua @@ -21,12 +21,12 @@ if nvim_ver ~= expected_ver then end local core_conf_files = { - "globals.vim", - "options.vim", - "autocommands.vim", - "mappings.vim", - "plugins.vim", - "themes.lua", + "globals.vim", -- some global settings + "options.vim", -- setting options in nvim + "autocommands.vim", -- various autocommands + "mappings.vim", -- all the user-defined mappings + "plugins.vim", -- all the plugins installed and their configurations + "colorschemes.lua", -- colorscheme settings } -- source all the core config files diff --git a/lua/lua-init.lua b/lua/lua-init.lua deleted file mode 100644 index c72cbb2..0000000 --- a/lua/lua-init.lua +++ /dev/null @@ -1,5 +0,0 @@ --- Some utility stuff -require 'utils' - --- plugin installation -require 'plugins'