From 0aef3f630bf7f07516b3b6be421899f9b4c8cbbf Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Tue, 21 Dec 2021 20:51:11 -0800
Subject: [PATCH] refactor: clean up some mappings and lazy loading

---
 lua/cosmic/core/mappings.lua                 | 17 +++++++++++------
 lua/cosmic/core/pluginsInit.lua              |  6 +++++-
 lua/cosmic/plugins/auto-session/mappings.lua |  2 +-
 lua/cosmic/plugins/telescope/mappings.lua    | 12 ------------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/lua/cosmic/core/mappings.lua b/lua/cosmic/core/mappings.lua
index 417e23c..37bbe43 100644
--- a/lua/cosmic/core/mappings.lua
+++ b/lua/cosmic/core/mappings.lua
@@ -5,14 +5,19 @@ map('n', '<leader>ck', ':cexpr []<cr>')
 map('n', '<leader>cc', ':cclose <cr>')
 map('n', '<leader>co', ':copen <cr>')
 map('n', '<leader>cf', ':cfdo %s/')
+map('n', '<leader>cp', ':cprev<cr>zz')
+map('n', '<leader>cn', ':cnext<cr>zz')
 
--- Resize with arrows
+-- buffer navigation
+map('n', '<leader>bp', ':bprev<cr>')
+map('n', '<leader>bn', ':bnext<cr>')
+
+-- tab navigation
+map('n', '<leader>tp', ':tabprevious<cr>')
+map('n', '<leader>tn', ':tabnext<cr>')
+
+-- resize with arrows
 map('n', '<C-Up>', ':resize -2<CR>')
 map('n', '<C-Down>', ':resize +2<CR>')
 map('n', '<C-Left>', ':vertical resize -2<CR>')
 map('n', '<C-Right>', ':vertical resize +2<CR>')
-
-require('cosmic.plugins.auto-session.mappings')
-require('cosmic.plugins.telescope.mappings').init()
-require('cosmic.plugins.nvim-tree.mappings')
-require('cosmic.plugins.terminal.mappings')
diff --git a/lua/cosmic/core/pluginsInit.lua b/lua/cosmic/core/pluginsInit.lua
index 5a99669..84b7246 100644
--- a/lua/cosmic/core/pluginsInit.lua
+++ b/lua/cosmic/core/pluginsInit.lua
@@ -61,6 +61,7 @@ return packer.startup(function()
     'kyazdani42/nvim-tree.lua',
     config = function()
       require('cosmic.plugins.nvim-tree')
+      require('cosmic.plugins.nvim-tree.mappings')
     end,
     opt = true,
     cmd = {
@@ -168,9 +169,10 @@ return packer.startup(function()
   use({
     'voldikss/vim-floaterm',
     opt = true,
-    cmd = { 'FloatermToggle', 'FloatermNew', 'FloatermSend' },
+    event = 'BufWinEnter',
     config = function()
       require('cosmic.plugins.terminal')
+      require('cosmic.plugins.terminal.mappings')
     end,
     disable = vim.tbl_contains(user_plugins.disable, 'terminal'),
   })
@@ -187,6 +189,7 @@ return packer.startup(function()
       },
     },
     config = function()
+      require('cosmic.plugins.telescope.mappings').init()
       require('cosmic.plugins.telescope')
     end,
     event = 'BufWinEnter',
@@ -206,6 +209,7 @@ return packer.startup(function()
     'rmagatti/auto-session',
     config = function()
       require('cosmic.plugins.auto-session')
+      require('cosmic.plugins.auto-session.mappings')
     end,
     disable = vim.tbl_contains(user_plugins.disable, 'auto-session'),
   })
diff --git a/lua/cosmic/plugins/auto-session/mappings.lua b/lua/cosmic/plugins/auto-session/mappings.lua
index e22ab9f..acdc527 100644
--- a/lua/cosmic/plugins/auto-session/mappings.lua
+++ b/lua/cosmic/plugins/auto-session/mappings.lua
@@ -6,5 +6,5 @@ map('n', '<leader>ss', '<cmd>SaveSession<cr>')
 map(
   'n',
   '<leader>si',
-  '<cmd>lua require("cosmic.utils.logger"):log(require("auto-session-library").current_session_name())<cr>'
+  '<cmd>lua require("cosmic.utils.logger"):log("Session name: " .. require("auto-session-library").current_session_name())<cr>'
 )
diff --git a/lua/cosmic/plugins/telescope/mappings.lua b/lua/cosmic/plugins/telescope/mappings.lua
index 4ac1c41..4516bb7 100644
--- a/lua/cosmic/plugins/telescope/mappings.lua
+++ b/lua/cosmic/plugins/telescope/mappings.lua
@@ -20,18 +20,6 @@ M.init = function()
   -- git navigation
   map('n', '<leader>ggc', ':Telescope git_commits<cr>')
   map('n', '<leader>ggs', ':Telescope git_status<cr>')
-
-  -- quickfix navigation
-  map('n', '<leader>cp', ':cprev<cr>zz')
-  map('n', '<leader>cn', ':cnext<cr>zz')
-
-  -- buffer navigation
-  map('n', '<leader>bp', ':bprev<cr>')
-  map('n', '<leader>bn', ':bnext<cr>')
-
-  -- tab navigation
-  map('n', '<leader>tp', ':tabprevious<cr>')
-  map('n', '<leader>tn', ':tabnext<cr>')
 end
 
 return M