From 9c8191bfa76dcb9116494366034618f071447810 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Tue, 7 Dec 2021 22:13:22 +0100 Subject: [PATCH] Move non-plugin settings to core/ --- home/.config/nvim/init.lua | 17 +++++++++++------ .../nvim/lua/{ => core}/abbreviations.lua | 0 home/.config/nvim/lua/{ => core}/autocmd.lua | 0 home/.config/nvim/lua/core/init.lua | 7 +++++++ home/.config/nvim/lua/{ => core}/mappings.lua | 0 home/.config/nvim/lua/{ => core}/options.lua | 0 home/.config/nvim/lua/{ => core}/theme.lua | 0 7 files changed, 18 insertions(+), 6 deletions(-) rename home/.config/nvim/lua/{ => core}/abbreviations.lua (100%) rename home/.config/nvim/lua/{ => core}/autocmd.lua (100%) create mode 100644 home/.config/nvim/lua/core/init.lua rename home/.config/nvim/lua/{ => core}/mappings.lua (100%) rename home/.config/nvim/lua/{ => core}/options.lua (100%) rename home/.config/nvim/lua/{ => core}/theme.lua (100%) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index e254098..e562985 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,8 +1,13 @@ --- Require additional scripts which contain individual configurations +-- The configuration is scattered across multiple files in the lua/ folder +-- We can require the individual configurations from here -require "options" -require "theme" -require "mappings" -require "abbreviations" -require "autocmd" + +-- This loads in the basic nvim configuration that doesn't rely on any +-- plugins. it provides default keymaps, options, theming, autocmds, ... +require "core" + +-- This loads packer plugin manager which manages our plugins +-- NOTE: Removing this will NOT disable the plugins, but it will disable +-- automatic packer installation, allowing for the plugins to be deleted +-- manually (from ~/.local/share/nvim/site/pack/packer). require "plugins" diff --git a/home/.config/nvim/lua/abbreviations.lua b/home/.config/nvim/lua/core/abbreviations.lua similarity index 100% rename from home/.config/nvim/lua/abbreviations.lua rename to home/.config/nvim/lua/core/abbreviations.lua diff --git a/home/.config/nvim/lua/autocmd.lua b/home/.config/nvim/lua/core/autocmd.lua similarity index 100% rename from home/.config/nvim/lua/autocmd.lua rename to home/.config/nvim/lua/core/autocmd.lua diff --git a/home/.config/nvim/lua/core/init.lua b/home/.config/nvim/lua/core/init.lua new file mode 100644 index 0000000..2eba0e8 --- /dev/null +++ b/home/.config/nvim/lua/core/init.lua @@ -0,0 +1,7 @@ +-- Require additional scripts which contain individual configurations + +require "core.options" +require "core.theme" +require "core.mappings" +require "core.abbreviations" +require "core.autocmd" diff --git a/home/.config/nvim/lua/mappings.lua b/home/.config/nvim/lua/core/mappings.lua similarity index 100% rename from home/.config/nvim/lua/mappings.lua rename to home/.config/nvim/lua/core/mappings.lua diff --git a/home/.config/nvim/lua/options.lua b/home/.config/nvim/lua/core/options.lua similarity index 100% rename from home/.config/nvim/lua/options.lua rename to home/.config/nvim/lua/core/options.lua diff --git a/home/.config/nvim/lua/theme.lua b/home/.config/nvim/lua/core/theme.lua similarity index 100% rename from home/.config/nvim/lua/theme.lua rename to home/.config/nvim/lua/core/theme.lua