From a4c2dc4d0b638a50c3219f247b09e6238a44ec50 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Thu, 15 Sep 2022 23:33:08 -0400 Subject: refactor: small improvements (#3021) --- lua/lvim/plugins.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index bfe76bb8..0b3b51fc 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -132,13 +132,19 @@ local core_plugins = { -- NvimTree { "kyazdani42/nvim-tree.lua", - -- event = "BufWinOpen", - -- cmd = "NvimTreeToggle", config = function() require("lvim.core.nvimtree").setup() end, disable = not lvim.builtin.nvimtree.active, }, + { + + "christianchiarulli/lir.nvim", + config = function() + require("lvim.core.lir").setup() + end, + disable = not lvim.builtin.nvimtree.active, + }, { "lewis6991/gitsigns.nvim", -- cgit v1.2.3 From 62d9a4ea9df1828af2cbc6c5f42774f1662aaab4 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Fri, 16 Sep 2022 11:15:18 +0200 Subject: revert: remove incomplete lir integration (#3030) --- lua/lvim/plugins.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 0b3b51fc..bfe76bb8 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -132,19 +132,13 @@ local core_plugins = { -- NvimTree { "kyazdani42/nvim-tree.lua", + -- event = "BufWinOpen", + -- cmd = "NvimTreeToggle", config = function() require("lvim.core.nvimtree").setup() end, disable = not lvim.builtin.nvimtree.active, }, - { - - "christianchiarulli/lir.nvim", - config = function() - require("lvim.core.lir").setup() - end, - disable = not lvim.builtin.nvimtree.active, - }, { "lewis6991/gitsigns.nvim", -- cgit v1.2.3 From 77fdcd43cb77b50fc925487132f6aabd31760337 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Fri, 16 Sep 2022 17:47:40 +0200 Subject: feat: add lir.nvim (#3031) --- lua/lvim/plugins.lua | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index bfe76bb8..106403ac 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -139,6 +139,13 @@ local core_plugins = { end, disable = not lvim.builtin.nvimtree.active, }, + { + "christianchiarulli/lir.nvim", + config = function() + require("lvim.core.lir").setup() + end, + disable = not lvim.builtin.lir.active, + }, { "lewis6991/gitsigns.nvim", -- cgit v1.2.3 From 26d493419af23244fe6ca3daf3477c7b5d95c36e Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sat, 17 Sep 2022 13:42:46 +0200 Subject: revert: lir.nvim is still broken (#3036) --- lua/lvim/plugins.lua | 7 ------- 1 file changed, 7 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 106403ac..bfe76bb8 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -139,13 +139,6 @@ local core_plugins = { end, disable = not lvim.builtin.nvimtree.active, }, - { - "christianchiarulli/lir.nvim", - config = function() - require("lvim.core.lir").setup() - end, - disable = not lvim.builtin.lir.active, - }, { "lewis6991/gitsigns.nvim", -- cgit v1.2.3 From a331ef711bc6c73e78535e9b4fa44d54c937aa88 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Mon, 19 Sep 2022 11:44:04 -0400 Subject: feat: add lir.nvim again (#3038) --- lua/lvim/plugins.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index bfe76bb8..a483dbc0 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -139,7 +139,14 @@ local core_plugins = { end, disable = not lvim.builtin.nvimtree.active, }, - + -- Lir + { + "christianchiarulli/lir.nvim", + config = function() + require("lvim.core.lir").setup() + end, + disable = not lvim.builtin.lir.active, + }, { "lewis6991/gitsigns.nvim", -- cgit v1.2.3 From 352147158bb696e4b8fcb236d2cb477955b26dcf Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Mon, 19 Sep 2022 13:12:52 -0400 Subject: feat(document highlight): use illuminate rather than autocommand to avoid flashing (#3029) --- lua/lvim/plugins.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index a483dbc0..bd8f787d 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -256,6 +256,10 @@ local core_plugins = { { "b0o/schemastore.nvim", }, + + { + "RRethy/vim-illuminate", + }, } local default_snapshot_path = join_paths(get_lvim_base_dir(), "snapshots", "default.json") -- cgit v1.2.3 From 58280f30adc06423c5b4972257d19b7d33921d26 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Mon, 19 Sep 2022 19:03:53 -0400 Subject: feat: new colorscheme tokyonight (#3041) --- lua/lvim/plugins.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index bd8f787d..3d2a2b83 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -15,17 +15,16 @@ local core_plugins = { end, }, { - "lunarvim/onedarker.nvim", - branch = "freeze", + "lunarvim/tokyonight.nvim", config = function() pcall(function() - if lvim and lvim.colorscheme == "onedarker" then - require("onedarker").setup() - lvim.builtin.lualine.options.theme = "onedarker" + if lvim and lvim.colorscheme == "tokyonight-night" then + require("tokyonight-night").setup() + lvim.builtin.lualine.options.theme = "tokyonight-night" end end) end, - disable = lvim.colorscheme ~= "onedarker", + disable = lvim.colorscheme ~= "tokyonight-night", }, { "rcarriga/nvim-notify", -- cgit v1.2.3 From f11909b5649f6169fe48b61a40def4924754c38e Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Mon, 19 Sep 2022 22:14:32 -0400 Subject: feat: breadcrumbs (#3043) --- lua/lvim/plugins.lua | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 3d2a2b83..85c1e80e 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -202,6 +202,15 @@ local core_plugins = { disable = not lvim.builtin.lualine.active, }, + -- breadcrumbs + { + "SmiteshP/nvim-navic", + config = function() + require("lvim.core.breadcrumbs").setup() + end, + -- disable = not lvim.builtin.breadcrumbs.active, + }, + { "akinsho/bufferline.nvim", config = function() -- cgit v1.2.3 From 518b1d4167162a54a6e76784038d30191613b76d Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Tue, 20 Sep 2022 14:11:58 +0430 Subject: Fix: make sure latest plugins are customizable (#3044) * fix: make navim-navic configurable * fix: make sure vim-illuminate is configurable * fix: make sure theme is configurable * fix(ci): don't verify uninstalled plugins * refactor(lsp): add setup_document_symbols util * revert: keep onedarker on freeze branch * refactor(lsp): avoid duplicate hl autocmds Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com> --- lua/lvim/plugins.lua | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 85c1e80e..e84049dc 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -15,16 +15,11 @@ local core_plugins = { end, }, { - "lunarvim/tokyonight.nvim", + "folke/tokyonight.nvim", config = function() - pcall(function() - if lvim and lvim.colorscheme == "tokyonight-night" then - require("tokyonight-night").setup() - lvim.builtin.lualine.options.theme = "tokyonight-night" - end - end) + require("lvim.core.theme").setup() end, - disable = lvim.colorscheme ~= "tokyonight-night", + disable = not vim.startswith(lvim.colorscheme, "tokyonight"), }, { "rcarriga/nvim-notify", @@ -208,7 +203,7 @@ local core_plugins = { config = function() require("lvim.core.breadcrumbs").setup() end, - -- disable = not lvim.builtin.breadcrumbs.active, + disable = not lvim.builtin.breadcrumbs.active, }, { @@ -267,6 +262,23 @@ local core_plugins = { { "RRethy/vim-illuminate", + setup = function() + require("lvim.core.illuminate").setup() + end, + disable = not lvim.builtin.illuminate.active, + }, + { + "lunarvim/onedarker.nvim", + branch = "freeze", + config = function() + pcall(function() + if lvim and lvim.colorscheme == "onedarker" then + require("onedarker").setup() + lvim.builtin.lualine.options.theme = "onedarker" + end + end) + end, + disable = lvim.colorscheme ~= "onedarker", }, } -- cgit v1.2.3 From 293f4369aee4c66a48534e81a36e5ed41e74a031 Mon Sep 17 00:00:00 2001 From: ChristianChiarulli Date: Tue, 20 Sep 2022 08:11:36 -0400 Subject: feat: illuminate works again --- lua/lvim/plugins.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index e84049dc..8fabd9d2 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -262,10 +262,10 @@ local core_plugins = { { "RRethy/vim-illuminate", - setup = function() + config = function() require("lvim.core.illuminate").setup() end, - disable = not lvim.builtin.illuminate.active, + -- disable = not lvim.builtin.illuminate.active, }, { "lunarvim/onedarker.nvim", -- cgit v1.2.3 From 31af25f6a19006cad1c38ffd2c63e73d914aded7 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 20 Sep 2022 17:26:57 +0200 Subject: revert: fix Packer instead of hard-coding config (#3049) --- lua/lvim/plugins.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 8fabd9d2..b2825006 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -265,7 +265,7 @@ local core_plugins = { config = function() require("lvim.core.illuminate").setup() end, - -- disable = not lvim.builtin.illuminate.active, + disable = not lvim.builtin.illuminate.active, }, { "lunarvim/onedarker.nvim", -- cgit v1.2.3 From 2ba566b0d820977323f48cbdcc2b3b307b882204 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Wed, 21 Sep 2022 10:48:15 -0400 Subject: feat: add indentlines (#3056) --- lua/lvim/plugins.lua | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index b2825006..625f3ad1 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -267,6 +267,15 @@ local core_plugins = { end, disable = not lvim.builtin.illuminate.active, }, + + { + "lukas-reineke/indent-blankline.nvim", + config = function() + require("lvim.core.indent-blankline").setup() + end, + disable = not lvim.builtin.indentlines.active, + }, + { "lunarvim/onedarker.nvim", branch = "freeze", -- cgit v1.2.3 From 03156e42acde5b2e40c5245b8720450a4c5d25ba Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Wed, 21 Sep 2022 11:09:11 -0400 Subject: Indentlines (#3057) --- lua/lvim/plugins.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 625f3ad1..2140636b 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -271,7 +271,7 @@ local core_plugins = { { "lukas-reineke/indent-blankline.nvim", config = function() - require("lvim.core.indent-blankline").setup() + require("lvim.core.indentlines").setup() end, disable = not lvim.builtin.indentlines.active, }, -- cgit v1.2.3 From 64615ae626f2932529b236c3c5f99090dbf9faad Mon Sep 17 00:00:00 2001 From: ChristianChiarulli Date: Wed, 21 Sep 2022 11:21:01 -0400 Subject: fix: always load base theme --- lua/lvim/plugins.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 2140636b..fbafb17a 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -19,7 +19,7 @@ local core_plugins = { config = function() require("lvim.core.theme").setup() end, - disable = not vim.startswith(lvim.colorscheme, "tokyonight"), + -- disable = not vim.startswith(lvim.colorscheme, "tokyonight"), }, { "rcarriga/nvim-notify", -- cgit v1.2.3 From 699849a731d61fe8996b42f37a4905c984d92686 Mon Sep 17 00:00:00 2001 From: lvimuser <109605931+lvimuser@users.noreply.github.com> Date: Sat, 1 Oct 2022 03:10:47 -0300 Subject: chore(plugins): remove deprecated FixCursorHold.nvim (#3107) --- lua/lvim/plugins.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index fbafb17a..13568770 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -6,7 +6,6 @@ local core_plugins = { { "jose-elias-alvarez/null-ls.nvim", }, - { "antoinemadec/FixCursorHold.nvim" }, -- Needed while issue https://github.com/neovim/neovim/issues/12587 is still open { "williamboman/mason-lspconfig.nvim" }, { "williamboman/mason.nvim", -- cgit v1.2.3 From 1c03ac80529d90c7a824a581172b6e41e6ae237b Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Mon, 3 Oct 2022 00:56:23 +0000 Subject: feat: reload and lir color update (#3123) --- lua/lvim/plugins.lua | 55 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 13568770..2a9f402e 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -1,3 +1,4 @@ +local reload = require("lvim.utils.reload").reload local core_plugins = { -- Packer can manage itself as an optional plugin { "wbthomason/packer.nvim" }, @@ -10,20 +11,20 @@ local core_plugins = { { "williamboman/mason.nvim", config = function() - require("lvim.core.mason").setup() + reload("lvim.core.mason").setup() end, }, { "folke/tokyonight.nvim", config = function() - require("lvim.core.theme").setup() + reload("lvim.core.theme").setup() end, -- disable = not vim.startswith(lvim.colorscheme, "tokyonight"), }, { "rcarriga/nvim-notify", config = function() - require("lvim.core.notify").setup() + reload("lvim.core.notify").setup() end, requires = { "nvim-telescope/telescope.nvim" }, disable = not lvim.builtin.notify.active or not lvim.builtin.telescope.active, @@ -37,7 +38,7 @@ local core_plugins = { "nvim-telescope/telescope.nvim", branch = "0.1.x", config = function() - require("lvim.core.telescope").setup() + reload("lvim.core.telescope").setup() end, disable = not lvim.builtin.telescope.active, }, @@ -52,7 +53,7 @@ local core_plugins = { "hrsh7th/nvim-cmp", config = function() if lvim.builtin.cmp then - require("lvim.core.cmp").setup() + reload("lvim.core.cmp").setup() end end, requires = { @@ -66,7 +67,7 @@ local core_plugins = { { "L3MON4D3/LuaSnip", config = function() - local utils = require "lvim.utils" + local utils = reload "lvim.utils" local paths = {} if lvim.builtin.luasnip.sources.friendly_snippets then paths[#paths + 1] = utils.join_paths(get_runtime_dir(), "site", "pack", "packer", "start", "friendly-snippets") @@ -75,11 +76,11 @@ local core_plugins = { if utils.is_directory(user_snippets) then paths[#paths + 1] = user_snippets end - require("luasnip.loaders.from_lua").lazy_load() - require("luasnip.loaders.from_vscode").lazy_load { + reload("luasnip.loaders.from_lua").lazy_load() + reload("luasnip.loaders.from_vscode").lazy_load { paths = paths, } - require("luasnip.loaders.from_snipmate").lazy_load() + reload("luasnip.loaders.from_snipmate").lazy_load() end, }, { @@ -104,7 +105,7 @@ local core_plugins = { "windwp/nvim-autopairs", -- event = "InsertEnter", config = function() - require("lvim.core.autopairs").setup() + reload("lvim.core.autopairs").setup() end, disable = not lvim.builtin.autopairs.active, }, @@ -114,7 +115,7 @@ local core_plugins = { "nvim-treesitter/nvim-treesitter", -- run = ":TSUpdate", config = function() - require("lvim.core.treesitter").setup() + reload("lvim.core.treesitter").setup() end, }, { @@ -128,7 +129,7 @@ local core_plugins = { -- event = "BufWinOpen", -- cmd = "NvimTreeToggle", config = function() - require("lvim.core.nvimtree").setup() + reload("lvim.core.nvimtree").setup() end, disable = not lvim.builtin.nvimtree.active, }, @@ -136,7 +137,7 @@ local core_plugins = { { "christianchiarulli/lir.nvim", config = function() - require("lvim.core.lir").setup() + reload("lvim.core.lir").setup() end, disable = not lvim.builtin.lir.active, }, @@ -144,7 +145,7 @@ local core_plugins = { "lewis6991/gitsigns.nvim", config = function() - require("lvim.core.gitsigns").setup() + reload("lvim.core.gitsigns").setup() end, event = "BufRead", disable = not lvim.builtin.gitsigns.active, @@ -154,7 +155,7 @@ local core_plugins = { { "folke/which-key.nvim", config = function() - require("lvim.core.which-key").setup() + reload("lvim.core.which-key").setup() end, event = "BufWinEnter", disable = not lvim.builtin.which_key.active, @@ -165,7 +166,7 @@ local core_plugins = { "numToStr/Comment.nvim", event = "BufRead", config = function() - require("lvim.core.comment").setup() + reload("lvim.core.comment").setup() end, disable = not lvim.builtin.comment.active, }, @@ -174,7 +175,7 @@ local core_plugins = { { "ahmedkhalf/project.nvim", config = function() - require("lvim.core.project").setup() + reload("lvim.core.project").setup() end, disable = not lvim.builtin.project.active, }, @@ -191,7 +192,7 @@ local core_plugins = { "nvim-lualine/lualine.nvim", -- "Lunarvim/lualine.nvim", config = function() - require("lvim.core.lualine").setup() + reload("lvim.core.lualine").setup() end, disable = not lvim.builtin.lualine.active, }, @@ -200,7 +201,7 @@ local core_plugins = { { "SmiteshP/nvim-navic", config = function() - require("lvim.core.breadcrumbs").setup() + reload("lvim.core.breadcrumbs").setup() end, disable = not lvim.builtin.breadcrumbs.active, }, @@ -208,7 +209,7 @@ local core_plugins = { { "akinsho/bufferline.nvim", config = function() - require("lvim.core.bufferline").setup() + reload("lvim.core.bufferline").setup() end, branch = "main", event = "BufWinEnter", @@ -220,7 +221,7 @@ local core_plugins = { "mfussenegger/nvim-dap", -- event = "BufWinEnter", config = function() - require("lvim.core.dap").setup() + reload("lvim.core.dap").setup() end, disable = not lvim.builtin.dap.active, }, @@ -238,7 +239,7 @@ local core_plugins = { { "goolord/alpha-nvim", config = function() - require("lvim.core.alpha").setup() + reload("lvim.core.alpha").setup() end, disable = not lvim.builtin.alpha.active, }, @@ -249,7 +250,7 @@ local core_plugins = { event = "BufWinEnter", branch = "main", config = function() - require("lvim.core.terminal").setup() + reload("lvim.core.terminal").setup() end, disable = not lvim.builtin.terminal.active, }, @@ -262,7 +263,7 @@ local core_plugins = { { "RRethy/vim-illuminate", config = function() - require("lvim.core.illuminate").setup() + reload("lvim.core.illuminate").setup() end, disable = not lvim.builtin.illuminate.active, }, @@ -270,7 +271,7 @@ local core_plugins = { { "lukas-reineke/indent-blankline.nvim", config = function() - require("lvim.core.indentlines").setup() + reload("lvim.core.indentlines").setup() end, disable = not lvim.builtin.indentlines.active, }, @@ -281,7 +282,7 @@ local core_plugins = { config = function() pcall(function() if lvim and lvim.colorscheme == "onedarker" then - require("onedarker").setup() + reload("onedarker").setup() lvim.builtin.lualine.options.theme = "onedarker" end end) @@ -295,7 +296,7 @@ local content = vim.fn.readfile(default_snapshot_path) local default_sha1 = vim.fn.json_decode(content) local get_default_sha1 = function(spec) - local short_name, _ = require("packer.util").get_plugin_short_name(spec) + local short_name, _ = reload("packer.util").get_plugin_short_name(spec) return default_sha1[short_name] and default_sha1[short_name].commit end -- cgit v1.2.3 From 228658b02e083d0294b737b39275f3b62c007b94 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Sun, 2 Oct 2022 22:30:38 -0400 Subject: fix: idk why it has an issue here but we can't use reload in the plugins file for now --- lua/lvim/plugins.lua | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 2a9f402e..387bcee3 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -1,4 +1,4 @@ -local reload = require("lvim.utils.reload").reload +-- local require = require("lvim.utils.require").require local core_plugins = { -- Packer can manage itself as an optional plugin { "wbthomason/packer.nvim" }, @@ -11,20 +11,20 @@ local core_plugins = { { "williamboman/mason.nvim", config = function() - reload("lvim.core.mason").setup() + require("lvim.core.mason").setup() end, }, { "folke/tokyonight.nvim", config = function() - reload("lvim.core.theme").setup() + require("lvim.core.theme").setup() end, -- disable = not vim.startswith(lvim.colorscheme, "tokyonight"), }, { "rcarriga/nvim-notify", config = function() - reload("lvim.core.notify").setup() + require("lvim.core.notify").setup() end, requires = { "nvim-telescope/telescope.nvim" }, disable = not lvim.builtin.notify.active or not lvim.builtin.telescope.active, @@ -38,7 +38,7 @@ local core_plugins = { "nvim-telescope/telescope.nvim", branch = "0.1.x", config = function() - reload("lvim.core.telescope").setup() + require("lvim.core.telescope").setup() end, disable = not lvim.builtin.telescope.active, }, @@ -53,7 +53,7 @@ local core_plugins = { "hrsh7th/nvim-cmp", config = function() if lvim.builtin.cmp then - reload("lvim.core.cmp").setup() + require("lvim.core.cmp").setup() end end, requires = { @@ -67,7 +67,7 @@ local core_plugins = { { "L3MON4D3/LuaSnip", config = function() - local utils = reload "lvim.utils" + local utils = require "lvim.utils" local paths = {} if lvim.builtin.luasnip.sources.friendly_snippets then paths[#paths + 1] = utils.join_paths(get_runtime_dir(), "site", "pack", "packer", "start", "friendly-snippets") @@ -76,11 +76,11 @@ local core_plugins = { if utils.is_directory(user_snippets) then paths[#paths + 1] = user_snippets end - reload("luasnip.loaders.from_lua").lazy_load() - reload("luasnip.loaders.from_vscode").lazy_load { + require("luasnip.loaders.from_lua").lazy_load() + require("luasnip.loaders.from_vscode").lazy_load { paths = paths, } - reload("luasnip.loaders.from_snipmate").lazy_load() + require("luasnip.loaders.from_snipmate").lazy_load() end, }, { @@ -105,7 +105,7 @@ local core_plugins = { "windwp/nvim-autopairs", -- event = "InsertEnter", config = function() - reload("lvim.core.autopairs").setup() + require("lvim.core.autopairs").setup() end, disable = not lvim.builtin.autopairs.active, }, @@ -115,7 +115,7 @@ local core_plugins = { "nvim-treesitter/nvim-treesitter", -- run = ":TSUpdate", config = function() - reload("lvim.core.treesitter").setup() + require("lvim.core.treesitter").setup() end, }, { @@ -129,7 +129,7 @@ local core_plugins = { -- event = "BufWinOpen", -- cmd = "NvimTreeToggle", config = function() - reload("lvim.core.nvimtree").setup() + require("lvim.core.nvimtree").setup() end, disable = not lvim.builtin.nvimtree.active, }, @@ -137,7 +137,7 @@ local core_plugins = { { "christianchiarulli/lir.nvim", config = function() - reload("lvim.core.lir").setup() + require("lvim.core.lir").setup() end, disable = not lvim.builtin.lir.active, }, @@ -145,7 +145,7 @@ local core_plugins = { "lewis6991/gitsigns.nvim", config = function() - reload("lvim.core.gitsigns").setup() + require("lvim.core.gitsigns").setup() end, event = "BufRead", disable = not lvim.builtin.gitsigns.active, @@ -155,7 +155,7 @@ local core_plugins = { { "folke/which-key.nvim", config = function() - reload("lvim.core.which-key").setup() + require("lvim.core.which-key").setup() end, event = "BufWinEnter", disable = not lvim.builtin.which_key.active, @@ -166,7 +166,7 @@ local core_plugins = { "numToStr/Comment.nvim", event = "BufRead", config = function() - reload("lvim.core.comment").setup() + require("lvim.core.comment").setup() end, disable = not lvim.builtin.comment.active, }, @@ -175,7 +175,7 @@ local core_plugins = { { "ahmedkhalf/project.nvim", config = function() - reload("lvim.core.project").setup() + require("lvim.core.project").setup() end, disable = not lvim.builtin.project.active, }, @@ -192,7 +192,7 @@ local core_plugins = { "nvim-lualine/lualine.nvim", -- "Lunarvim/lualine.nvim", config = function() - reload("lvim.core.lualine").setup() + require("lvim.core.lualine").setup() end, disable = not lvim.builtin.lualine.active, }, @@ -201,7 +201,7 @@ local core_plugins = { { "SmiteshP/nvim-navic", config = function() - reload("lvim.core.breadcrumbs").setup() + require("lvim.core.breadcrumbs").setup() end, disable = not lvim.builtin.breadcrumbs.active, }, @@ -209,7 +209,7 @@ local core_plugins = { { "akinsho/bufferline.nvim", config = function() - reload("lvim.core.bufferline").setup() + require("lvim.core.bufferline").setup() end, branch = "main", event = "BufWinEnter", @@ -221,7 +221,7 @@ local core_plugins = { "mfussenegger/nvim-dap", -- event = "BufWinEnter", config = function() - reload("lvim.core.dap").setup() + require("lvim.core.dap").setup() end, disable = not lvim.builtin.dap.active, }, @@ -239,7 +239,7 @@ local core_plugins = { { "goolord/alpha-nvim", config = function() - reload("lvim.core.alpha").setup() + require("lvim.core.alpha").setup() end, disable = not lvim.builtin.alpha.active, }, @@ -250,7 +250,7 @@ local core_plugins = { event = "BufWinEnter", branch = "main", config = function() - reload("lvim.core.terminal").setup() + require("lvim.core.terminal").setup() end, disable = not lvim.builtin.terminal.active, }, @@ -263,7 +263,7 @@ local core_plugins = { { "RRethy/vim-illuminate", config = function() - reload("lvim.core.illuminate").setup() + require("lvim.core.illuminate").setup() end, disable = not lvim.builtin.illuminate.active, }, @@ -271,7 +271,7 @@ local core_plugins = { { "lukas-reineke/indent-blankline.nvim", config = function() - reload("lvim.core.indentlines").setup() + require("lvim.core.indentlines").setup() end, disable = not lvim.builtin.indentlines.active, }, @@ -282,7 +282,7 @@ local core_plugins = { config = function() pcall(function() if lvim and lvim.colorscheme == "onedarker" then - reload("onedarker").setup() + require("onedarker").setup() lvim.builtin.lualine.options.theme = "onedarker" end end) @@ -296,7 +296,7 @@ local content = vim.fn.readfile(default_snapshot_path) local default_sha1 = vim.fn.json_decode(content) local get_default_sha1 = function(spec) - local short_name, _ = reload("packer.util").get_plugin_short_name(spec) + local short_name, _ = require("packer.util").get_plugin_short_name(spec) return default_sha1[short_name] and default_sha1[short_name].commit end -- cgit v1.2.3 From 2254ce4bc43ab11a831ef39a77415de169eac040 Mon Sep 17 00:00:00 2001 From: Gabriele Musco Date: Tue, 4 Oct 2022 07:38:59 +0200 Subject: feat: added dap ui and relative config (#3131) --- lua/lvim/plugins.lua | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 387bcee3..c315cdd9 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -235,6 +235,15 @@ local core_plugins = { disable = not lvim.builtin.dap.active, }, + -- Debugger user interface + { + "rcarriga/nvim-dap-ui", + config = function() + require("lvim.core.dap").setup_ui() + end, + disable = not lvim.builtin.dap.active, + }, + -- alpha { "goolord/alpha-nvim", -- cgit v1.2.3 From e5bcf01c759e7c833d8a5f1fcf665b6ea32a7c16 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 4 Oct 2022 19:23:52 +0200 Subject: refactor: more deliberate reload (#3133) --- lua/lvim/plugins.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index c315cdd9..0b5e1c72 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -16,10 +16,6 @@ local core_plugins = { }, { "folke/tokyonight.nvim", - config = function() - require("lvim.core.theme").setup() - end, - -- disable = not vim.startswith(lvim.colorscheme, "tokyonight"), }, { "rcarriga/nvim-notify", @@ -139,6 +135,7 @@ local core_plugins = { config = function() require("lvim.core.lir").setup() end, + requires = { "kyazdani42/nvim-web-devicons" }, disable = not lvim.builtin.lir.active, }, { -- cgit v1.2.3 From 5b35ed9c3288f5c631e04f80674f098d79fe130e Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Thu, 6 Oct 2022 05:20:12 +0000 Subject: feat: all features active by default (#3157) --- lua/lvim/plugins.lua | 9 --------- 1 file changed, 9 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 0b5e1c72..a0f5d14d 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -223,15 +223,6 @@ local core_plugins = { disable = not lvim.builtin.dap.active, }, - -- Debugger management - { - "Pocco81/dap-buddy.nvim", - branch = "dev", - -- event = "BufWinEnter", - -- event = "BufRead", - disable = not lvim.builtin.dap.active, - }, - -- Debugger user interface { "rcarriga/nvim-dap-ui", -- cgit v1.2.3 From 91ac8a0bb0eefc31815371454bcf59aa72d0acc3 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Sat, 15 Oct 2022 10:21:24 +0330 Subject: fix(luadev): this plugin has been renamed (#3235) --- lua/lvim/plugins.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index a0f5d14d..966f3a1c 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -92,8 +92,8 @@ local core_plugins = { "hrsh7th/cmp-path", }, { - "folke/lua-dev.nvim", - module = "lua-dev", + "folke/neodev.nvim", + module = "neodev", }, -- Autopairs -- cgit v1.2.3 From e94390a9225c418dd96eb6b6822ce0dc15ce7cce Mon Sep 17 00:00:00 2001 From: 2nthony Date: Sat, 15 Oct 2022 20:06:52 +0800 Subject: perf(plugins): move assert `vim.env.LVIM_DEV_MODE` logic (#3238) --- lua/lvim/plugins.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lua/lvim/plugins.lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 966f3a1c..db84d878 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -297,8 +297,8 @@ local get_default_sha1 = function(spec) return default_sha1[short_name] and default_sha1[short_name].commit end -for _, spec in ipairs(core_plugins) do - if not vim.env.LVIM_DEV_MODE then +if not vim.env.LVIM_DEV_MODE then + for _, spec in ipairs(core_plugins) do -- Manually lock the commit hash since Packer's snapshots are unreliable in headless mode spec["commit"] = get_default_sha1(spec) end -- cgit v1.2.3