diff options
| -rw-r--r-- | init.lua | 8 | ||||
| -rw-r--r-- | lua/lv-globals.lua | 13 | ||||
| -rw-r--r-- | lua/plugins.lua | 15 | ||||
| -rw-r--r-- | lv-settings.lua | 9 |
4 files changed, 34 insertions, 11 deletions
@@ -1,23 +1,21 @@ -require('plugins') require('lv-globals') -require('lv-utils') +require('settings') vim.cmd('luafile ~/.config/nvim/lv-settings.lua') +require('plugins') +require('lv-utils') 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 dedf397b..5cf4e606 100644 --- a/lua/lv-globals.lua +++ b/lua/lv-globals.lua @@ -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} } diff --git a/lua/plugins.lua b/lua/plugins.lua index 0bf74511..a6c18efd 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -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 ) + diff --git a/lv-settings.lua b/lv-settings.lua index 9c9add59..f02d7337 100644 --- a/lv-settings.lua +++ b/lv-settings.lua @@ -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 |