From aa6af21a15b8745a182056b5fda893fef2267661 Mon Sep 17 00:00:00 2001
From: jdhao <jdhao@hotmail.com>
Date: Fri, 27 Aug 2021 00:02:45 +0800
Subject: [PATCH] Colorscheme plugins as opt plugins

---
 core/plugins.vim |  3 +--
 core/ui.vim      | 19 +++++++++++++++++++
 lua/plugins.lua  | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/core/plugins.vim b/core/plugins.vim
index b3f9dbb..8ee0ee0 100644
--- a/core/plugins.vim
+++ b/core/plugins.vim
@@ -373,8 +373,7 @@ endif
 """""""""""""""""""""""""""vim-airline setting""""""""""""""""""""""""""""""
 " Set airline theme to a random one if it exists
 let s:candidate_airlinetheme = ['ayu_mirage', 'lucius', 'ayu_dark', 'base16_bright',
-      \ 'base16_adwaita', 'raven', 'term', 'gruvbox_material', 'deus', 'edge', 'onedark',
-      \ 'sonokai']
+      \ 'base16_adwaita', 'raven', 'term', 'deus', 'onedark']
 let s:idx = utils#RandInt(0, len(s:candidate_airlinetheme)-1)
 let s:theme = s:candidate_airlinetheme[s:idx]
 let g:airline_theme=s:theme
diff --git a/core/ui.vim b/core/ui.vim
index a1723f0..123e794 100644
--- a/core/ui.vim
+++ b/core/ui.vim
@@ -3,6 +3,8 @@
 let s:my_theme_dict = {}
 
 function! s:my_theme_dict.gruvbox8() dict abort
+  packadd! vim-gruvbox8
+
   " Italic options should be put before colorscheme setting,
   " see https://github.com/morhetz/gruvbox/wiki/Terminal-specific#1-italics-is-disabled
   let g:gruvbox_italics=1
@@ -13,42 +15,57 @@ function! s:my_theme_dict.gruvbox8() dict abort
 endfunction
 
 function! s:my_theme_dict.deus() dict abort
+  packadd! vim-deus
+
   colorscheme deus
 endfunction
 
 function! s:my_theme_dict.solarized8() dict abort
+  packadd! vim-solarized8
   let g:solarized_term_italics=1
   let g:solarized_visibility='high'
   colorscheme solarized8_high
 endfunction
 
 function! s:my_theme_dict.onedark() dict abort
+  packadd! onedark.nvim
+
   colorscheme onedark
 endfunction
 
 function! s:my_theme_dict.edge() dict abort
+  packadd! edge
+
   let g:edge_enable_italic = 1
   let g:edge_better_performance = 1
   colorscheme edge
 endfunction
 
 function! s:my_theme_dict.sonokai() dict abort
+  packadd! sonokai
+
   let g:sonokai_enable_italic = 1
   let g:sonokai_better_performance = 1
   colorscheme sonokai
 endfunction
 
 function! s:my_theme_dict.gruvbox_material() dict abort
+  packadd! gruvbox-material
+
   let g:gruvbox_material_enable_italic = 1
   let g:gruvbox_material_better_performance = 1
   colorscheme gruvbox-material
 endfunction
 
 function! s:my_theme_dict.nord() dict abort
+  packadd! nord.nvim
+
   colorscheme nord
 endfunction
 
 function! s:my_theme_dict.doom_one() dict abort
+  packadd! doom-one.nvim
+
   let g:doom_one_terminal_color = v:true
   let g:doom_one_italic_comments = v:true
   let g:doom_one_cursor_coloring = v:true
@@ -56,6 +73,8 @@ function! s:my_theme_dict.doom_one() dict abort
 endfunction
 
 function! s:my_theme_dict.everforest() dict abort
+  packadd! everforest
+
   let g:everforest_enable_italic = 1
   let g:everforest_better_performance = 1
   colorscheme everforest
diff --git a/lua/plugins.lua b/lua/plugins.lua
index dec451d..26848fc 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -85,16 +85,16 @@ require("packer").startup({
     -- use {'mhinz/vim-grepper', cmd = {'Grepper', '<plug>(GrepperOperator)'}}
 
     -- A list of colorscheme plugin you may want to try. Find what suits you.
-    use("lifepillar/vim-gruvbox8")
-    use("ajmwagar/vim-deus")
-    use("lifepillar/vim-solarized8")
-    use("navarasu/onedark.nvim")
-    use("sainnhe/edge")
-    use("sainnhe/sonokai")
-    use("sainnhe/gruvbox-material")
-    use("shaunsingh/nord.nvim")
-    use("NTBBloodbath/doom-one.nvim")
-    use("sainnhe/everforest")
+    use({"lifepillar/vim-gruvbox8", event = 'VimEnter'})
+    use({"ajmwagar/vim-deus", event = 'VimEnter'})
+    use({"lifepillar/vim-solarized8", event = 'VimEnter'})
+    use({"navarasu/onedark.nvim", event = 'VimEnter'})
+    use({"sainnhe/edge", event = 'VimEnter'})
+    use({"sainnhe/sonokai", event = 'VimEnter'})
+    use({"sainnhe/gruvbox-material", event = 'VimEnter'})
+    use({"shaunsingh/nord.nvim", event = 'VimEnter'})
+    use({"NTBBloodbath/doom-one.nvim", event = 'VimEnter'})
+    use({"sainnhe/everforest", event = 'VimEnter'})
 
     -- colorful status line and theme
     use("vim-airline/vim-airline-themes")