From 6a37323f6a4d8d77706df2f44669ea576dcdd85e Mon Sep 17 00:00:00 2001 From: Garrett Dawson Date: Sun, 16 Apr 2023 15:22:03 -0600 Subject: [PATCH] fix: consolidate plugins table --- init.lua | 2 +- lua/custom/plugins/init.lua | 20 ++++++++++++++++++++ lua/custom/plugins/nvim-base16.lua | 10 ---------- lua/custom/plugins/reveal.lua | 9 --------- 4 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 lua/custom/plugins/nvim-base16.lua delete mode 100644 lua/custom/plugins/reveal.lua diff --git a/init.lua b/init.lua index d5bd7d9d..e10deec0 100644 --- a/init.lua +++ b/init.lua @@ -84,7 +84,7 @@ require('lazy').setup({ -- Useful status updates for LSP -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- Additional lua configuration, makes nvim stuff amazing! 'folke/neodev.nvim', diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 14839c02..ef690820 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -6,6 +6,25 @@ return { { "tpope/vim-surround" }, { "tribela/vim-transparent" }, + { + "killtheliterate/nvim-reveal", + dev = false, + config = function() + require('nvim-reveal').setup {} + end + }, + + { + 'norcalli/nvim-base16.lua', + lazy = false, + priority = 1000, + config = function() + local base16 = require 'base16' + + base16(base16.themes[vim.env.BASE16_THEME or "3024"], true) + end, + }, + { "nvim-tree/nvim-web-devicons", lazy = true @@ -112,6 +131,7 @@ return { null_ls.builtins.code_actions.eslint_d, null_ls.builtins.diagnostics.codespell, null_ls.builtins.diagnostics.eslint_d, + null_ls.builtins.formatting.eslint_d, null_ls.builtins.formatting.prettierd, }, }) diff --git a/lua/custom/plugins/nvim-base16.lua b/lua/custom/plugins/nvim-base16.lua deleted file mode 100644 index 6e8be747..00000000 --- a/lua/custom/plugins/nvim-base16.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - 'norcalli/nvim-base16.lua', - lazy = false, - priority = 1000, - config = function() - local base16 = require 'base16' - - base16(base16.themes[vim.env.BASE16_THEME or "3024"], true) - end, -} diff --git a/lua/custom/plugins/reveal.lua b/lua/custom/plugins/reveal.lua deleted file mode 100644 index 89918a7f..00000000 --- a/lua/custom/plugins/reveal.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { - "killtheliterate/nvim-reveal", - dev = false, - config = function() - require('nvim-reveal').setup {} - end - }, -}