Merge remote-tracking branch 'origin/rolling'

1 files changed, 6 insertions, 5 deletions

diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 616b2fa0..c50e74d8 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -8,7 +8,10 @@ return {
   {
     "williamboman/nvim-lsp-installer",
   },
-  { "rcarriga/nvim-notify" },
+  {
+    "rcarriga/nvim-notify",
+    disable = not lvim.builtin.notify.active,
+  },
   { "Tastyep/structlog.nvim" },
 
   { "nvim-lua/popup.nvim" },
@@ -96,10 +99,8 @@ return {
   },
 
   -- Whichkey
-  -- TODO: change back to folke/which-key.nvim after folke got back
   {
-    "abzcoding/which-key.nvim",
-    branch = "fix/neovim-6-position",
+    "folke/which-key.nvim",
     config = function()
       require("lvim.core.which-key").setup()
     end,
@@ -132,7 +133,7 @@ return {
   -- Status Line and Bufferline
   {
     -- "hoob3rt/lualine.nvim",
-    "shadmansaleh/lualine.nvim",
+    "nvim-lualine/lualine.nvim",
     -- "Lunarvim/lualine.nvim",
     config = function()
       require("lvim.core.lualine").setup()