diff --git a/lua/cosmic/config/examples/readme.md b/lua/cosmic/config/examples/readme.md index 4babfe9..06a24fe 100644 --- a/lua/cosmic/config/examples/readme.md +++ b/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 ``` diff --git a/lua/cosmic/config/examples/utils.lua b/lua/cosmic/config/examples/utils.lua deleted file mode 100644 index f8fdcb4..0000000 --- a/lua/cosmic/config/examples/utils.lua +++ /dev/null @@ -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', 'tt', 'lua require("cosmic.config.utils").toggle_diagnostics()') diff --git a/lua/cosmic/core/init.lua b/lua/cosmic/core/init.lua index ff6a918..fece7d3 100644 --- a/lua/cosmic/core/init.lua +++ b/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 diff --git a/lua/cosmic/core/mappings.lua b/lua/cosmic/core/mappings.lua index e1eb957..7ef9032 100644 --- a/lua/cosmic/core/mappings.lua +++ b/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 diff --git a/lua/cosmic/core/pluginsInit.lua b/lua/cosmic/core/pluginsInit.lua index fa675d9..207ee45 100644 --- a/lua/cosmic/core/pluginsInit.lua +++ b/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({ diff --git a/lua/cosmic/config/init.lua b/lua/cosmic/core/user.lua similarity index 100% rename from lua/cosmic/config/init.lua rename to lua/cosmic/core/user.lua diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua index d9ba9cf..e1c27f0 100644 --- a/lua/cosmic/init.lua +++ b/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 diff --git a/lua/cosmic/lsp/diagnostics.lua b/lua/cosmic/lsp/diagnostics.lua index 4315742..50ab015 100644 --- a/lua/cosmic/lsp/diagnostics.lua +++ b/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 = { diff --git a/lua/cosmic/lsp/init.lua b/lua/cosmic/lsp/init.lua index fcc0b07..27e87e1 100644 --- a/lua/cosmic/lsp/init.lua +++ b/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') diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua index 469d43f..39f3d55 100644 --- a/lua/cosmic/lsp/providers/defaults.lua +++ b/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 diff --git a/lua/cosmic/lsp/providers/init.lua b/lua/cosmic/lsp/providers/init.lua index 364d2ed..ed9c3f8 100644 --- a/lua/cosmic/lsp/providers/init.lua +++ b/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({ diff --git a/lua/cosmic/lsp/providers/null_ls.lua b/lua/cosmic/lsp/providers/null_ls.lua index ad974b8..096b64b 100644 --- a/lua/cosmic/lsp/providers/null_ls.lua +++ b/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 {} diff --git a/lua/cosmic/lsp/providers/tsserver.lua b/lua/cosmic/lsp/providers/tsserver.lua index 5958f3d..acf4e30 100644 --- a/lua/cosmic/lsp/providers/tsserver.lua +++ b/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) diff --git a/lua/cosmic/plugins/auto-session/init.lua b/lua/cosmic/plugins/auto-session/init.lua index 547a203..5a10576 100644 --- a/lua/cosmic/plugins/auto-session/init.lua +++ b/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 = { diff --git a/lua/cosmic/plugins/comments/init.lua b/lua/cosmic/plugins/comments/init.lua index 883d71f..e25e1d8 100644 --- a/lua/cosmic/plugins/comments/init.lua +++ b/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({ diff --git a/lua/cosmic/plugins/cosmic-ui/init.lua b/lua/cosmic/plugins/cosmic-ui/init.lua index 25d4544..70ec2dd 100644 --- a/lua/cosmic/plugins/cosmic-ui/init.lua +++ b/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 = { diff --git a/lua/cosmic/plugins/galaxyline/init.lua b/lua/cosmic/plugins/galaxyline/init.lua index a074a8f..7369569 100644 --- a/lua/cosmic/plugins/galaxyline/init.lua +++ b/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') diff --git a/lua/cosmic/plugins/gitsigns/init.lua b/lua/cosmic/plugins/gitsigns/init.lua index c960726..5ae8cfe 100644 --- a/lua/cosmic/plugins/gitsigns/init.lua +++ b/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({ diff --git a/lua/cosmic/plugins/lsp-signature/init.lua b/lua/cosmic/plugins/lsp-signature/init.lua index b7e1609..0b50821 100644 --- a/lua/cosmic/plugins/lsp-signature/init.lua +++ b/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({ diff --git a/lua/cosmic/plugins/luasnip/init.lua b/lua/cosmic/plugins/luasnip/init.lua index dcd583a..5eff13e 100644 --- a/lua/cosmic/plugins/luasnip/init.lua +++ b/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') diff --git a/lua/cosmic/plugins/notify/init.lua b/lua/cosmic/plugins/notify/init.lua index 4e126e6..8361df0 100644 --- a/lua/cosmic/plugins/notify/init.lua +++ b/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') diff --git a/lua/cosmic/plugins/nvim-cmp/init.lua b/lua/cosmic/plugins/nvim-cmp/init.lua index 6536462..d0805e6 100644 --- a/lua/cosmic/plugins/nvim-cmp/init.lua +++ b/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() diff --git a/lua/cosmic/plugins/nvim-tree/init.lua b/lua/cosmic/plugins/nvim-tree/init.lua index 17e9129..375ec57 100644 --- a/lua/cosmic/plugins/nvim-tree/init.lua +++ b/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') diff --git a/lua/cosmic/plugins/telescope/init.lua b/lua/cosmic/plugins/telescope/init.lua index 7c5a7a6..59ef14d 100644 --- a/lua/cosmic/plugins/telescope/init.lua +++ b/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') diff --git a/lua/cosmic/plugins/todo-comments/init.lua b/lua/cosmic/plugins/todo-comments/init.lua index 6a85447..5d3fdc6 100644 --- a/lua/cosmic/plugins/todo-comments/init.lua +++ b/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') diff --git a/lua/cosmic/plugins/treesitter/init.lua b/lua/cosmic/plugins/treesitter/init.lua index 8ff1928..6dd981b 100644 --- a/lua/cosmic/plugins/treesitter/init.lua +++ b/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 = { diff --git a/lua/cosmic/theme/colors.lua b/lua/cosmic/theme/colors.lua index 28ec3f2..dd61b55 100644 --- a/lua/cosmic/theme/colors.lua +++ b/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 diff --git a/lua/cosmic/utils/init.lua b/lua/cosmic/utils/init.lua index 92a5a17..5adddee 100644 --- a/lua/cosmic/utils/init.lua +++ b/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')