diff --git a/lazy-lock.json b/lazy-lock.json
index e56bf2d..70b76e5 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -7,6 +7,7 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
+  "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" },
   "friendly-snippets": { "branch": "main", "commit": "009887b76f15d16f69ae1341f86a7862f61cf2a1" },
   "gitsigns.nvim": { "branch": "main", "commit": "b1f9cf7c5c5639c006c937fc1819e09f358210fc" },
   "lazy.nvim": { "branch": "main", "commit": "5b4444f0d7e556deba3f7ca949a2ba0e2c3369fb" },
@@ -21,7 +22,7 @@
   "mini.surround": { "branch": "main", "commit": "b7c2f4bea1f60af8dfee71f696319d045d986ce6" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "205184aa0e0f08e8a1249d9bb37b45bae85f01b9" },
   "neoconf.nvim": { "branch": "main", "commit": "36b0be969326e70143bcd878d4a27f574eabc292" },
-  "noice.nvim": { "branch": "main", "commit": "a132d4210f9e4ed7b034d98e61eba877c6991a49" },
+  "neodev.nvim": { "branch": "main", "commit": "bd2b5deb568717cc0837c595cf7e945c17b6970d" },
   "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" },
   "null-ls.nvim": { "branch": "main", "commit": "787d250107b5f6a2535245c4060cc7a5b0b87884" },
   "nvim-cmp": { "branch": "main", "commit": "feed47fd1da7a1bad2c7dca456ea19c8a5a9823a" },
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 02468ba..32b0f39 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -7,6 +7,10 @@ local keymap = vim.keymap.set
 -- Silent keymap option
 local opts = { silent = true }
 
+-- Remap LazyVim
+keymap("n", "<Leader>l", "<Nop>", opts)
+keymap("n", "<Leader>lz", "<cmd>:Lazy<cr>", { desc = "Lazy" })
+
 -- --Remap space as leader key
 -- keymap("", "<Space>", "<Nop>", opts)
 -- vim.g.mapleader = " "
@@ -51,9 +55,9 @@ end
 -- -- Clear highlights
 -- keymap("n", "<leader>h", "<cmd>nohlsearch<CR>", opts)
 --
--- -- Close buffers
--- keymap("n", "<M-q>", "<cmd>Bdelete<CR>", opts)
--- keymap("n", "<M-Q>", "<cmd>Bdelete!<CR>", opts)
+-- Close buffers
+keymap("n", "<M-q>", "<cmd>Bdelete<CR>", opts)
+keymap("n", "<M-Q>", "<cmd>Bdelete!<CR>", opts)
 --
 -- -- Better paste
 -- keymap("x", "p", '"_dP', opts)
diff --git a/lua/config/options.lua b/lua/config/options.lua
index 6d8013e..cd616ee 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -4,3 +4,5 @@
 
 vim.opt.relativenumber = false
 vim.opt.conceallevel = 0
+vim.opt.completeopt = { "menuone", "noselect" }
+vim.opt.timeoutlen = 1000
diff --git a/lua/plugins/core.lua b/lua/plugins/core.lua
index afaa428..494422c 100644
--- a/lua/plugins/core.lua
+++ b/lua/plugins/core.lua
@@ -5,4 +5,17 @@ return {
       colorscheme = "catppuccin",
     },
   },
+  {
+    "folke/lazy.nvim",
+    priority = 10001,
+    opts = {
+      checker = {
+        notify = false,
+      },
+      change_detection = {
+        enabled = false,
+        notify = false,
+      },
+    },
+  },
 }
diff --git a/lua/plugins/disabled.lua b/lua/plugins/disabled.lua
index cb59197..fd7136e 100644
--- a/lua/plugins/disabled.lua
+++ b/lua/plugins/disabled.lua
@@ -6,5 +6,5 @@ return {
   { "rcarriga/nvim-notify", enabled = false },
   { "ggandor/flit.nvim", enabled = false },
   { "stevearc/dressing.nvim", enabled = false },
-  { "folke/neodev.nvim", enabled = false },
+  -- { "folke/neodev.nvim", enabled = false },
 }
diff --git a/lua/plugins/fidget.lua b/lua/plugins/fidget.lua
new file mode 100644
index 0000000..fa0bed9
--- /dev/null
+++ b/lua/plugins/fidget.lua
@@ -0,0 +1,3 @@
+return {
+  { "j-hui/fidget.nvim" },
+}
diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua
new file mode 100644
index 0000000..a564707
--- /dev/null
+++ b/lua/plugins/lazy.lua
@@ -0,0 +1 @@
+return {}
diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua
index 7342606..39fdcf9 100644
--- a/lua/plugins/noice.lua
+++ b/lua/plugins/noice.lua
@@ -1,38 +1,47 @@
 return {
-  {
-    "folke/noice.nvim",
-    opts = {
-      cmdline = {
-        enabled = true,
-        view = "cmdline",
-        format = {
-          cmdline = false,
-          search_down = false,
-          search_up = false,
-          filter = false,
-          lua = false,
-          help = false,
-        },
+  "folke/noice.nvim",
+  enabled = true,
+  opts = {
+    cmdline = {
+      enabled = true,
+      view = "cmdline",
+      format = {
+        cmdline = false,
+        search_down = false,
+        search_up = false,
+        filter = false,
+        lua = false,
+        help = false,
       },
-      messages = {
-        enabled = true,
+    },
+    messages = {
+      enabled = false,
+    },
+    popupmenu = {
+      enabled = false,
+      backend = "cmp",
+    },
+    presets = {
+      bottom_search = true,
+    },
+    lsp = {
+      progress = {
+        enabled = false,
       },
+    },
+    views = {
       popupmenu = {
-        enabled = true,
-        backend = "cmp",
-      },
-      presets = {
-        bottom_search = true,
-      },
-      views = {
-        popupmenu = {
-          relative = "cursor",
-          position = {
-            row = 0,
-            col = 0,
-          },
+        relative = "cursor",
+        position = {
+          row = 0,
+          col = 0,
         },
       },
     },
+    -- routes = {
+    --   view = "cmdline",
+    --   filter = {
+    --   }
+    -- }
   },
 }