refact: Renamed module fields (uses, autocmds, binds)

# Conflicts:
#	lua/doom/modules/features/statusline2/init.lua

lua/doom/core/config/init.lua

@@ -195,7 +195,7 @@ config.load = function()
     vim.opt.foldenable = true
     vim.opt.foldtext = require("doom.core.functions").sugar_folds()
     doom = config.defaults
-    doom.packages = {} -- Extra packages
+    doom.uses = {} -- Extra packages
     doom.autocmds = {} -- Extra autocommands
     doom.binds = {} -- Extra binds
     doom.modules = {} -- Modules
@@ -220,10 +220,10 @@ config.load = function()
       end
 
       -- Iterate over existing packages, removing all packages that are about to be overriden
-      doom.packages = vim.tbl_filter(package_override_predicate, doom.packages)
+      doom.uses = vim.tbl_filter(package_override_predicate, doom.uses)
 
       for _, packer_spec in ipairs(arg) do
-        table.insert(doom.packages, type(packer_spec) == "string" and { packer_spec } or packer_spec)
+        table.insert(doom.uses, type(packer_spec) == "string" and { packer_spec } or packer_spec)
       end
     end
     --]]

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

@@ -5,7 +5,7 @@ required.settings = {
 }
 local is_plugin_disabled = require("doom.utils").is_plugin_disabled
 
