feat(core): move user config init to core

lua/cosmic/config/examples/readme.md

@@ -1,18 +1,16 @@
-## Configuration
+# Configuration
 
-There are five main configuraiton files that you may want to create.
+There are two main configuraiton files that you may want to create.
 
 - cosmic/config/config.lua
 - cosmic/config/editor.lua
-- cosmic/config/utils.lua
 
 Please look at the examples in this directory in order to get started.
 
-#### Quick Start
+## Quick Start
 
-```
+```bash
 # from project root
 cp ./lua/cosmic/config/examples/config.lua ./lua/cosmic/config/config.lua
 cp ./lua/cosmic/config/examples/editor.lua ./lua/cosmic/config/editor.lua
-cp ./lua/cosmic/config/examples/utils.lua ./lua/cosmic/config/utils.lua
 ```

lua/cosmic/config/examples/utils.lua

@@ -1,19 +0,0 @@
--- attach any functions you want to use to M
-local M = {}
-local diagnostics_active = true
-
-function M.toggle_diagnostics()
-  if diagnostics_active then
-    vim.diagnostic.disable()
-    diagnostics_active = false
-  else
-    vim.diagnostic.enable()
-    diagnostics_active = true
-  end
-end
-
-return M
-
--- In config/config.lua
--- local map = require('cosmic.utils').map
--- map('n', '<leader>tt', '<cmd>lua require("cosmic.config.utils").toggle_diagnostics()<cr>')

lua/cosmic/core/init.lua

@@ -9,7 +9,7 @@ local cosmic_modules = {
 
 for _, mod in ipairs(cosmic_modules) do
   local ok, err = pcall(require, mod)
-  if not ok and not mod:find('cosmic.config') then
+  if not ok and not mod:find('cosmic.core.user') then
     error(('Error loading %s...\n\n%s'):format(mod, err))
   end
 end

lua/cosmic/core/mappings.lua

@@ -1,5 +1,5 @@
 local map = require('cosmic.utils').map
-local user_plugins = require('cosmic.config')
+local user_plugins = require('cosmic.core.user')
 
 -- Mappings for plugins that need to be lazy loaded
 if not vim.tbl_contains(user_plugins.disable_builtin_plugins, 'nvim-tree') then

lua/cosmic/core/pluginsInit.lua

@@ -7,7 +7,7 @@ end
 local packer = cosmic_packer.packer
 local use = packer.use
 
-local ok, user_config = pcall(require, 'cosmic.config')
+local ok, user_config = pcall(require, 'cosmic.core.user')
 if not ok then
   user_config = {
     add_plugins = {},
@@ -15,7 +15,7 @@ if not ok then
   }
 end
 
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 
 return packer.startup(function()
   use({

lua/cosmic/init.lua

@@ -10,7 +10,7 @@ for _, mod in ipairs(mods) do
     vim.notify('Run :PackerCompile!', vim.log.levels.WARN, {
       title = 'CosmicNvim',
     })
-  elseif not ok and not mod:find('cosmic.config') then
+  elseif not ok and not mod:find('cosmic.core.user') then
     error(('Error loading %s...\n\n%s'):format(mod, err))
   end
 end

lua/cosmic/lsp/diagnostics.lua

@@ -1,6 +1,6 @@
 local utils = require('cosmic.utils')
 local icons = require('cosmic.theme.icons')
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 
 -- set up LSP signs
 local signs = {

lua/cosmic/lsp/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 
 -- set up lsp servers
 require('cosmic.lsp.providers')

lua/cosmic/lsp/providers/defaults.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local M = {}
 
 local auto_format_lock = false

lua/cosmic/lsp/providers/init.lua

@@ -1,6 +1,6 @@
 local utils = require('cosmic.utils')
 local default_config = require('cosmic.lsp.providers.defaults')
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local lsp_installer = require('nvim-lsp-installer')
 
 lsp_installer.settings({

lua/cosmic/lsp/providers/null_ls.lua

@@ -1,6 +1,6 @@
 local u = require('cosmic.utils')
 local defaults = require('cosmic.lsp.providers.defaults')
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local null_ls = require('null-ls')
 
 local config_opts = config.lsp.servers.null_ls or {}

lua/cosmic/lsp/providers/tsserver.lua

@@ -1,6 +1,6 @@
 local utils = require('cosmic.utils')
 local default_on_attach = require('cosmic.lsp.providers.defaults').on_attach
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local M = {}
 
 function M.on_attach(client, bufnr)

lua/cosmic/plugins/auto-session/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local utils = require('cosmic.utils')
 
 local defaults = {

lua/cosmic/plugins/comments/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local utils = require('cosmic.utils')
 
 require('Comment').setup(utils.merge({

lua/cosmic/plugins/cosmic-ui/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local utils = require('cosmic.utils')
 
 local defaults = {

lua/cosmic/plugins/galaxyline/init.lua

@@ -7,7 +7,7 @@ local utils = require('cosmic.utils')
 local colors = require('cosmic.theme.colors')
 local set_highlight = require('cosmic.theme.utils').set_highlight
 local icons = require('cosmic.theme.icons')
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local get_highlight = require('cosmic.theme.utils').get_highlight
 local statusline_colors = get_highlight('StatusLine')
 

lua/cosmic/plugins/gitsigns/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local utils = require('cosmic.utils')
 
 require('gitsigns').setup(utils.merge({

lua/cosmic/plugins/lsp-signature/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local utils = require('cosmic.utils')
 
 require('lsp_signature').setup(utils.merge({

lua/cosmic/plugins/luasnip/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local ls = require('luasnip')
 local utils = require('cosmic.utils')
 

lua/cosmic/plugins/notify/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local icons = require('cosmic.theme.icons')
 local utils = require('cosmic.utils')
 

lua/cosmic/plugins/nvim-cmp/init.lua

@@ -1,7 +1,7 @@
 local cmp = require('cmp')
 local utils = require('cosmic.utils')
 local luasnip = require('luasnip')
-local user_config = require('cosmic.config')
+local user_config = require('cosmic.core.user')
 local icons = require('cosmic.theme.icons')
 
 local has_words_before = function()

lua/cosmic/plugins/nvim-tree/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local g = vim.g
 local icons = require('cosmic.theme.icons')
 local utils = require('cosmic.utils')

lua/cosmic/plugins/telescope/init.lua

@@ -1,5 +1,5 @@
 local actions = require('telescope.actions')
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local icons = require('cosmic.theme.icons')
 local utils = require('cosmic.utils')
 

lua/cosmic/plugins/todo-comments/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local icons = require('cosmic.theme.icons')
 local utils = require('cosmic.utils')
 

lua/cosmic/plugins/treesitter/init.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local utils = require('cosmic.utils')
 
 local defaults = {

lua/cosmic/theme/colors.lua

@@ -1,4 +1,4 @@
-local config = require('cosmic.config')
+local config = require('cosmic.core.user')
 local colors = {}
 local mod = 'cosmic.theme.integrated.'
 local supported_themes = require('cosmic.theme.plugins').supported_themes

lua/cosmic/utils/init.lua

@@ -84,7 +84,7 @@ end
 function M.reload_user_config_sync()
   M.reload_user_config()
   clear_cache()
-  unload('cosmic.config', true)
+  unload('cosmic.core.user', true)
   unload('cosmic.core.pluginsInit', true)
   vim.cmd([[autocmd User PackerCompileDone ++once lua require('cosmic.utils').post_reload()]])
   vim.cmd(':PackerSync')
@@ -92,7 +92,7 @@ end
 
 function M.reload_user_config(compile)
   compile = compile or false
-  unload('cosmic.config', true)
+  unload('cosmic.core.user', true)
   if compile then
     vim.cmd([[autocmd User PackerCompileDone ++once lua require('cosmic.utils').post_reload()]])
     vim.cmd(':PackerCompile')