diff --git a/lazy-lock.json b/lazy-lock.json
index 1280170..ef82a02 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,35 +1,36 @@
 {
   "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
-  "auto-dark-mode.nvim": { "branch": "master", "commit": "c31de126963ffe9403901b4b0990dde0e6999cc6" },
-  "auto-session": { "branch": "main", "commit": "dcbc339a1a0e6505f755d980ad11f892b6a8d492" },
+  "auto-dark-mode.nvim": { "branch": "master", "commit": "e300259ec777a40b4b9e3c8e6ade203e78d15881" },
+  "auto-session": { "branch": "main", "commit": "62437532b38495551410b3f377bcf4aaac574ebe" },
   "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
   "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
-  "codediff.nvim": { "branch": "main", "commit": "7e5cda21dab96901cbc4bf3b15828aa8c7b490a7" },
-  "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
-  "copilot.lua": { "branch": "master", "commit": "3faffefbd6ddeb52578535ec6b730e0b72d7fd1a" },
+  "codediff.nvim": { "branch": "main", "commit": "0a2f5d71cdf2e8e0ca37acb604cf7cb09998b045" },
+  "conform.nvim": { "branch": "master", "commit": "e969e302bced7ffb9a0a0323629f31feb0ca35a6" },
+  "copilot.lua": { "branch": "master", "commit": "5c01badd42049a63ac9e5d6c8ea85aaf66cb940f" },
   "cutlass.nvim": { "branch": "main", "commit": "d01b5c1943050fcda8edf5c89d4419c41a65890e" },
   "definition-or-references.nvim": { "branch": "main", "commit": "7318f9479d2db357d2908599c3ec14bec7c589dd" },
   "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "31217271a7314c343606acb4072a94a039a19fb5" },
+  "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" },
   "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
-  "live-server.nvim": { "branch": "main", "commit": "d6a253569ebb813c622f56971f55f56d044f6ab5" },
+  "live-server.nvim": { "branch": "main", "commit": "6897c94950e05d5b22440c6db8fa24c5c51d8d12" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "markdown-preview.nvim": { "branch": "main", "commit": "e2d58c41372ed58de2b781b8bdf74fd027c6a3f3" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" },
+  "markdown-preview.nvim": { "branch": "main", "commit": "858391a1d01dc0daa5233184b4600e1cc0d8d9fc" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "6c4830e37743b060d13c9269394176aea6a0fbc8" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
   "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
   "multicursor.nvim": { "branch": "1.0", "commit": "630dd29dd696bc977cb81d7dd2fa6bb280f60fc4" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
+  "neominimap.nvim": { "branch": "main", "commit": "6a9d8b0d2f2c0d9d7853b377fa225990cb24837a" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
   "nvim-highlight-colors": { "branch": "main", "commit": "e2cb22089cc2358b2b995c09578224f142de6039" },
   "nvim-hlslens": { "branch": "main", "commit": "be2d7b2be01860b5445a007ff2bc72b29896db6b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5a855bcfec7973767a1a472335684bbd71d2fa2b" },
   "nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" },
-  "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
-  "nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" },
+  "nvim-surround": { "branch": "main", "commit": "2800277e75eda268df2bfab6ebc53e2635455318" },
+  "nvim-treesitter": { "branch": "main", "commit": "dc42c209f3820bdfaae0956f15de29689aa6b451" },
   "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" },
   "onedarkpro.nvim": { "branch": "main", "commit": "743bf248cf238a0625f3a204eecefafcf6281a9f" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
diff --git a/lua/plugins/codediff.lua b/lua/plugins/codediff.lua
index 0d2cb7b..c5eba18 100644
--- a/lua/plugins/codediff.lua
+++ b/lua/plugins/codediff.lua
@@ -8,7 +8,7 @@ return {
 	opts = {
 		explorer = {
 			position = "right",
-			width = 60,
+			width = 40,
 			view_mode = "tree",
 		},
 		keymaps = {
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index 0d63ea1..60daea8 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -19,6 +19,7 @@ return {
 				highlights = {
 					LspReferenceText = { link = "CursorColumn", extend = true },
 					NeoTreeCursorLine = { bg = "${cursorline}", bold = true }, -- Neo-tree/onedarkpro bug fix
+					NeominimapCursorLine = { bg = "${gray}", bold = true }, -- Neo-tree/onedarkpro bug fix
 				},
 			})
 			vim.cmd.colorscheme("onedark_vivid")
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index c2d131c..19f5a90 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -21,6 +21,9 @@ return {
 	opts = {
 		options = {
 			always_show_tabline = false,
+			disabled_filetypes = {
+				statusline = { "neominimap" },
+			},
 		},
 		sections = {
 			lualine_a = {
diff --git a/lua/plugins/minimap.lua b/lua/plugins/minimap.lua
new file mode 100644
index 0000000..77a1ed0
--- /dev/null
+++ b/lua/plugins/minimap.lua
@@ -0,0 +1,23 @@
+---@module "neominimap.config.meta"
+return {
+	"Isrothy/neominimap.nvim",
+	version = "v3.x.x",
+	lazy = false, -- NOTE: NO NEED to Lazy load
+	init = function()
+		-- vim.opt.wrap = false
+		-- vim.opt.sidescrolloff = 36 -- Set a large value
+
+		--- Put your configuration here
+		vim.g.neominimap = {
+			auto_enable = true,
+			current_line_position = "percent",
+			float = {
+				window_border = "none",
+			},
+		}
+
+		vim.api.nvim_create_user_command("MinimapToggle", function()
+			vim.cmd("Neominimap Toggle")
+		end, { desc = "Toggle minimap" })
+	end,
+}
diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua
index 18b80e6..e2eb4be 100644
--- a/lua/plugins/neo-tree.lua
+++ b/lua/plugins/neo-tree.lua
@@ -77,7 +77,7 @@ return {
 				end,
 			},
 			window = {
-				width = 60,
+				width = 40,
 				position = "right",
 				mappings = {
 					["<c-b>"] = false,
diff --git a/lua/plugins/vim-scrollbar.lua b/lua/plugins/vim-scrollbar.lua
index 450f687..2b85752 100644
--- a/lua/plugins/vim-scrollbar.lua
+++ b/lua/plugins/vim-scrollbar.lua
@@ -30,6 +30,7 @@ return {
 		excluded_filetypes = {
 			"neo-tree",
 			"neo-tree-popup",
+			"neominimap",
 		},
 	},
 }