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

This commit is contained in:
rebuilt 2021-05-03 02:31:16 +02:00 committed by GitHub
parent 99364ef2b7
commit f15428e655
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 12 deletions

View file

@ -1,23 +1,21 @@
require('plugins')
require('lv-globals')
require('lv-utils')
vim.cmd('luafile ~/.config/nvim/lv-settings.lua')
require('lv-autocommands')
require('settings')
vim.cmd('luafile ~/.config/nvim/lv-settings.lua')
require('plugins')
require('lv-utils')
require('lv-autocommands')
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')

View file

@ -7,6 +7,17 @@ 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 = {
@ -60,7 +71,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}
}

View file

@ -64,9 +64,14 @@ return require("packer").startup(
-- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'}
use {"lewis6991/gitsigns.nvim", opt = true}
-- use {"liuchengxu/vim-which-key", opt = true}
use {"folke/which-key.nvim", opt = true}
use {"ChristianChiarulli/dashboard-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 {"windwp/nvim-autopairs", opt = true}
use {"terrortylor/nvim-comment", opt = true}
use {"kevinhwang91/nvim-bqf", opt = true}
@ -95,8 +100,7 @@ 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("dashboard-nvim")
-- require_plugin("which-key.nvim")
require_plugin("nvim-autopairs")
require_plugin("nvim-comment")
require_plugin("nvim-bqf")
@ -106,3 +110,4 @@ return require("packer").startup(
require_plugin("barbar.nvim")
end
)

View file

@ -1,3 +1,5 @@
-- 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
@ -52,3 +54,10 @@ 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