diff --git a/tools/nvim/lua/keymaps/leaders.lua b/tools/nvim/lua/keymaps/leaders.lua
index 89823ff..edc603a 100644
--- a/tools/nvim/lua/keymaps/leaders.lua
+++ b/tools/nvim/lua/keymaps/leaders.lua
@@ -51,13 +51,31 @@ local leader_mappings = {
     { keys = "n", cmd = "<C-w>j", opts = { desc = "Down Window" } },
     { keys = "e", cmd = "<C-w>k", opts = { desc = "Up Window" } },
     { keys = "i", cmd = "<C-w>l", opts = { desc = "Right Window" } },
+    { keys = "F", cmd = ":NvimTreeFindFileToggle<CR>", opts = { desc = "Toggle File Explorer" } },
     { keys = "<Tab>", cmd = "<Cmd>b#<CR>", opts = { desc = "Switch to last buffer" } },
-    { keys = "!", cmd = ":FloatermToggle<CR>", opts = { desc = "" } },
+    { keys = "!", cmd = ":FloatermToggle<CR>", opts = { desc = "Toggle Terminal" } },
+    { keys = '"', cmd = ":!wezterm-gui &<CR>", pots = { desc = "Open External Terminal(wezterm)" } },
   },
   b = { -- +buffer
+    { keys = "0", cmd = "<Cmd>b#<CR>", opts = { desc = "Switch to last buffer" } },
+    { keys = "1", cmd = ":BufferLineGotoBuffer 1<CR>", opts = { desc = "Switch to Buffer #1" } },
+    { keys = "2", cmd = ":BufferLineGotoBuffer 2<CR>", opts = { desc = "Switch to Buffer #2" } },
+    { keys = "3", cmd = ":BufferLineGotoBuffer 3<CR>", opts = { desc = "Switch to Buffer #3" } },
+    { keys = "4", cmd = ":BufferLineGotoBuffer 4<CR>", opts = { desc = "Switch to Buffer #4" } },
+    { keys = "5", cmd = ":BufferLineGotoBuffer 5<CR>", opts = { desc = "Switch to Buffer #5" } },
+    { keys = "6", cmd = ":BufferLineGotoBuffer 6<CR>", opts = { desc = "Switch to Buffer #6" } },
+    { keys = "7", cmd = ":BufferLineGotoBuffer 7<CR>", opts = { desc = "Switch to Buffer #7" } },
+    { keys = "8", cmd = ":BufferLineGotoBuffer 8<CR>", opts = { desc = "Switch to Buffer #8" } },
+    { keys = "9", cmd = ":BufferLineGotoBuffer 9<CR>", opts = { desc = "Switch to Buffer #9" } },
     { keys = "a", cmd = ":Alpha<CR>", opts = { desc = "Dashboard" } },
-    { keys = "b", cmd = ":Telescope buffers<CR>", opts = { desc = "List Buffers" } },
+    { keys = "b", cmd = ":BufferLinePick<CR>", opts = { desc = "Quick Switch Buffers" } },
+    { keys = "B", cmd = ":Telescope buffers<CR>", opts = { desc = "List Buffers" } },
     { keys = "d", cmd = ":bdelete<CR>", opts = { desc = "Delete Buffer" } },
+    { keys = "D", cmd = ":BufferLineCloseOthers<CR>", opts = { desc = "Delete Other Buffers" } },
+    { keys = "xx", cmd = ":BufferLineCloseOthers<CR>", opts = { desc = "Delete Other Buffers" } },
+    { keys = "xh", cmd = ":BufferLineCloseLeft<CR>", opts = { desc = "Delete Buffers Left" } },
+    { keys = "xi", cmd = ":BufferLineCloseRight<CR>", opts = { desc = "Delete Buffers Right" } },
+    { keys = "X", cmd = ":BufferLineCloseOthers<CR>", opts = { desc = "Delete Other Buffers" } },
     { keys = "h", cmd = ":bprevious<CR>", opts = { desc = "Previous Buffer" } },
     { keys = "i", cmd = ":bnext<CR>", opts = { desc = "Next Buffer" } },
     { keys = "H", cmd = ":bfirst<CR>", opts = { desc = "First Buffer" } },
@@ -65,7 +83,9 @@ local leader_mappings = {
     { keys = "0", cmd = ":bfirst<CR>", opts = { desc = "First Buffer" } },
     { keys = "^", cmd = ":bfirst<CR>", opts = { desc = "First Buffer" } },
     { keys = "$", cmd = ":blast<CR>", opts = { desc = "Last Buffer" } },
-    -- { keys = "s", cmd = ":Telescope buffers<CR>", opts = { desc = "Search buffers" } },
+    { keys = "s", cmd = ":new<CR>", opts = { desc = "Scratch buffers" } },
+    { keys = "t", cmd = ":BufferLineTogglePin<CR>", opts = { desc = "Pin Buffer" } },
+    { keys = "y", cmd = ":%y+<CR>", opts = { desc = "Copy Buffer to Clipboard" } },
   },
   c = { -- +code/compile
     { keys = "r", cmd = ":RunCode<CR>", opts = { desc = "Run code" } },
@@ -76,15 +96,44 @@ local leader_mappings = {
   },
   f = { -- +file/find
     { keys = "f", cmd = ":Telescope fd<CR>", opts = { desc = "Find Files" } },
-    { keys = "s", cmd = ":Telescope live_grep<CR>", opts = { desc = "Grep Files" } },
+    { keys = "F", cmd = ":Telescope live_grep<CR>", opts = { desc = "Grep Files" } },
+    { keys = "l", cmd = ":set filetype=", opts = { desc = "Set Filetype to ..." } },
+    { keys = "n", cmd = ":new<CR>", opts = { desc = "New File" } },
+    { keys = "s", cmd = ":write<CR>", opts = { desc = "Save File" } },
+    { keys = "S", cmd = ":wall<CR>", opts = { desc = "Save All Files" } },
     { keys = "b", cmd = ":Telescope buffers<CR>", opts = { desc = "List Buffers" } },
-    { keys = "e", cmd = ":NvimTreeToggle<CR>", opts = { desc = "Toggle File Explorer" } },
-    { keys = "t", cmd = ":FloatermToggle<CR>", opts = { desc = "toggle visibility of the float terminal" } },
+    { keys = "D", cmd = "!trash-rm %<CR>", opts = { desc = "Delete current file" } },
+    { keys = "t", cmd = ":NvimTreeFindFileToggle<CR>", opts = { desc = "Toggle File Tree" } },
     { keys = "T", cmd = ":FloatermNew<CR>", opts = { desc = "Spawn a float terminal" } },
     { keys = "h", cmd = ":Telescope oldfiles<CR>", opts = { desc = "Search history files" } },
     { keys = "c", cmd = ":Telescope find_files cwd=~/.config/nvim<CR>", opts = { desc = "Search Config" } },
-    { keys = "o", cmd = ":!open %", opts = { desc = "Open file in default program" } },
+    { keys = "o", cmd = ":!open %<CR>", opts = { desc = "Open file in default program" } },
     { keys = "R", cmd = renameCurrentBuffer, opts = { desc = "Rename current file" } },
+    { keys = "x", cmd = ":Lazy<CR>", opts = { desc = "Open extension view" } },
+    { keys = "yy", cmd = ":let @+ = expand('%:p')<CR>", opts = { desc = "Copy file path" } },
+    { keys = "yY", cmd = ":let @+ = expand('%')<CR>", opts = { desc = "Copy relative file path" } },
+    { keys = "yn", cmd = ":let @+ = expand('%:t')<CR>", opts = { desc = "Copy file name" } },
+    { keys = "yN", cmd = ":let @+ = expand('%:t:r')<CR>", opts = { desc = "Copy file name without extension" } },
+    { keys = "yd", cmd = ":let @+ = expand('%:p:h')<CR>", opts = { desc = "Copy directory path" } },
+    {
+      keys = "yl",
+      cmd = ":let @+ = expand('%:p') . ':' . line('.')<CR>",
+      opts = { desc = "Copy file path with line number" },
+    },
+    {
+      keys = "yL",
+      cmd = ":let @+ = expand('%') . ':' . line('.')<CR>",
+      opts = { desc = "Copy relative file path with line number" },
+    },
+  },
+  g = { -- +git/version control
+    { keys = "g", cmd = ":LazyGit<CR>", opts = { desc = "Toggle LazyGit" } },
+    { keys = "c", cmd = ":Telescope git_commits<CR>", opts = { desc = "Show commits" } },
+    { keys = "b", cmd = ":Gitsigns blame<CR>", opts = { desc = "Blame file" } },
+    { keys = "d", cmd = ":Gitsigns diffthis<CR>", opts = { desc = "Diff file" } },
+    { keys = "B", cmd = ":Gitsigns toggle_current_line_blame<CR>", opts = { desc = "Toggle line blame" } },
+    { keys = "s", cmd = ":Telescope git_status<CR>", opts = { desc = "Git Status" } },
+    { keys = "t", cmd = ":Telescope git_branches<CR>", opts = { desc = "Git Branches" } },
   },
   p = { -- +project
     { keys = "p", cmd = ":Telescope projects<CR>", opts = { desc = "List all Projects" } },
@@ -97,30 +146,35 @@ local leader_mappings = {
     { keys = "w", cmd = ":wq<CR>", opts = { desc = "Write and Quit" } },
     { keys = "W", cmd = ":wall<CR>:qa!<CR>", opts = { desc = "Write all and Force Quit" } },
   },
-  t = { -- +toggle
+  t = { -- +toggle/test
     { keys = "f", cmd = ":NvimTreeToggle", opts = { desc = "Toggle File Explorer" } },
     { keys = "F", cmd = ":FormatToggle<CR>", opts = { desc = "Toggle autoformat-on-save" } },
     { keys = "t", cmd = ":FloatermToggle<CR>", opts = { desc = "toggle visibility of the float terminal" } },
   },
   u = { -- +ui
     { keys = "i", cmd = ":Telescope colorscheme<CR>", opts = { desc = "Change colorscheme" } },
+    { keys = " ", cmd = ":set list!", opts = { desc = "Toggle show all symbols" } },
   },
   w = { -- +window
     { keys = "h", cmd = "<C-w>h", opts = { desc = "Left Window" } },
     { keys = "n", cmd = "<C-w>j", opts = { desc = "Down Window" } },
     { keys = "e", cmd = "<C-w>k", opts = { desc = "Up Window" } },
     { keys = "i", cmd = "<C-w>l", opts = { desc = "Right Window" } },
+    { keys = "H", cmd = "<C-w>H", opts = { desc = "Move Window Left" } },
+    { keys = "N", cmd = "<C-w>J", opts = { desc = "Move Window Down" } },
+    { keys = "E", cmd = "<C-w>K", opts = { desc = "Move Window Up" } },
+    { keys = "I", cmd = "<C-w>L", opts = { desc = "Move Window Right" } },
     { keys = "-", cmd = ":split<CR>", opts = { desc = "Split to down" } },
     { keys = "|", cmd = ":vsplit<CR>", opts = { desc = "Split to right" } },
-    { keys = "c", cmd = "<C-w>c", opts = { desc = "Close Window" } },
-    { keys = "o", cmd = "<C-w>o", opts = { desc = "Close Other Windows" } },
+    { keys = "/", cmd = ":vsplit<CR>", opts = { desc = "Split to right" } },
+    { keys = "d", cmd = "<C-w>c", opts = { desc = "Close Window" } },
+    { keys = "D", cmd = "<C-w>o", opts = { desc = "Close Other Windows" } },
     { keys = "r", cmd = "<C-w>r", opts = { desc = "Rotate Windows" } },
     { keys = "R", cmd = "<C-w>R", opts = { desc = "Reverse Rotate Windows" } },
     { keys = "t", cmd = "<C-w>T", opts = { desc = "Move Window to New Tab" } },
-    { keys = "H", cmd = ":vertical resize -5<CR>", opts = { desc = "Decrease Window Height" } },
-    { keys = "N", cmd = ":resize +5<CR>", opts = { desc = "Increase Window Height" } },
-    { keys = "E", cmd = ":vertical resize +5<CR>", opts = { desc = "Increase Window Width" } },
-    { keys = "I", cmd = ":resize -5<CR>", opts = { desc = "Decrease Window Width" } },
+    { keys = "]", cmd = ":resize +5<CR>", opts = { desc = "Increase Window Size" } },
+    { keys = "[", cmd = ":resize -5<CR>", opts = { desc = "Decrease Window Size" } },
+    { keys = "M", cmd = ":resize<CR>:vertical resize<CR>", opts = { desc = "Maximize window size" } },
   },
 }