From d2c42bec2c4a34aada9f498b931b392e0d65f392 Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Mon, 29 Nov 2021 14:53:37 -0800 Subject: [PATCH] refactor(core): rename some core modules --- lua/cosmic/config/examples/config.lua | 10 +++++----- lua/cosmic/core/{notifications => notify}/init.lua | 0 lua/cosmic/core/{file-explorer => nvim-tree}/init.lua | 0 .../core/{file-explorer => nvim-tree}/mappings.lua | 0 lua/cosmic/core/session/init.lua | 2 +- lua/cosmic/core/{navigation => telescope}/init.lua | 0 lua/cosmic/core/{navigation => telescope}/mappings.lua | 2 +- lua/cosmic/core/{comments => todo-comments}/init.lua | 0 lua/cosmic/mappings.lua | 4 ++-- lua/cosmic/pluginsInit.lua | 8 ++++---- readme.md | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) rename lua/cosmic/core/{notifications => notify}/init.lua (100%) rename lua/cosmic/core/{file-explorer => nvim-tree}/init.lua (100%) rename lua/cosmic/core/{file-explorer => nvim-tree}/mappings.lua (100%) rename lua/cosmic/core/{navigation => telescope}/init.lua (100%) rename lua/cosmic/core/{navigation => telescope}/mappings.lua (90%) rename lua/cosmic/core/{comments => todo-comments}/init.lua (100%) diff --git a/lua/cosmic/config/examples/config.lua b/lua/cosmic/config/examples/config.lua index 35bbabe..1364eb1 100644 --- a/lua/cosmic/config/examples/config.lua +++ b/lua/cosmic/config/examples/config.lua @@ -64,17 +64,17 @@ config.lsp = { ts_utils = {}, } +-- See https://github.com/rmagatti/auto-session#%EF%B8%8F-configuration +config.auto_session = {} + -- See https://github.com/folke/todo-comments.nvim#%EF%B8%8F-configuration config.comments = {} --- See :h nvim-tree.setup -config.nvim_tree = {} - -- See :h notify.setup config.notify = {} --- See https://github.com/rmagatti/auto-session#%EF%B8%8F-configuration -config.session = {} +-- See :h nvim-tree.setup +config.nvim_tree = {} -- See :h telescope.setup config.telescope = {} diff --git a/lua/cosmic/core/notifications/init.lua b/lua/cosmic/core/notify/init.lua similarity index 100% rename from lua/cosmic/core/notifications/init.lua rename to lua/cosmic/core/notify/init.lua diff --git a/lua/cosmic/core/file-explorer/init.lua b/lua/cosmic/core/nvim-tree/init.lua similarity index 100% rename from lua/cosmic/core/file-explorer/init.lua rename to lua/cosmic/core/nvim-tree/init.lua diff --git a/lua/cosmic/core/file-explorer/mappings.lua b/lua/cosmic/core/nvim-tree/mappings.lua similarity index 100% rename from lua/cosmic/core/file-explorer/mappings.lua rename to lua/cosmic/core/nvim-tree/mappings.lua diff --git a/lua/cosmic/core/session/init.lua b/lua/cosmic/core/session/init.lua index a0b9e20..102d13b 100644 --- a/lua/cosmic/core/session/init.lua +++ b/lua/cosmic/core/session/init.lua @@ -6,4 +6,4 @@ local defaults = { auto_restore_enabled = false, } -require('auto-session').setup(vim.tbl_deep_extend('force', defaults, config.session or {})) +require('auto-session').setup(vim.tbl_deep_extend('force', defaults, config.auto_session or {})) diff --git a/lua/cosmic/core/navigation/init.lua b/lua/cosmic/core/telescope/init.lua similarity index 100% rename from lua/cosmic/core/navigation/init.lua rename to lua/cosmic/core/telescope/init.lua diff --git a/lua/cosmic/core/navigation/mappings.lua b/lua/cosmic/core/telescope/mappings.lua similarity index 90% rename from lua/cosmic/core/navigation/mappings.lua rename to lua/cosmic/core/telescope/mappings.lua index 3f0fc2f..2080148 100644 --- a/lua/cosmic/core/navigation/mappings.lua +++ b/lua/cosmic/core/telescope/mappings.lua @@ -11,7 +11,7 @@ end M.init = function() -- navigation - map('n', 'ff', 'lua require("cosmic.core.navigation.mappings").project_files()') + map('n', 'ff', 'lua require("cosmic.core.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/core/comments/init.lua b/lua/cosmic/core/todo-comments/init.lua similarity index 100% rename from lua/cosmic/core/comments/init.lua rename to lua/cosmic/core/todo-comments/init.lua diff --git a/lua/cosmic/mappings.lua b/lua/cosmic/mappings.lua index fce68a2..d0b31d7 100644 --- a/lua/cosmic/mappings.lua +++ b/lua/cosmic/mappings.lua @@ -10,7 +10,7 @@ map('n', 'cf', ':cfdo %s/') map('n', 'Y', 'y$') require('cosmic.core.session.mappings') -require('cosmic.core.navigation.mappings').init() -require('cosmic.core.file-explorer.mappings') +require('cosmic.core.telescope.mappings').init() +require('cosmic.core.nvim-tree.mappings') require('cosmic.core.terminal.mappings') require('cosmic.lsp.mappings') diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua index 50e1211..80c3628 100644 --- a/lua/cosmic/pluginsInit.lua +++ b/lua/cosmic/pluginsInit.lua @@ -37,7 +37,7 @@ return packer.startup(function() use({ 'rcarriga/nvim-notify', config = function() - require('cosmic.core.notifications') + require('cosmic.core.notify') end, after = config.theme, disable = vim.tbl_contains(user_plugins.disable, 'notify'), @@ -59,7 +59,7 @@ return packer.startup(function() use({ 'kyazdani42/nvim-tree.lua', config = function() - require('cosmic.core.file-explorer') + require('cosmic.core.nvim-tree') end, opt = true, cmd = { @@ -190,7 +190,7 @@ return packer.startup(function() }, }, config = function() - require('cosmic.core.navigation') + require('cosmic.core.telescope') end, event = 'BufWinEnter', disable = vim.tbl_contains(user_plugins.disable, 'telescope'), @@ -241,7 +241,7 @@ return packer.startup(function() 'folke/todo-comments.nvim', requires = 'nvim-lua/plenary.nvim', config = function() - require('cosmic.core.comments') + require('cosmic.core.todo-comments') end, event = 'BufWinEnter', disable = vim.tbl_contains(user_plugins.disable, 'todo-comments'), diff --git a/readme.md b/readme.md index 06fd63b..b414cd3 100644 --- a/readme.md +++ b/readme.md @@ -132,9 +132,9 @@ Enter `:TSInstall` followed by to see your options for additional language ## Default Mappings -[File Navigation](./lua/cosmic/core/navigation/mappings.lua) +[File navigation](./lua/cosmic/core/telescope/mappings.lua) -[File explorer](./lua/cosmic/core/file-explorer/mappings.lua) +[File explorer](./lua/cosmic/core/nvim-tree/mappings.lua) [Terminal](./lua/cosmic/core/terminal/mappings.lua)