-required.packages = {
+required.uses = {
   ["packer.nvim"] = {
     "wbthomason/packer.nvim",
   },
@@ -36,8 +36,8 @@ required.packages = {
   }
 }
 
-required.configure_functions = {}
-required.configure_functions["nvim-mapper"] = function()
+required.configs = {}
+required.configs["nvim-mapper"] = function()
   require("nvim-mapper").setup(doom.modules.core.settings.mapper)
 end
 
@@ -317,7 +317,7 @@ required.binds = function ()
   return binds
 end
 
-required.autocommands = function ()
+required.autocmds = function ()
   local is_plugin_disabled = require("doom.utils").is_plugin_disabled
 
   local autocmds = {}

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

@@ -3,7 +3,7 @@ local nest = {}
 nest.settings = {
 }
 
-nest.packages = {
+nest.uses = {
   ["nest.nvim"] = {
     "connorgmeehan/nest.nvim",
     branch = "integrations-api",
@@ -11,8 +11,8 @@ nest.packages = {
   },
 }
 
-nest.configure_functions = {}
-nest.configure_functions["nest.nvim"] = function()
+nest.configs = {}
+nest.configs["nest.nvim"] = function()
   local utils = require("doom.utils")
   local is_plugin_disabled = utils.is_plugin_disabled
 

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

@@ -39,7 +39,7 @@ treesitter.settings = {
   },
 }
 
-treesitter.packages = {
+treesitter.uses = {
   ["nvim-treesitter"] = {
     "nvim-treesitter/nvim-treesitter",
     commit = "82389e52b6b50f712593079255ee088f1631b9cd",
@@ -58,8 +58,8 @@ treesitter.packages = {
   },
 }
 
-treesitter.configure_functions = {}
-treesitter.configure_functions["nvim-treesitter"] = function()
+treesitter.configs = {}
+treesitter.configs["nvim-treesitter"] = function()
   local is_plugin_disabled = require("doom.utils").is_plugin_disabled
   require("nvim-treesitter.configs").setup(vim.tbl_deep_extend("force", doom.modules.treesitter.settings.treesitter, {
     autopairs = {

lua/doom/modules/features/annotations/init.lua

@@ -11,7 +11,7 @@ annotations.settings = {
   },
 }
 
-annotations.packages = {
+annotations.uses = {
   ["neogen"] = {
     "danymat/neogen",
     commit = "b7d2ce8c1d17a0b90f557e5f94372f42193291a5",
@@ -19,8 +19,8 @@ annotations.packages = {
   },
 }
 
-annotations.configure_functions = {}
-annotations.configure_functions["neogen"] = function()
+annotations.configs = {}
+annotations.configs["neogen"] = function()
   require("neogen").setup(doom.modules.annotations.settings)
 end
 

lua/doom/modules/features/auto_install/init.lua

@@ -7,7 +7,7 @@ auto_install.settings = {
 
 local is_plugin_disabled = require("doom.utils").is_plugin_disabled
 
-auto_install.packages = {
+auto_install.uses = {
   ["DAPInstall.nvim"] = {
     "Pocco81/DAPInstall.nvim",
     commit = "24923c3819a450a772bb8f675926d530e829665f",
@@ -30,14 +30,14 @@ auto_install.packages = {
   },
 }
 
-auto_install.configure_functions = {}
-auto_install.configure_functions["nvim-lsp-installer"] = function()
+auto_install.configs = {}
+auto_install.configs["nvim-lsp-installer"] = function()
   local lsp_installer = require("nvim-lsp-installer")
   lsp_installer.settings({
     install_root_dir = doom.modules.auto_install.settings.lsp_dir,
   })
 end
-auto_install.configure_functions["DAPInstall.nvim"] = function()
+auto_install.configs["DAPInstall.nvim"] = function()
   local dap_install = require("dap-install")
   dap_install.setup({
     installation_path = doom.modules.auto_install.settings.dap_dir,

lua/doom/modules/features/auto_session/init.lua

@@ -4,7 +4,7 @@ auto_session.settings = {
   dir = vim.fn.stdpath("data") .. "/sessions/",
 }
 
-auto_session.packages = {
+auto_session.uses = {
   ["persistence.nvim"] = {
     "folke/persistence.nvim",
     commit = "77cf5a6ee162013b97237ff25450080401849f85",
@@ -12,8 +12,8 @@ auto_session.packages = {
   },
 }
 
-auto_session.configure_functions = {}
-auto_session.configure_functions["persistence.nvim"] = function()
+auto_session.configs = {}
+auto_session.configs["persistence.nvim"] = function()
   require("persistence").setup(doom.modules.auto_session.settings)
 end
 

lua/doom/modules/features/autopairs/init.lua

@@ -6,7 +6,7 @@ autopairs.settings = {
   enable_moveright = true,
 }
 
-autopairs.packages = {
+autopairs.uses = {
   ["nvim-autopairs"] = {
     "windwp/nvim-autopairs",
     commit = "771fda8d169384d345c8bbf2f871b75ba4a2dee5",
@@ -14,8 +14,8 @@ autopairs.packages = {
   },
 }
 
-autopairs.configure_functions = {}
-autopairs.configure_functions["nvim-autopairs"] = function()
+autopairs.configs = {}
+autopairs.configs["nvim-autopairs"] = function()
   require("nvim-autopairs").setup(vim.tbl_deep_extend("force", doom.modules.autopairs.settings, { check_ts = true }))
 end
 

lua/doom/modules/features/colorizer/init.lua

@@ -6,7 +6,7 @@ colorizer.settings = {
   html = { names = false },
 }
 
-colorizer.packages = {
+colorizer.uses = {
   ["nvim-colorizer.lua"] = {
     "norcalli/nvim-colorizer.lua",
     commit = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6",
@@ -14,8 +14,8 @@ colorizer.packages = {
   },
 }
 
-colorizer.configure_functions = {}
-colorizer.configure_functions["nvim-colorizer.lua"] = function()
+colorizer.configs = {}
+colorizer.configs["nvim-colorizer.lua"] = function()
   require("colorizer").setup(doom.modules.colorizer.settings)
 end
 

lua/doom/modules/features/comment/init.lua

@@ -41,7 +41,7 @@ comment.settings = {
   end,
 }
 
-comment.packages = {
+comment.uses = {
   ["Comment.nvim"] = {
     "numToStr/Comment.nvim",
     commit = "18a8dc0bbdfc089d5f5a850e4640d8e75381c598",
@@ -49,8 +49,8 @@ comment.packages = {
   },
 }
 
-comment.configure_functions = {}
-comment.configure_functions["Comment.nvim"] = function()
+comment.configs = {}
+comment.configs["Comment.nvim"] = function()
   local config = vim.tbl_extend("force", doom.modules.comment.settings, {
     -- Disable mappings as we'll handle it in binds.lua
     mappings = {

lua/doom/modules/features/dap/init.lua

@@ -35,7 +35,7 @@ dap.settings = {
   },
 }
 
-dap.packages = {
+dap.uses = {
   ["nvim-dap"] = {
     "mfussenegger/nvim-dap",
     commit = "9fcff6e02e1a549d47a2c559a4b833798537c0bc",
@@ -48,8 +48,8 @@ dap.packages = {
   },
 }
 
-dap.configure_functions = {}
-dap.configure_functions["nvim-dap-ui"] = function()
+dap.configs = {}
+dap.configs["nvim-dap-ui"] = function()
   local dap_package = require("dap")
   local dapui = require("dapui")
   dap_package.listeners.after.event_initialized["dapui_config"] = function()

lua/doom/modules/features/dashboard/init.lua

@@ -54,7 +54,7 @@ dashboard.settings = {
   },
 }
 
-dashboard.packages = {
+dashboard.uses = {
   ["dashboard-nvim"] = {
     "glepnir/dashboard-nvim",
     commit = "ba98ab86487b8eda3b0934b5423759944b5f7ebd",
@@ -64,8 +64,8 @@ dashboard.packages = {
 }
 
 
-dashboard.configure_functions = {}
-dashboard.configure_functions["dashboard-nvim"] = function()
+dashboard.configs = {}
+dashboard.configs["dashboard-nvim"] = function()
   local utils = require("doom.utils")
   local is_plugin_disabled = utils.is_plugin_disabled
 
@@ -112,7 +112,7 @@ dashboard.binds = {
   },
 }
 
-dashboard.autocommands = {
+dashboard.autocmds = {
   {
     "FileType",
     "dashboard",

lua/doom/modules/features/doom_reloader/init.lua

@@ -11,10 +11,10 @@ doom_reloader.settings = {
   },
 }
 
-doom_reloader.packages = {}
-doom_reloader.configure_functions = {}
+doom_reloader.uses = {}
+doom_reloader.configs = {}
 
-doom_reloader.autocommands = {
+doom_reloader.autocmds = {
   { "BufWritePost", "*/doom/**/*.lua", function() require("doom.utils.reloader").full_reload() end },
   {
     "BufWritePost",

lua/doom/modules/features/doom_themes/init.lua

@@ -2,9 +2,9 @@ local doom_themes = {}
 
 doom_themes.settings = {}
 
-doom_themes.configure_functions = {}
+doom_themes.configs = {}
 
-doom_themes.packages = {
+doom_themes.uses = {
   ["doom-themes.nvim"] = {
     "GustavoPrietoP/doom-themes.nvim",
     commit = "03d417d3eab71c320744f8da22251715ba6cee53",

lua/doom/modules/features/editorconfig/init.lua

@@ -2,13 +2,13 @@ local editorconfig = {}
 
 editorconfig.settings = {}
 
-editorconfig.packages = {
+editorconfig.uses = {
   ["editorconfig-vim"] = {
     "editorconfig/editorconfig-vim",
     commit = "a8e3e66deefb6122f476c27cee505aaae93f7109",
   },
 }
 
-editorconfig.configure_functions = {}
+editorconfig.configs = {}
 
 return editorconfig

lua/doom/modules/features/explorer/init.lua

@@ -74,7 +74,7 @@ explorer.settings = {
   },
 }
 
-explorer.packages = {
+explorer.uses = {
   ["nvim-tree.lua"] = {
     "kyazdani42/nvim-tree.lua",
     commit = "9b03ab40e843e251f01bccec2eca5ea9dcdebc0d",
@@ -90,8 +90,8 @@ explorer.packages = {
 }
 
 
-explorer.configure_functions = {}
-explorer.configure_functions["nvim-tree.lua"] = function()
+explorer.configs = {}
+explorer.configs["nvim-tree.lua"] = function()
   local utils = require("doom.utils")
   local is_plugin_disabled = utils.is_plugin_disabled
 

lua/doom/modules/features/fidget/init.lua

@@ -3,15 +3,15 @@ local fidget = {}
 fidget.settings = {
 }
 
-fidget.packages = {
+fidget.uses = {
   ["fidget.nvim"] = {
     "j-hui/fidget.nvim",
     commit = "cbe0db4f2adfddfd830310e5846f8735d4e068fa",
   },
 }
 
-fidget.configure_functions = {}
-fidget.configure_functions["fidget.nvim"] = function()
+fidget.configs = {}
+fidget.configs["fidget.nvim"] = function()
   require("fidget").setup(doom.modules.fidget.settings)
 end
 

lua/doom/modules/features/firenvim/init.lua

@@ -22,7 +22,7 @@ firenvim.settings = {
   },
 }
 
-firenvim.packages = {
+firenvim.uses = {
   ["firenvim"] = {
     "glacambre/firenvim",
     commit = "668b350ce88cc9a2257644c67945c9abbdd36cb5",
@@ -33,8 +33,8 @@ firenvim.packages = {
   },
 }
 
-firenvim.configure_functions = {}
-firenvim.configure_functions["firenvim"] = function()
+firenvim.configs = {}
+firenvim.configs["firenvim"] = function()
   vim.g.firenvim_config = doom.modules.firenvim.settings
 
   for _, command in ipairs(doom.modules.firenvim.settings.autocmds) do

lua/doom/modules/features/gitsigns/init.lua

@@ -72,15 +72,15 @@ gitsigns.settings = {
   },
 }
 
-gitsigns.packages = {
+gitsigns.uses = {
   ["gitsigns.nvim"] = {
     "lewis6991/gitsigns.nvim",
     commit = "7de953329ff696408bd38d3218b0239839d285e0",
   },
 }
 
-gitsigns.configure_functions = {}
-gitsigns.configure_functions["gitsigns.nvim"] = function()
+gitsigns.configs = {}
+gitsigns.configs["gitsigns.nvim"] = function()
   require("gitsigns").setup(doom.modules.gitsigns.settings)
 end
 

lua/doom/modules/features/illuminate/init.lua

@@ -13,15 +13,15 @@ illuminate.settings = {
   },
 }
 
-illuminate.packages = {
+illuminate.uses = {
   ["vim-illuminate"] = {
     "RRethy/vim-illuminate",
     commit = "db98338285574265a6ce54370b54d9f939e091bb",
   },
 }
 
-illuminate.configure_functions = {}
-illuminate.configure_functions["vim-illuminate"] = function()
+illuminate.configs = {}
+illuminate.configs["vim-illuminate"] = function()
   vim.g.Illuminate_ftblacklist = doom.modules.illuminate.settings.blacklist
 end
 

lua/doom/modules/features/indentlines/init.lua

@@ -8,7 +8,7 @@ indentlines.settings = {
   buftype_exclude = { "terminal" },
 }
 
-indentlines.packages = {
+indentlines.uses = {
   ["indent-blankline.nvim"] = {
     "lukas-reineke/indent-blankline.nvim",
     commit = "2e35f7dcdc72f39b37c21e43cdb538d7a41c7e07",
@@ -16,8 +16,8 @@ indentlines.packages = {
   },
 }
 
-indentlines.configure_functions = {}
-indentlines.configure_functions["indent-blankline.nvim"] = function()
+indentlines.configs = {}
+indentlines.configs["indent-blankline.nvim"] = function()
   require("indent_blankline").setup(vim.tbl_deep_extend("force", doom.modules.indentlines.settings, {
     -- To remove indent lines, remove the module. Having the module and
     -- disabling it makes no sense.

lua/doom/modules/features/lazygit/init.lua

@@ -2,7 +2,7 @@ local lazygit = {}
 
 lazygit.settings = {}
 
-lazygit.packages = {
+lazygit.uses = {
   ["lazygit.nvim"] = {
     "kdheepak/lazygit.nvim",
     commit = "9bceeab97668935cc6b91ab5190167d9771b5210",

lua/doom/modules/features/linter/init.lua

@@ -4,7 +4,7 @@ linter.settings = {
   format_on_save = false,
 }
 
-linter.packages = {
+linter.uses = {
   ["null-ls.nvim"] = {
     "jose-elias-alvarez/null-ls.nvim",
     commit = "a1804de23ce354c982aa08c57d3ed89aad8a15a9",
@@ -12,8 +12,8 @@ linter.packages = {
   },
 }
 
-linter.configure_functions = {}
-linter.configure_functions["null-ls.nvim"] = function()
+linter.configs = {}
+linter.configs["null-ls.nvim"] = function()
   local null_ls = require("null-ls")
 
   null_ls.setup({

lua/doom/modules/features/lsp/init.lua

@@ -78,7 +78,7 @@ lsp.settings = {
 }
 
 local is_plugin_disabled = require("doom.utils").is_plugin_disabled
-lsp.packages = {
+lsp.uses = {
   ["nvim-lspconfig"] = {
     "neovim/nvim-lspconfig",
     commit = "cdc2ec53e028d32f06c51ef8b2837ebb8460ef45",
@@ -131,8 +131,8 @@ lsp.packages = {
 }
 
 
-lsp.configure_functions = {}
-lsp.configure_functions["nvim-lspconfig"] = function()
+lsp.configs = {}
+lsp.configs["nvim-lspconfig"] = function()
   -- Lsp Symbols
   local signs, hl
   if vim.fn.has("nvim-0.6.0") == 1 then
@@ -195,7 +195,7 @@ lsp.configure_functions["nvim-lspconfig"] = function()
     end
   end
 end
-lsp.configure_functions["nvim-cmp"] = function()
+lsp.configs["nvim-cmp"] = function()
   local cmp = require("cmp")
   local luasnip = require("luasnip")
   local replace_termcodes = require("doom.utils").replace_termcodes
@@ -280,7 +280,7 @@ lsp.configure_functions["nvim-cmp"] = function()
     end,
   }))
 end
-lsp.configure_functions["lsp_signature.nvim"] = function()
+lsp.configs["lsp_signature.nvim"] = function()
   -- Signature help
   require("lsp_signature").setup(vim.tbl_deep_extend("force", doom.modules.lsp.settings.signature, {
     handler_opts = {

lua/doom/modules/features/minimap/init.lua

@@ -2,7 +2,7 @@ local minimap = {}
 
 minimap.settings = {}
 
-minimap.packages = {
+minimap.uses = {
   ["minimap.vim"] = {
     "wfxr/minimap.vim",
     commit = "c8ea2a5550b95b007631bc83908c48a3368eb57c",
@@ -18,7 +18,7 @@ minimap.packages = {
 }
 
 
-minimap.configure_functions = {}
+minimap.configs = {}
 
 minimap.binds = {
   { "<F5>", ":MinimapToggle<CR>", name = "Toggle minimap" },

lua/doom/modules/features/neogit/init.lua

@@ -2,7 +2,7 @@ local neogit = {}
 
 neogit.settings = {}
 
-neogit.packages = {
+neogit.uses = {
   ["neogit"] = {
     "TimUntersberger/neogit",
     commit = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0",
@@ -11,8 +11,8 @@ neogit.packages = {
   },
 }
 
-neogit.configure_functions = {}
-neogit.configure_functions["neogit"] = function()
+neogit.configs = {}
+neogit.configs["neogit"] = function()
   require("neogit").setup(doom.modules.neogit.settings)
 end
 

lua/doom/modules/features/neorg/init.lua

@@ -29,15 +29,15 @@ neorg.settings = {
   },
 }
 
-neorg.packages = {
+neorg.uses = {
   ["neorg"] = {
     "nvim-neorg/neorg",
     commit = "acfa3929971d488afac9c392fb34b80bac4f4c71",
   }
 }
 
-neorg.configure_functions = {}
-neorg.configure_functions["neorg"] = function()
+neorg.configs = {}
+neorg.configs["neorg"] = function()
   require("neorg").setup(doom.modules.neorg.settings)
 end
 

lua/doom/modules/features/projects/init.lua

@@ -35,7 +35,7 @@ projects.settings ={
   datapath = vim.fn.stdpath("data"),
 }
 
-projects.packages = {
+projects.uses = {
   ["project.nvim"] = {
     "ahmedkhalf/project.nvim",
     commit = "cef52b8da07648b750d7f1e8fb93f12cb9482988",
@@ -43,8 +43,8 @@ projects.packages = {
   },
 }
 
-projects.configure_functions = {}
-projects.configure_functions["project.nvim"] = function()
+projects.configs = {}
+projects.configs["project.nvim"] = function()
   require("project_nvim").setup(doom.modules.projects.settings)
 
   table.insert(doom.modules.telescope.settings.extensions, 'projects')

lua/doom/modules/features/range_highlight/init.lua

@@ -2,7 +2,7 @@ local range_highlight = {}
 
 range_highlight.settings = {}
 
-range_highlight.packages = {
+range_highlight.uses = {
   ["range-highlight.nvim"] = {
     "winston0410/range-highlight.nvim",
     commit = "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9",
@@ -13,8 +13,8 @@ range_highlight.packages = {
   },
 }
 
-range_highlight.configure_functions = {}
-range_highlight.configure_functions["range-highlight.nvim"] = function()
+range_highlight.configs = {}
+range_highlight.configs["range-highlight.nvim"] = function()
   require("range-highlight").setup(doom.modules.range_highlight.settings)
 end
 

lua/doom/modules/features/ranger/init.lua

@@ -2,7 +2,7 @@ local ranger = {}
 
 ranger.settings = {}
 
-ranger.packages = {
+ranger.uses = {
   ["ranger.vim"] = {
     "francoiscabrol/ranger.vim",
     commit = "91e82debdf566dfaf47df3aef0a5fd823cedf41c",
@@ -19,7 +19,7 @@ ranger.packages = {
   },
 }
  
-ranger.configure_functions = {}
+ranger.configs = {}
 
 ranger.binds = {
   "<leader>",

lua/doom/modules/features/restclient/init.lua

@@ -2,7 +2,7 @@ local restclient = {}
 
 restclient.settings = {}
 
-restclient.packages = {
+restclient.uses = {
   ["rest.nvim"] = {
     "NTBBloodbath/rest.nvim",
     commit = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3",
@@ -15,8 +15,8 @@ restclient.packages = {
 }
 
 
-restclient.configure_functions = {}
-restclient.configure_functions["rest.nvim"] = function()
+restclient.configs = {}
+restclient.configs["rest.nvim"] = function()
   require("rest-nvim").setup(doom.modules.restclient.settings)
 end
 

lua/doom/modules/features/show_registers/init.lua

@@ -2,7 +2,7 @@ local show_registers = {}
 
 show_registers.settings = {}
 
-show_registers.packages = {
+show_registers.uses = {
   ["registers.nvim"] = {
     "tversteeg/registers.nvim",
     commit = "dd2bfa41b2c43d65f1f715e07acf1f1d34b37de8",
@@ -10,6 +10,6 @@ show_registers.packages = {
   },
 }
 
-show_registers.configure_functions = {}
+show_registers.configs = {}
 
 return show_registers

lua/doom/modules/features/snippets/init.lua

@@ -5,7 +5,7 @@ snippets.settings = {
   updateevents = "TextChanged,TextChangedI",
 }
 
-snippets.packages = {
+snippets.uses = {
   ["LuaSnip"] = {
     "L3MON4D3/LuaSnip",
     commit = "7c634ddf7ff99245ef993b5fa459c3b61e905075",
@@ -14,8 +14,8 @@ snippets.packages = {
   },
 }
 
-snippets.configure_functions = {}
-snippets.configure_functions["LuaSnip"] = function()
+snippets.configs = {}
+snippets.configs["LuaSnip"] = function()
   require("luasnip").config.set_config(doom.modules.snippets.settings)
   require("luasnip.loaders.from_vscode").load()
 end

lua/doom/modules/features/statusline/init.lua

@@ -14,15 +14,15 @@ statusline.settings = {
   sections = {},
 }
 
-statusline.packages = {
+statusline.uses = {
   ["galaxyline.nvim"] = {
     "NTBBloodbath/galaxyline.nvim",
     commit = "4d4f5fc8e20a10824117e5beea7ec6e445466a8f",
   },
 }
 
-statusline.configure_functions = {}
-statusline.configure_functions["galaxyline.nvim"] = function()
+statusline.configs = {}
+statusline.configs["galaxyline.nvim"] = function()
   local utils = require("doom.utils")
   local is_plugin_disabled = utils.is_plugin_disabled
 

lua/doom/modules/features/suda/init.lua

@@ -2,7 +2,7 @@ local suda = {}
 
 suda.settings = {}
 
-suda.packages = {
+suda.uses = {
   ["suda.vim"] = {
     "lambdalisue/suda.vim",
     commit = "6bffe36862faa601d2de7e54f6e85c1435e832d0",
@@ -11,7 +11,7 @@ suda.packages = {
   },
 }
 
-suda.configure_functions = {}
+suda.configs = {}
 
 suda.binds = {
   "<leader>",

lua/doom/modules/features/superman/init.lua

@@ -2,7 +2,7 @@ local superman = {}
 
 superman.settings = {}
 
-superman.packages = {
+superman.uses = {
   ["vim-superman"] = {
     "jez/vim-superman",
     commit = "19d307446576d9118625c5d9d3c7a4c9bec5571a",
@@ -11,6 +11,6 @@ superman.packages = {
   },
 }
 
-superman.configure_functions = {}
+superman.configs = {}
 
 return superman

lua/doom/modules/features/symbols/init.lua

@@ -16,7 +16,7 @@ symbols.settings = {
   width = 25,
 }
 
-symbols.packages = {
+symbols.uses = {
   ["symbols-outline.nvim"] = {
     "simrat39/symbols-outline.nvim",
     commit = "758944ebc6919c50557b6eb3a52bc41187041fe2",
@@ -31,8 +31,8 @@ symbols.packages = {
 
 
 
-symbols.configure_functions = {}
-symbols.configure_functions["symbols_outline.nvim"] = function()
+symbols.configs = {}
+symbols.configs["symbols_outline.nvim"] = function()
   vim.g.symbols_outline = doom.modules.symbols.settings
 end
 

lua/doom/modules/features/tabline/init.lua

@@ -139,7 +139,7 @@ tabline.settings = {
   },
 }
 
-tabline.packages = {
+tabline.uses = {
   ["bufferline.nvim"] = {
     "akinsho/bufferline.nvim",
     commit = "871495d9e2dbe3314a421fd2d5e46f47de7ee537",
@@ -148,8 +148,8 @@ tabline.packages = {
 }
 
 
-tabline.configure_functions = {}
-tabline.configure_functions["bufferline.nvim"] = function()
+tabline.configs = {}
+tabline.configs["bufferline.nvim"] = function()
   require("bufferline").setup(doom.modules.tabline.settings)
 end
 

lua/doom/modules/features/telescope/init.lua

@@ -46,7 +46,7 @@ telescope.settings = {
   extensions = { "mapper" },
 }
 
-telescope.packages = {
+telescope.uses = {
   ["telescope.nvim"] = {
     "nvim-telescope/telescope.nvim",
     commit = "567ec85b157f1606b500a0f755181f284810a28e",
@@ -56,8 +56,8 @@ telescope.packages = {
 }
 
 
-telescope.configure_functions = {}
-telescope.configure_functions["telescope.nvim"] = function()
+telescope.configs = {}
+telescope.configs["telescope.nvim"] = function()
   local telescope_package = require("telescope")
   local actions = require("telescope.actions")
 
@@ -187,7 +187,7 @@ telescope.binds = function ()
   return binds
 end
 
-telescope.autocommands = {
+telescope.autocmds = {
   { "User", "TelescopePreviewerLoaded", "setlocal wrap" },
 }
 

lua/doom/modules/features/terminal/init.lua

@@ -22,7 +22,7 @@ terminal.settings = {
   },
 }
 
-terminal.packages = {
+terminal.uses = {
   ["toggleterm.nvim"] = {
     "akinsho/toggleterm.nvim",
     commit = "e97d0c1046512e975a9f3fa95afe98f312752b1c",
@@ -31,8 +31,8 @@ terminal.packages = {
   },
 }
 
-terminal.configure_functions = {}
-terminal.configure_functions["toggleterm.nvim"] = function()
+terminal.configs = {}
+terminal.configs["toggleterm.nvim"] = function()
   require("toggleterm").setup(doom.modules.terminal.settings)
 end
 

lua/doom/modules/features/todo_comments/init.lua

@@ -2,7 +2,7 @@ local todo_comments = {}
 
 todo_comments.settings = {}
 
-todo_comments.packages = {
+todo_comments.uses = {
   ["todo-comments.nvim"] = {
     "folke/todo-comments.nvim",
     commit = "98b1ebf198836bdc226c0562b9f906584e6c400e",
@@ -12,8 +12,8 @@ todo_comments.packages = {
 
 
 
-todo_comments.configure_functions = {}
-todo_comments.configure_functions["todo-comments.nvim"] = function()
+todo_comments.configs = {}
+todo_comments.configs["todo-comments.nvim"] = function()
   require("todo-comments").setup(doom.modules.todo_comments.settings)
 end
 

lua/doom/modules/features/trouble/init.lua

@@ -2,7 +2,7 @@ local trouble = {}
 
 trouble.settings = {}
 
-trouble.packages = {
+trouble.uses = {
   ["trouble.nvim"] = {
     "folke/trouble.nvim",
     commit = "20469be985143d024c460d95326ebeff9971d714",
@@ -11,8 +11,8 @@ trouble.packages = {
   },
 }
 
-trouble.configure_functions = {}
-trouble.configure_functions["trouble.nvim"] = function()
+trouble.configs = {}
+trouble.configs["trouble.nvim"] = function()
   require("trouble").setup(doom.modules.trouble.settings)
 end
 

lua/doom/modules/features/whichkey/init.lua

@@ -61,7 +61,7 @@ whichkey.settings = {
   triggers = "auto",
 }
 
-whichkey.packages = {
+whichkey.uses = {
   ["which-key.nvim"] = {
     "folke/which-key.nvim",
     commit = "28d2bd129575b5e9ebddd88506601290bb2bb221",
@@ -69,8 +69,8 @@ whichkey.packages = {
 }
 
 
-whichkey.configure_functions = {}
-whichkey.configure_functions["which-key.nvim"] = function()
+whichkey.configs = {}
+whichkey.configs["which-key.nvim"] = function()
   vim.g.mapleader = doom.modules.whichkey.settings.leader
 
   local wk = require("which-key")

lua/doom/modules/features/zen/init.lua

@@ -48,7 +48,7 @@ zen.settings = {
   },
 }
 
-zen.packages = {
+zen.uses = {
   ["TrueZen.nvim"] = {
     "Pocco81/TrueZen.nvim",
     commit = "508b977d71650da5c9243698614a9a1416f116d4",
@@ -58,8 +58,8 @@ zen.packages = {
 }
 
 
-zen.configure_functions = {}
-zen.configure_functions["TrueZen.nvim"] = function()
+zen.configs = {}
+zen.configs["TrueZen.nvim"] = function()
   require("true-zen").setup(doom.modules.zen.settings)
 end
 

lua/doom/modules/init.lua

@@ -51,12 +51,12 @@ packer.reset()
 
 -- 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
+  -- Import dependencies with packer from module.uses
+  if module.uses then
+    for dependency_name, packer_spec in pairs(module.uses) do
       -- Set packer_spec to configure function
-      if module.configure_functions and module.configure_functions[dependency_name] then
-        packer_spec.config = module.configure_functions[dependency_name]
+      if module.configs and module.configs[dependency_name] then
+        packer_spec.config = module.configs[dependency_name]
       end
 
       -- Set/unset frozen packer dependencies
@@ -67,13 +67,13 @@ for module_name, module in pairs(doom.modules) do
     end
   end
   -- Setup package autogroups
-  if module.autocommands then
-    local autocommands = type(module.autocommands) == 'function' and module.autocommands() or module.autocommands
-    utils.make_augroup(module_name, autocommands)
+  if module.autocmds then
+    local autocmds = type(module.autocmds) == 'function' and module.autocmds() or module.autocmds
+    utils.make_augroup(module_name, autocmds)
   end
 end
 
 -- Handle extra user modules
-for _, packer_spec in ipairs(doom.packages) do
+for _, packer_spec in ipairs(doom.uses) do
   use(packer_spec)
 end

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

@@ -4,7 +4,7 @@ bash.settings = {
   language_server_name = 'bashls',
 }
 
-bash.autocommands = {
+bash.autocmds = {
   {
     "FileType",
     "sh",

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

@@ -4,7 +4,7 @@ c_sharp.settings = {
   language_server_name = 'omnisharp',
 }
 
-c_sharp.autocommands = {
+c_sharp.autocmds = {
   {
     "FileType",
     "cs",

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

@@ -14,15 +14,15 @@ config.settings = {
   -- yaml_language_server_name = 'yamlls', -- Currently broken
 }
 
-config.packages = {
+config.uses = {
   ["SchemaStore.nvim"] = {
     "b0o/SchemaStore.nvim",
     commit = "df5e98d3b3c93e9857908fce8a219360f81c5e32",
     ft = { "json", "yaml", "toml" }
   },
 }
-config.configure_functions = {}
-config.configure_functions["SchemaStore.nvim"] = function()
+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, {
     config = {
@@ -37,7 +37,7 @@ config.configure_functions["SchemaStore.nvim"] = function()
   })
 end
 
-config.autocommands = {
+config.autocmds = {
   {
     "FileType",
     "json,yaml,toml",

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

@@ -5,7 +5,7 @@ cpp.settings = {
   language_server_name = utils.get_sysname() == 'Darwin' and 'clangd' or 'ccls',
 }
 
-cpp.autocommands = {
+cpp.autocmds = {
   {
     "FileType",
     "cpp",

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

@@ -4,7 +4,7 @@ css.settings = {
   language_server_name = 'cssls',
 }
 
-css.autocommands = {
+css.autocmds = {
   {
     "BufNewFile,BufRead",
     "*.css,*.scss,*.vue",

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

@@ -4,7 +4,7 @@ glsl.settings = {
   language_server_name = 'bashls',
 }
 
-glsl.autocommands = {
+glsl.autocmds = {
   {
     "FileType",
     "glsl,vs,fs,frag,vert",

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

@@ -4,7 +4,7 @@ go.settings = {
   language_server_name = 'gopls',
 }
 
-go.autocommands = {
+go.autocmds = {
   {
     "FileType",
     "go",

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

@@ -4,7 +4,7 @@ haskell.settings = {
   language_server_name = 'hls',
 }
 
-haskell.autocommands = {
+haskell.autocmds = {
   {
     "FileType",
     "haskell",

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

@@ -4,7 +4,7 @@ java.settings = {
   language_server_name = 'jdtls',
 }
 
-java.autocommands = {
+java.autocmds = {
   {
     "FileType",
     "sh",

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

@@ -2,7 +2,7 @@ local javascript = {}
 
 javascript.settings = {}
 
-javascript.autocommands = {
+javascript.autocmds = {
   {
     "FileType",
     "javascript,javascriptreact",

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

@@ -4,7 +4,7 @@ kotlin.settings = {
   language_server_name = 'kotlin_language_server',
 }
 
-kotlin.autocommands = {
+kotlin.autocmds = {
   {
     "FileType",
     "kotlin",

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

@@ -29,7 +29,7 @@ lua.settings = {
   },
 }
 
-lua.packages = {
+lua.uses = {
   ["lua-dev.nvim"] = {
     "folke/lua-dev.nvim",
     commit = "a0ee77789d9948adce64d98700cc90cecaef88d5",
@@ -37,12 +37,12 @@ lua.packages = {
   },
 }
 
-lua.configure_functions = {}
-lua.configure_functions["lua-dev.nvim"] = function()
+lua.configs = {}
+lua.configs["lua-dev.nvim"] = function()
   require("lua-dev").setup(doom.modules.lua.settings.dev)
 end
 
-lua.autocommands = {
+lua.autocmds = {
   {
     "FileType",
     "lua",

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

@@ -4,7 +4,7 @@ python.settings = {
   language_server_name = 'pyright',
 }
 
-python.autocommands = {
+python.autocmds = {
   {
     "FileType",
     "python",

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

@@ -3,7 +3,7 @@ local rust = {}
 rust.settings = {
 }
 
-rust.autocommands = {
+rust.autocmds = {
   {
     "FileType",
     "rust",

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

@@ -3,7 +3,7 @@ local tailwindcss = {}
 tailwindcss.settings = {
 }
 
-tailwindcss.autocommands = {
+tailwindcss.autocmds = {
   {
     "FileType",
     "css,scss,vue,html",

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

@@ -3,7 +3,7 @@ local terraform = {}
 terraform.settings = {
 }
 
-terraform.autocommands = {
+terraform.autocmds = {
   {
     "FileType",
     "terraform",

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

@@ -3,7 +3,7 @@ local typescript = {}
 typescript.settings = {
 }
 
-typescript.autocommands = {
+typescript.autocmds = {
   {
     "FileType",
     "typescript,typescriptreact",

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

@@ -70,9 +70,9 @@ vue.settings = {
   }
 }
 
-vue.configure_functions = {}
+vue.configs = {}
 
-vue.autocommands = {
+vue.autocmds = {
   {
     "FileType",
     "vue",