summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/lv-globals.lua13
-rw-r--r--lua/plugins.lua15
2 files changed, 6 insertions, 22 deletions
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
)
-