From 3233a424e9e378869766f877d52713a7f4ba8117 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Mon, 25 Oct 2021 18:03:54 -0700
Subject: [PATCH] refactor(plugins): shorter plugin names

---
 lua/cosmic/config/editor.lua  |  7 +++++--
 lua/cosmic/config/plugins.lua | 16 ++++++++++------
 lua/cosmic/editor.lua         |  3 +++
 lua/cosmic/mappings.lua       |  3 ---
 lua/cosmic/pluginsInit.lua    | 14 +++++++++-----
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/lua/cosmic/config/editor.lua b/lua/cosmic/config/editor.lua
index 9a53945..6f5232f 100644
--- a/lua/cosmic/config/editor.lua
+++ b/lua/cosmic/config/editor.lua
@@ -1,6 +1,9 @@
 -- Override Cosmic editor options
 
---[[ local opt = vim.opt
+--[[
+local opt = vim.opt
+
 opt.tabstop = 4
 opt.softtabstop = 4
-opt.shiftwidth = 4 ]]
+opt.shiftwidth = 4
+]]
diff --git a/lua/cosmic/config/plugins.lua b/lua/cosmic/config/plugins.lua
index edca5b8..082ef26 100644
--- a/lua/cosmic/config/plugins.lua
+++ b/lua/cosmic/config/plugins.lua
@@ -8,12 +8,16 @@
       requires = { 'kyazdani42/nvim-web-devicons' },
     },
   },
-  disable = {
-    'tpope/vim-fugitive',
-    'lewis6991/gitsigns.nvim',
-    'norcalli/nvim-colorizer.lua',
-    'rmagatti/auto-session',
-    'b3nj5m1n/kommentary',
+  disable = { -- disabling some plugins may mean you'll have to remap some keybindings
+    'auto-session',
+    'colorizer',
+    'fugitive',
+    'gitsigns',
+    'kommentary',
+    'treesitter'
+    'telescope'
+    'terminal',
+    'nvim-tree'
   },
 }
 
diff --git a/lua/cosmic/editor.lua b/lua/cosmic/editor.lua
index 90ffe50..47e9dd4 100644
--- a/lua/cosmic/editor.lua
+++ b/lua/cosmic/editor.lua
@@ -1,5 +1,6 @@
 local cmd = vim.cmd
 local opt = vim.opt
+local g = vim.g
 local indent = 2
 
 cmd([[
@@ -7,6 +8,8 @@ cmd([[
 	autocmd BufWritePre * :%s/\s\+$//e
 ]])
 
+g.mapleader = ' '
+
 -- misc
 opt.syntax = 'enable'
 opt.hidden = true
diff --git a/lua/cosmic/mappings.lua b/lua/cosmic/mappings.lua
index 7048d8f..cd7cbba 100644
--- a/lua/cosmic/mappings.lua
+++ b/lua/cosmic/mappings.lua
@@ -1,8 +1,5 @@
-local g = vim.g
 local map = require('cosmic.utils').map
 
-g.mapleader = ' '
-
 -- Quickfix
 map('n', '<leader>ck', ':cexpr []<CR>', { noremap = true })
 map('n', '<leader>cc', ':cclose <CR>', { noremap = true })
diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua
index ba34f08..d1c02b8 100644
--- a/lua/cosmic/pluginsInit.lua
+++ b/lua/cosmic/pluginsInit.lua
@@ -73,6 +73,7 @@ return packer.startup(function()
       'NvimTreeRefresh',
       'NvimTreeToggle',
     },
+    disable = vim.tbl_contains(user_plugins.disable, 'nvim-tree'),
   })
 
   use({ -- lsp
@@ -111,7 +112,7 @@ return packer.startup(function()
     'tpope/vim-fugitive',
     opt = true,
     cmd = 'Git',
-    disable = vim.tbl_contains(user_plugins.disable, 'tpope/vim-fugitive'),
+    disable = vim.tbl_contains(user_plugins.disable, 'fugitive'),
   })
 
   -- git column signs
@@ -122,7 +123,7 @@ return packer.startup(function()
     config = function()
       require('gitsigns').setup()
     end,
-    disable = vim.tbl_contains(user_plugins.disable, 'lewis6991/gitsigns.nvim'),
+    disable = vim.tbl_contains(user_plugins.disable, 'gitsigns'),
   })
 
   -- floating terminal
@@ -133,6 +134,7 @@ return packer.startup(function()
     config = function()
       require('cosmic.core.terminal')
     end,
+    disable = vim.tbl_contains(user_plugins.disable, 'terminal'),
   })
 
   -- file navigation
@@ -150,6 +152,7 @@ return packer.startup(function()
       require('cosmic.core.navigation')
     end,
     event = 'BufRead',
+    disable = vim.tbl_contains(user_plugins.disable, 'telescope'),
   })
 
   -- session management
@@ -161,7 +164,7 @@ return packer.startup(function()
         pre_save_cmds = { 'NvimTreeClose', 'cclose' },
       })
     end,
-    disable = vim.tbl_contains(user_plugins.disable, 'rmagatti/auto-session'),
+    disable = vim.tbl_contains(user_plugins.disable, 'auto-session'),
   })
 
   -- lang/syntax stuff
@@ -176,13 +179,14 @@ return packer.startup(function()
     config = function()
       require('cosmic.core.treesitter')
     end,
+    disable = vim.tbl_contains(user_plugins.disable, 'treesitter'),
   })
 
   -- comments and stuff
   use({
     'b3nj5m1n/kommentary',
     event = 'BufRead',
-    disable = vim.tbl_contains(user_plugins.disable, 'b3nj5m1n/kommentary'),
+    disable = vim.tbl_contains(user_plugins.disable, 'kommentary'),
   })
 
   -- colorized hex codes
@@ -193,7 +197,7 @@ return packer.startup(function()
     config = function()
       require('colorizer').setup()
     end,
-    disable = vim.tbl_contains(user_plugins.disable, 'norcalli/nvim-colorizer.lua'),
+    disable = vim.tbl_contains(user_plugins.disable, 'colorizer'),
   })
 
   if user_plugins.add and not vim.tbl_isempty(user_plugins) then