From 2be3e66c3ceb484b284fa628833c0ca3aedaa433 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Mon, 17 Jan 2022 13:25:26 -0800
Subject: [PATCH] rebase: fix mappings

---
 lua/cosmic/config/init.lua      |  2 ++
 lua/cosmic/core/mappings.lua    | 14 ++++++--------
 lua/cosmic/core/pluginsInit.lua | 11 ++---------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/lua/cosmic/config/init.lua b/lua/cosmic/config/init.lua
index e950063..52de848 100644
--- a/lua/cosmic/config/init.lua
+++ b/lua/cosmic/config/init.lua
@@ -8,6 +8,8 @@ end
 -- these settings will be merged with any settings definined in config.lua
 local default_config = {
   border = 'rounded',
+  disable_builtin_plugins = {},
+  add_plugins = {},
   theme = 'tokyonight',
   lsp = {
     format_on_save = true, -- true/false or table of filetypes {'.ts', '.js',}
diff --git a/lua/cosmic/core/mappings.lua b/lua/cosmic/core/mappings.lua
index ef64123..afec7b5 100644
--- a/lua/cosmic/core/mappings.lua
+++ b/lua/cosmic/core/mappings.lua
@@ -1,15 +1,13 @@
 local map = require('cosmic.utils').map
-local ok, user_plugins = pcall(require, 'cosmic.config.plugins')
+local user_plugins = require('cosmic.config')
 
 -- Mappings for plugins that need to be lazy loaded
-if ok then
-  if not vim.tbl_contains(user_plugins.disable, 'nvim-tree') then
-    require('cosmic.plugins.nvim-tree.mappings')
-  end
+if not vim.tbl_contains(user_plugins.disable_builtin_plugins, 'nvim-tree') then
+  require('cosmic.plugins.nvim-tree.mappings')
+end
 
-  if not vim.tbl_contains(user_plugins.disable, 'auto-session') then
-    require('cosmic.plugins.auto-session.mappings')
-  end
+if not vim.tbl_contains(user_plugins.disable_builtin_plugins, 'auto-session') then
+  require('cosmic.plugins.auto-session.mappings')
 end
 
 -- Quickfix mappings
diff --git a/lua/cosmic/core/pluginsInit.lua b/lua/cosmic/core/pluginsInit.lua
index 6dd998e..fa675d9 100644
--- a/lua/cosmic/core/pluginsInit.lua
+++ b/lua/cosmic/core/pluginsInit.lua
@@ -10,18 +10,11 @@ local use = packer.use
 local ok, user_config = pcall(require, 'cosmic.config')
 if not ok then
   user_config = {
-    add = {},
-    disable = {},
+    add_plugins = {},
+    disable_builtin_plugins = {},
   }
 end
 
-if not vim.tbl_islist(user_config.add) then
-  user_config.add_plugins = {}
-end
-if not vim.tbl_islist(user_config.disable) then
-  user_config.disable_builtin_plugins = {}
-end
-
 local config = require('cosmic.config')
 
 return packer.startup(function()