Revert "Adds the ability to toggle on/off whichkey and dashboard (#337)"

This reverts commit f15428e6550db4e37e25af54fb511459e26b6cb1.

4 files changed, 11 insertions, 34 deletions

diff --git a/init.lua b/init.lua
index cb8e60a4..24780e94 100644
--- a/init.lua
+++ b/init.lua
@@ -1,21 +1,23 @@
-require('lv-globals')
-require('settings')
-vim.cmd('luafile ~/.config/nvim/lv-settings.lua')
 require('plugins')
+require('lv-globals')
 require('lv-utils')
+vim.cmd('luafile ~/.config/nvim/lv-settings.lua')
 require('lv-autocommands')
+require('settings')
 require('keymappings')
 require('colorscheme')
 require('lv-galaxyline')
 require('lv-comment')
 require('lv-compe')
 require('lv-barbar')
+require('lv-dashboard')
 require('lv-telescope')
 require('lv-gitsigns')
 require('lv-nvimtree')
 require('lv-treesitter')
 require('lv-autopairs')
 require('lv-rnvimr')
+require('lv-which-key')
 
 -- TODO is there a way to do this without vimscript
 vim.cmd('source ~/.config/nvim/vimscript/functions.vim')
diff --git a/lua/lv-globals.lua b/lua/lv-globals.lua
index 5cf4e606..dedf397b 100644
--- a/lua/lv-globals.lua
+++ b/lua/lv-globals.lua
@@ -7,17 +7,6 @@ O = {
     number = true,
     relative_number = true,
     shell = 'bash',
-	-- Plugin settings
-	-- ========================================
-    dashboard = {
-        enable = true,
-    },
-	whichkey = {
-		enable = true,
-	},
-
-	-- LSP settings
-	-- ========================================
 
     -- @usage pass a table with your desired languages
     treesitter = {
@@ -71,7 +60,7 @@ O = {
 	ruby = {
 		diagnostics = {virtualtext = true, signs = true, underline = true},
 		filetypes = {'rb', 'erb', 'rakefile'}
-	},
+	}
     -- css = {formatter = '', autoformat = false, virtual_text = true},
     -- json = {formatter = '', autoformat = false, virtual_text = true}
 }
diff --git a/lua/plugins.lua b/lua/plugins.lua
index a6c18efd..0bf74511 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -64,14 +64,9 @@ return require("packer").startup(
 
         -- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'}
         use {"lewis6991/gitsigns.nvim", opt = true}
-        use {"folke/which-key.nvim", opt = true,
-			config = function() require('lv-which-key') end,
-			cond = function() return O.whichkey.enable end,}
-
-		use {"ChristianChiarulli/dashboard-nvim", 
-			opt = true, 
-			config = function() require'lv-dashboard' end,
-			cond = function() return O.dashboard.enable end}
+        -- use {"liuchengxu/vim-which-key", opt = true}
+        use {"folke/which-key.nvim", opt = true}
+        use {"ChristianChiarulli/dashboard-nvim", opt = true}
         use {"windwp/nvim-autopairs", opt = true}
         use {"terrortylor/nvim-comment", opt = true}
         use {"kevinhwang91/nvim-bqf", opt = true}
@@ -100,7 +95,8 @@ return require("packer").startup(
         require_plugin("nvim-ts-autotag")
         require_plugin("nvim-tree.lua")
         require_plugin("gitsigns.nvim")
-        -- require_plugin("which-key.nvim")
+        require_plugin("which-key.nvim")
+        require_plugin("dashboard-nvim")
         require_plugin("nvim-autopairs")
         require_plugin("nvim-comment")
         require_plugin("nvim-bqf")
@@ -110,4 +106,3 @@ return require("packer").startup(
         require_plugin("barbar.nvim")
     end
 )
-
diff --git a/lv-settings.lua b/lv-settings.lua
index f02d7337..9c9add59 100644
--- a/lv-settings.lua
+++ b/lv-settings.lua
@@ -1,5 +1,3 @@
--- File search will ignore this file because it's in your .gitignore.  Remove it from .gitignore for it to be listed in file search results
-
 --[[
 O is the global options object
 
@@ -54,10 +52,3 @@ O.json.autoformat = true
 -- ruby
 O.ruby.autoformat = true
 -- create custom autocommand field (This would be easy with lua)
-
--- Plugin Settings
--- ==========================================================
--- Dashboard
--- File search will ignore this file because it's in your .gitignore.  Remove it from .gitignore for it to be listed in file search results
-O.dashboard.enable = true
-O.whichkey.enable = true