diff options
Diffstat (limited to 'lua/plugins.lua')
| -rw-r--r-- | lua/plugins.lua | 85 |
1 files changed, 22 insertions, 63 deletions
diff --git a/lua/plugins.lua b/lua/plugins.lua index 8e497075..8a0692f2 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -4,15 +4,13 @@ return { { "neovim/nvim-lspconfig" }, { "tamago324/nlsp-settings.nvim" }, { "jose-elias-alvarez/null-ls.nvim" }, + { "antoinemadec/FixCursorHold.nvim" }, -- Needed while issue https://github.com/neovim/neovim/issues/12587 is still open { "kabouzeid/nvim-lspinstall", event = "VimEnter", config = function() - local lspinstall = require "lspinstall" + local lspinstall = require "core.lspinstall" lspinstall.setup() - if lvim.builtin.lspinstall.on_config_done then - lvim.builtin.lspinstall.on_config_done(lspinstall) - end end, }, @@ -23,10 +21,8 @@ return { "nvim-telescope/telescope.nvim", config = function() require("core.telescope").setup() - if lvim.builtin.telescope.on_config_done then - lvim.builtin.telescope.on_config_done(require "telescope") - end end, + disable = not lvim.builtin.telescope.active, }, -- Completion & Snippets @@ -35,10 +31,8 @@ return { event = "InsertEnter", config = function() require("core.compe").setup() - if lvim.builtin.compe.on_config_done then - lvim.builtin.compe.on_config_done(require "compe") - end end, + disable = not lvim.builtin.compe.active, -- wants = "vim-vsnip", -- requires = { -- { @@ -56,10 +50,12 @@ return { "hrsh7th/vim-vsnip", -- wants = "friendly-snippets", event = "InsertEnter", + disable = not lvim.builtin.compe.active, }, { "rafamadriz/friendly-snippets", event = "InsertCharPre", + disable = not lvim.builtin.compe.active, }, -- Autopairs @@ -68,11 +64,9 @@ return { -- event = "InsertEnter", after = "nvim-compe", config = function() - require "core.autopairs" - if lvim.builtin.autopairs.on_config_done then - lvim.builtin.autopairs.on_config_done(require "nvim-autopairs") - end + require("core.autopairs").setup() end, + disable = not lvim.builtin.autopairs.active or not lvim.builtin.compe.active, }, -- Treesitter @@ -82,9 +76,6 @@ return { -- run = ":TSUpdate", config = function() require("core.treesitter").setup() - if lvim.builtin.treesitter.on_config_done then - lvim.builtin.treesitter.on_config_done(require "nvim-treesitter.configs") - end end, }, @@ -96,10 +87,8 @@ return { -- commit = "fd7f60e242205ea9efc9649101c81a07d5f458bb", config = function() require("core.nvimtree").setup() - if lvim.builtin.nvimtree.on_config_done then - lvim.builtin.nvimtree.on_config_done(require "nvim-tree.config") - end end, + disable = not lvim.builtin.nvimtree.active, }, { @@ -107,11 +96,9 @@ return { config = function() require("core.gitsigns").setup() - if lvim.builtin.gitsigns.on_config_done then - lvim.builtin.gitsigns.on_config_done(require "gitsigns") - end end, event = "BufRead", + disable = not lvim.builtin.gitsigns.active, }, -- Whichkey @@ -119,11 +106,9 @@ return { "folke/which-key.nvim", config = function() require("core.which-key").setup() - if lvim.builtin.which_key.on_config_done then - lvim.builtin.which_key.on_config_done(require "which-key") - end end, event = "BufWinEnter", + disable = not lvim.builtin.which_key.active, }, -- Comments @@ -131,30 +116,18 @@ return { "terrortylor/nvim-comment", event = "BufRead", config = function() - local status_ok, nvim_comment = pcall(require, "nvim_comment") - if not status_ok then - local Log = require "core.log" - Log:get_default().error "Failed to load nvim-comment" - return - end - nvim_comment.setup() - if lvim.builtin.comment.on_config_done then - lvim.builtin.comment.on_config_done(nvim_comment) - end + require("nvim_comment").setup() end, + disable = not lvim.builtin.comment.active, }, - -- vim-rooter + -- project.nvim { - "airblade/vim-rooter", - -- event = "BufReadPre", + "ahmedkhalf/project.nvim", config = function() - require("core.rooter").setup() - if lvim.builtin.rooter.on_config_done then - lvim.builtin.rooter.on_config_done() - end + require("core.project").setup() end, - disable = not lvim.builtin.rooter.active, + disable = not lvim.builtin.project.active, }, -- Icons @@ -162,24 +135,19 @@ return { -- Status Line and Bufferline { - "glepnir/galaxyline.nvim", + -- "hoob3rt/lualine.nvim", + "shadmansaleh/lualine.nvim", + -- "Lunarvim/lualine.nvim", config = function() - require "core.galaxyline" - if lvim.builtin.galaxyline.on_config_done then - lvim.builtin.galaxyline.on_config_done(require "galaxyline") - end + require("core.lualine").setup() end, - event = "BufWinEnter", - disable = not lvim.builtin.galaxyline.active, + disable = not lvim.builtin.lualine.active, }, { "romgrk/barbar.nvim", config = function() require("core.bufferline").setup() - if lvim.builtin.bufferline.on_config_done then - lvim.builtin.bufferline.on_config_done() - end end, event = "BufWinEnter", disable = not lvim.builtin.bufferline.active, @@ -191,9 +159,6 @@ return { -- event = "BufWinEnter", config = function() require("core.dap").setup() - if lvim.builtin.dap.on_config_done then - lvim.builtin.dap.on_config_done(require "dap") - end end, disable = not lvim.builtin.dap.active, }, @@ -212,9 +177,6 @@ return { event = "BufWinEnter", config = function() require("core.dashboard").setup() - if lvim.builtin.dashboard.on_config_done then - lvim.builtin.dashboard.on_config_done(require "dashboard") - end end, disable = not lvim.builtin.dashboard.active, }, @@ -225,9 +187,6 @@ return { event = "BufWinEnter", config = function() require("core.terminal").setup() - if lvim.builtin.terminal.on_config_done then - lvim.builtin.terminal.on_config_done(require "toggleterm") - end end, disable = not lvim.builtin.terminal.active, }, |