refact: Modules now stored under `doom.core/modules/langs/user`

lua/doom/core/config.lua

@@ -84,7 +84,7 @@ config.load = function()
 
       local ok, result = xpcall(require, debug.traceback, ("%s.%s"):format(root_folder, module_name))
       if ok then
-        doom.modules[module_name] = result
+        doom[section_name][module_name] = result
       else
         local log = require("doom.utils.logging")
         log.error(

lua/doom/core/doom_global.lua

@@ -1,7 +1,7 @@
 -- doom.core.doom_global
--- 
+--
 -- Sets the `doom` global object including defaults and helper functions.
--- We set it directly within this file (rather than returning the object) and 
+-- We set it directly within this file (rather than returning the object) and
 -- setting it elsewhere to allow sumneko_lua to provide documented type
 -- completions.
 
@@ -275,7 +275,7 @@ doom = {
   --- Binds keybinds using a modified nest.nvim syntax.
   ---
   --- Example:
-  --- 
+  ---
   --- doom.use_keybind({
   ---   { '<leader>f', name = '+files', {
   ---     { 'f', ':Telescope find_files', name = 'Find files' },
@@ -298,6 +298,12 @@ doom = {
   end,
 
 
-  ---
+  -- This is where modules are stored.
+  -- The entire data structure will be stored in modules[module_name] = {}
+  -- The key (`user` vs `modules` vs `langs`) cooresponds with the section in
+  -- the user's modules.lua.
+  core = {},
+  user = {},
   modules = {},
+  langs = {},
 }

lua/doom/core/modules.lua

@@ -74,32 +74,34 @@ end
 modules.load_modules = function()
   local use = require("packer").use
   -- Handle the Modules
-  for module_name, module in pairs(doom.modules) do
-    -- Import dependencies with packer from module.packages
-    if module.packages then
-      for dependency_name, packer_spec in pairs(module.packages) do
-        -- Set packer_spec to configure function
-        if module.configs and module.configs[dependency_name] then
-          packer_spec.config = module.configs[dependency_name]
+  for _, section_name in ipairs({"core", "modules", "user", "langs",}) do
+    for module_name, module in pairs(doom[section_name]) do
+      -- Import dependencies with packer from module.packages
+      if module.packages then
+        for dependency_name, packer_spec in pairs(module.packages) do
+          -- Set packer_spec to configure function
+          if module.configs and module.configs[dependency_name] then
+            packer_spec.config = module.configs[dependency_name]
+          end
+
+          -- Set/unset frozen packer dependencies
+          packer_spec.commit = doom.freeze_dependencies and packer_spec.commit or nil
+
+          -- Initialise packer
+          use(packer_spec)
         end
-
-        -- Set/unset frozen packer dependencies
-        packer_spec.commit = doom.freeze_dependencies and packer_spec.commit or nil
-
-        -- Initialise packer
-        use(packer_spec)
       end
-    end
 
-    -- Setup package autogroups
-    if module.autocmds then
-      local autocmds = type(module.autocmds) == 'function' and module.autocmds() or module.autocmds
-      utils.make_augroup(module_name, autocmds)
-    end
+      -- Setup package autogroups
+      if module.autocmds then
+        local autocmds = type(module.autocmds) == 'function' and module.autocmds() or module.autocmds
+        utils.make_augroup(module_name, autocmds)
+      end
 
-    if module.cmds then
-      for _, cmd_spec in ipairs(module.cmds) do
-        utils.make_cmd(cmd_spec[1], cmd_spec[2])
+      if module.cmds then
+        for _, cmd_spec in ipairs(module.cmds) do
+          utils.make_cmd(cmd_spec[1], cmd_spec[2])
+        end
       end
     end
   end

lua/doom/modules/core/doom/init.lua

@@ -36,7 +36,7 @@ required.packages = {
 
 required.configs = {}
 required.configs["nvim-mapper"] = function()
-  require("nvim-mapper").setup(doom.modules.doom.settings.mapper)
+  require("nvim-mapper").setup(doom.core.doom.settings.mapper)
 end
 
 required.binds = function ()

lua/doom/modules/core/nest/init.lua

@@ -26,10 +26,12 @@ nest.configs["nest.nvim"] = function()
 
   local last_module = '';
   local ok, err = xpcall(function()
-    for module_name, module in pairs(doom.modules) do
-      last_module = module_name
-      if module.binds then
-        nest_package.applyKeymaps(type(module.binds) == 'function' and module.binds() or module.binds)
+    for _, section_name in ipairs({"user", "modules", "langs"}) do
+      for module_name, module in pairs(doom[section_name]) do
+        last_module = module_name
+        if module.binds then
+          nest_package.applyKeymaps(type(module.binds) == 'function' and module.binds() or module.binds)
+        end
       end
     end
     -- Apply user keybinds

lua/doom/modules/core/treesitter/init.lua

@@ -61,7 +61,7 @@ treesitter.packages = {
 treesitter.configs = {}
 treesitter.configs["nvim-treesitter"] = function()
   local is_module_enabled = require("doom.utils").is_module_enabled
-  require("nvim-treesitter.configs").setup(vim.tbl_deep_extend("force", doom.modules.treesitter.settings.treesitter, {
+  require("nvim-treesitter.configs").setup(vim.tbl_deep_extend("force", doom.core.treesitter.settings.treesitter, {
     autopairs = {
       enable = is_module_enabled("autopairs"),
     },

lua/doom/modules/langs/bash/init.lua

@@ -10,7 +10,7 @@ bash.autocmds = {
     "*.sh",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      langs_utils.use_lsp(doom.modules.bash.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.bash.settings.language_server_name)
       
       vim.defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("bash")

lua/doom/modules/langs/c_sharp/init.lua

@@ -11,7 +11,7 @@ c_sharp.autocmds = {
     function()
       local langs_utils = require('doom.modules.langs.utils')
       local lsp_util = require 'lspconfig.util';
-      langs_utils.use_lsp(doom.modules.c_sharp.settings.language_server_name, {
+      langs_utils.use_lsp(doom.langs.c_sharp.settings.language_server_name, {
         config = {
           root_dir = function(fname)
             return lsp_util.root_pattern '*.sln'(fname)

lua/doom/modules/langs/config/init.lua

@@ -24,12 +24,12 @@ config.packages = {
 config.configs = {}
 config.configs["SchemaStore.nvim"] = function()
   local langs_utils = require('doom.modules.langs.utils')
-  langs_utils.use_lsp(doom.modules.config.settings.json_language_server_name, {
+  langs_utils.use_lsp(doom.langs.config.settings.json_language_server_name, {
     config = {
       settings = {
         json = {
           schemas = require('schemastore').json.schemas {
-            select = doom.modules.config.settings.json_schemas,
+            select = doom.langs.config.settings.json_schemas,
           },
         },
       },
@@ -43,8 +43,8 @@ config.autocmds = {
     "*.json,*.yaml,*.toml",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      -- langs_utils.use_lsp(doom.modules.config.settings.toml_language_server_name)
-      -- langs_utils.use_lsp(doom.modules.config.settings.yaml_language_server_name)
+      -- langs_utils.use_lsp(doom.langs.config.settings.toml_language_server_name)
+      -- langs_utils.use_lsp(doom.langs.config.settings.yaml_language_server_name)
 
       vim.defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("json5", "yaml", "toml")

lua/doom/modules/langs/cpp/init.lua

@@ -11,7 +11,7 @@ cpp.autocmds = {
     "*.cpp,*.c,*.h",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      langs_utils.use_lsp(doom.modules.cpp.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.cpp.settings.language_server_name)
       
       vim.defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("cpp", "c")

lua/doom/modules/langs/css/init.lua

@@ -10,7 +10,7 @@ css.autocmds = {
     "css,scss,vue,svelte,html",
     function()
       local langs_utils = require("doom.modules.langs.utils")
-      langs_utils.use_lsp(doom.modules.css.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.css.settings.language_server_name)
 
       vim.defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("css")

lua/doom/modules/langs/go/init.lua

@@ -10,7 +10,7 @@ go.autocmds = {
     "*.go",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      langs_utils.use_lsp(doom.modules.go.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.go.settings.language_server_name)
 
       defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("go")

lua/doom/modules/langs/haskell/init.lua

@@ -10,7 +10,7 @@ haskell.autocmds = {
     "*.hs",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      langs_utils.use_lsp(doom.modules.haskell.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.haskell.settings.language_server_name)
       
       local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
       parser_config.haskell = {

lua/doom/modules/langs/java/init.lua

@@ -10,7 +10,7 @@ java.autocmds = {
     "*.java",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      langs_utils.use_lsp(doom.modules.java.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.java.settings.language_server_name)
       
       vim.defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("java")

lua/doom/modules/langs/kotlin/init.lua

@@ -10,7 +10,7 @@ kotlin.autocmds = {
     "*.kt",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      langs_utils.use_lsp(doom.modules.kotlin.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.kotlin.settings.language_server_name)
 
       defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("kotlin")

lua/doom/modules/langs/lua/init.lua

@@ -39,7 +39,7 @@ lua.packages = {
 
 lua.configs = {}
 lua.configs["lua-dev.nvim"] = function()
-  require("lua-dev").setup(doom.modules.lua.settings.dev)
+  require("lua-dev").setup(doom.langs.lua.settings.dev)
 end
 
 lua.autocmds = {
@@ -53,7 +53,7 @@ lua.autocmds = {
       table.insert(runtime_path, "lua/?.lua")
       table.insert(runtime_path, "lua/?/init.lua")
 
-      local config = vim.tbl_deep_extend("force", doom.modules.lua.settings, {
+      local config = vim.tbl_deep_extend("force", doom.langs.lua.settings, {
         settings = {
           Lua = {
             runtime = {

lua/doom/modules/langs/python/init.lua

@@ -10,7 +10,7 @@ python.autocmds = {
     "*.py",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      langs_utils.use_lsp(doom.modules.python.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.python.settings.language_server_name)
       
       vim.defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("python")

lua/doom/modules/langs/svelte/init.lua

@@ -10,7 +10,7 @@ svelte.autocmds = {
     "*.svelte",
     function()
       local langs_utils = require('doom.modules.langs.utils')
-      langs_utils.use_lsp(doom.modules.svelte.settings.language_server_name)
+      langs_utils.use_lsp(doom.langs.svelte.settings.language_server_name)
 
       vim.defer_fn(function()
         require("nvim-treesitter.install").ensure_installed("svelte")

lua/doom/modules/langs/vue/init.lua

@@ -125,7 +125,7 @@ vue.autocmds = {
       local volar_api_config = vim.tbl_deep_extend(
         "force",
         {},
-        doom.modules.vue.settings.volar_api,
+        doom.langs.vue.settings.volar_api,
         base_config
       )
       langs_utils.use_lsp("volar", {
@@ -136,7 +136,7 @@ vue.autocmds = {
       local volar_doc_config = vim.tbl_deep_extend(
         "force",
         {},
-        doom.modules.vue.settings.volar_doc,
+        doom.langs.vue.settings.volar_doc,
         base_config
       )
       langs_utils.use_lsp("volar", {
@@ -147,7 +147,7 @@ vue.autocmds = {
       local volar_html_config = vim.tbl_deep_extend(
         "force",
         {},
-        doom.modules.vue.settings.volar_html,
+        doom.langs.vue.settings.volar_html,
         base_config
       )
       langs_utils.use_lsp("volar", {

modules.lua

@@ -6,7 +6,7 @@
 -- Uncomment a plugin to enable it and comment out to disable and uninstall it.
 
 return {
-  features = {
+  modules = {
     -- Language features (33ms)
     "annotations",        -- Code annotation generator
     "auto_install",       -- Auto install LSP providers