diff --git a/lua/cosmic/core/mappings.lua b/lua/cosmic/core/mappings.lua index 3a3f182..025dd3b 100644 --- a/lua/cosmic/core/mappings.lua +++ b/lua/cosmic/core/mappings.lua @@ -6,8 +6,8 @@ map('n', 'cc', ':cclose ') map('n', 'co', ':copen ') map('n', 'cf', ':cfdo %s/') -require('cosmic.modules.session.mappings') -require('cosmic.modules.telescope.mappings').init() -require('cosmic.modules.nvim-tree.mappings') -require('cosmic.modules.terminal.mappings') +require('cosmic.plugins.auto-session.mappings') +require('cosmic.plugins.telescope.mappings').init() +require('cosmic.plugins.nvim-tree.mappings') +require('cosmic.plugins.terminal.mappings') require('cosmic.lsp.mappings') diff --git a/lua/cosmic/core/pluginsInit.lua b/lua/cosmic/core/pluginsInit.lua index 238016b..a5777e7 100644 --- a/lua/cosmic/core/pluginsInit.lua +++ b/lua/cosmic/core/pluginsInit.lua @@ -38,7 +38,7 @@ return packer.startup(function() use({ 'rcarriga/nvim-notify', config = function() - require('cosmic.modules.notify') + require('cosmic.plugins.notify') end, after = config.theme, disable = vim.tbl_contains(user_plugins.disable, 'notify'), @@ -50,7 +50,7 @@ return packer.startup(function() branch = 'main', requires = { 'kyazdani42/nvim-web-devicons', opt = true }, config = function() - require('cosmic.modules.statusline') + require('cosmic.plugins.galaxyline') end, after = config.theme, disable = vim.tbl_contains(user_plugins.disable, 'statusline'), @@ -60,7 +60,7 @@ return packer.startup(function() use({ 'kyazdani42/nvim-tree.lua', config = function() - require('cosmic.modules.nvim-tree') + require('cosmic.plugins.nvim-tree') end, opt = true, cmd = { @@ -141,7 +141,7 @@ return packer.startup(function() { 'L3MON4D3/LuaSnip', config = function() - require('cosmic.modules.snippets') + require('cosmic.plugins.luasnip') end, requires = { 'rafamadriz/friendly-snippets', @@ -155,7 +155,7 @@ return packer.startup(function() { 'windwp/nvim-autopairs', config = function() - require('cosmic.modules.auto-pairs') + require('cosmic.plugins.auto-pairs') end, after = 'cmp-path', }, @@ -190,7 +190,7 @@ return packer.startup(function() opt = true, cmd = { 'FloatermToggle', 'FloatermNew', 'FloatermSend' }, config = function() - require('cosmic.modules.terminal') + require('cosmic.plugins.terminal') end, disable = vim.tbl_contains(user_plugins.disable, 'terminal'), }) @@ -207,7 +207,7 @@ return packer.startup(function() }, }, config = function() - require('cosmic.modules.telescope') + require('cosmic.plugins.telescope') end, event = 'BufWinEnter', disable = vim.tbl_contains(user_plugins.disable, 'telescope'), @@ -217,7 +217,7 @@ return packer.startup(function() use({ 'glepnir/dashboard-nvim', config = function() - require('cosmic.modules.dashboard') + require('cosmic.plugins.dashboard') end, disable = vim.tbl_contains(user_plugins.disable, 'dashboard'), }) @@ -225,7 +225,7 @@ return packer.startup(function() use({ 'rmagatti/auto-session', config = function() - require('cosmic.modules.session') + require('cosmic.plugins.auto-session') end, disable = vim.tbl_contains(user_plugins.disable, 'auto-session'), }) @@ -240,7 +240,7 @@ return packer.startup(function() }, run = ':TSUpdate', config = function() - require('cosmic.modules.treesitter') + require('cosmic.plugins.treesitter') end, disable = vim.tbl_contains(user_plugins.disable, 'treesitter'), }) @@ -257,7 +257,7 @@ return packer.startup(function() 'folke/todo-comments.nvim', requires = 'nvim-lua/plenary.nvim', config = function() - require('cosmic.modules.todo-comments') + require('cosmic.plugins.todo-comments') end, event = 'BufWinEnter', disable = vim.tbl_contains(user_plugins.disable, 'todo-comments'), diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua index 1f6ae4b..d9ba9cf 100644 --- a/lua/cosmic/init.lua +++ b/lua/cosmic/init.lua @@ -1,10 +1,10 @@ -local cosmic_modules = { +local mods = { 'cosmic.compiled', 'cosmic.core', 'cosmic.theme', } -for _, mod in ipairs(cosmic_modules) do +for _, mod in ipairs(mods) do local ok, err = pcall(require, mod) if mod == 'cosmic.compiled' and not ok then vim.notify('Run :PackerCompile!', vim.log.levels.WARN, { diff --git a/lua/cosmic/modules/auto-pairs/init.lua b/lua/cosmic/plugins/auto-pairs/init.lua similarity index 100% rename from lua/cosmic/modules/auto-pairs/init.lua rename to lua/cosmic/plugins/auto-pairs/init.lua diff --git a/lua/cosmic/modules/session/init.lua b/lua/cosmic/plugins/auto-session/init.lua similarity index 100% rename from lua/cosmic/modules/session/init.lua rename to lua/cosmic/plugins/auto-session/init.lua diff --git a/lua/cosmic/modules/session/mappings.lua b/lua/cosmic/plugins/auto-session/mappings.lua similarity index 100% rename from lua/cosmic/modules/session/mappings.lua rename to lua/cosmic/plugins/auto-session/mappings.lua diff --git a/lua/cosmic/modules/dashboard/init.lua b/lua/cosmic/plugins/dashboard/init.lua similarity index 100% rename from lua/cosmic/modules/dashboard/init.lua rename to lua/cosmic/plugins/dashboard/init.lua diff --git a/lua/cosmic/modules/statusline/init.lua b/lua/cosmic/plugins/galaxyline/init.lua similarity index 100% rename from lua/cosmic/modules/statusline/init.lua rename to lua/cosmic/plugins/galaxyline/init.lua diff --git a/lua/cosmic/modules/snippets/init.lua b/lua/cosmic/plugins/luasnip/init.lua similarity index 100% rename from lua/cosmic/modules/snippets/init.lua rename to lua/cosmic/plugins/luasnip/init.lua diff --git a/lua/cosmic/modules/notify/init.lua b/lua/cosmic/plugins/notify/init.lua similarity index 100% rename from lua/cosmic/modules/notify/init.lua rename to lua/cosmic/plugins/notify/init.lua diff --git a/lua/cosmic/modules/nvim-tree/init.lua b/lua/cosmic/plugins/nvim-tree/init.lua similarity index 100% rename from lua/cosmic/modules/nvim-tree/init.lua rename to lua/cosmic/plugins/nvim-tree/init.lua diff --git a/lua/cosmic/modules/nvim-tree/mappings.lua b/lua/cosmic/plugins/nvim-tree/mappings.lua similarity index 100% rename from lua/cosmic/modules/nvim-tree/mappings.lua rename to lua/cosmic/plugins/nvim-tree/mappings.lua diff --git a/lua/cosmic/modules/telescope/init.lua b/lua/cosmic/plugins/telescope/init.lua similarity index 100% rename from lua/cosmic/modules/telescope/init.lua rename to lua/cosmic/plugins/telescope/init.lua diff --git a/lua/cosmic/modules/telescope/mappings.lua b/lua/cosmic/plugins/telescope/mappings.lua similarity index 93% rename from lua/cosmic/modules/telescope/mappings.lua rename to lua/cosmic/plugins/telescope/mappings.lua index 818eda7..712d9ce 100644 --- a/lua/cosmic/modules/telescope/mappings.lua +++ b/lua/cosmic/plugins/telescope/mappings.lua @@ -11,7 +11,7 @@ end M.init = function() -- navigation - map('n', 'ff', 'lua require("cosmic.modules.telescope.mappings").project_files()') + map('n', 'ff', 'lua require("cosmic.plugins.telescope.mappings").project_files()') map('n', 'fp', ':Telescope find_files') map('n', 'fk', ':Telescope buffers') map('n', 'fs', ':Telescope live_grep') diff --git a/lua/cosmic/modules/terminal/init.lua b/lua/cosmic/plugins/terminal/init.lua similarity index 100% rename from lua/cosmic/modules/terminal/init.lua rename to lua/cosmic/plugins/terminal/init.lua diff --git a/lua/cosmic/modules/terminal/mappings.lua b/lua/cosmic/plugins/terminal/mappings.lua similarity index 100% rename from lua/cosmic/modules/terminal/mappings.lua rename to lua/cosmic/plugins/terminal/mappings.lua diff --git a/lua/cosmic/modules/todo-comments/init.lua b/lua/cosmic/plugins/todo-comments/init.lua similarity index 100% rename from lua/cosmic/modules/todo-comments/init.lua rename to lua/cosmic/plugins/todo-comments/init.lua diff --git a/lua/cosmic/modules/treesitter/init.lua b/lua/cosmic/plugins/treesitter/init.lua similarity index 100% rename from lua/cosmic/modules/treesitter/init.lua rename to lua/cosmic/plugins/treesitter/init.lua diff --git a/lua/cosmic/utils/init.lua b/lua/cosmic/utils/init.lua index ba71ac0..34d9c13 100644 --- a/lua/cosmic/utils/init.lua +++ b/lua/cosmic/utils/init.lua @@ -57,7 +57,7 @@ end function M.post_reload(msg) unload('cosmic.utils', true) unload('cosmic.theme', true) - unload('cosmic.modules.statusline', true) + unload('cosmic.plugins.statusline', true) msg = msg or 'User config reloaded!' Logger:log(msg) end diff --git a/readme.md b/readme.md index f3a3062..8d7eff7 100644 --- a/readme.md +++ b/readme.md @@ -129,11 +129,11 @@ Useful for non-plugin related changes such as editor settings or mappings. ## 🗺 Default Mappings -[File navigation](./lua/cosmic/modules/telescope/mappings.lua) +[File navigation](./lua/cosmic.plugins/telescope/mappings.lua) -[File explorer](./lua/cosmic/modules/nvim-tree/mappings.lua) +[File explorer](./lua/cosmic.plugins/nvim-tree/mappings.lua) -[Terminal](./lua/cosmic/modules/terminal/mappings.lua) +[Terminal](./lua/cosmic.plugins/terminal/mappings.lua) [LSP](./lua/cosmic/lsp/mappings.lua)