diff --git a/home-manager/common/software/cli/nixvim-base.nix b/home-manager/common/software/cli/nixvim-base.nix
index e64ffee1..019a44d3 100644
--- a/home-manager/common/software/cli/nixvim-base.nix
+++ b/home-manager/common/software/cli/nixvim-base.nix
@@ -43,31 +43,31 @@
 
             # Normal Mode
             # NVimTree
-            (nmap "<leader>n" "<Nop>" // desc "[N]vimTree" // silent)
+            (nmap "<leader>n" "<Nop>" // desc "[N]vimTree")
             (nmap "<leader>nf" ":NvimTreeFocus<CR>"    // desc "[F]ocus NvimTree")
             (nmap "<leader>nt" ":NvimTreeToggle<CR>"   // desc "[T]oggle NvimTree")
             (nmap "<leader>ns" ":NvimTreeFindFile<CR>" // desc "[S]earch NvimTree")
             (nmap "<leader>nc" ":NvimTreeClose<CR>"    // desc "[C]lose NvimTree")
             # ToggleTerm
-            (nmap "<leader>t" "<Nop>" // desc "[T]oggleTerm" // silent)
+            (nmap "<leader>t" "<Nop>" // desc "[T]oggleTerm")
             (nmap "<leader>tt" ":ToggleTerm<CR>" // desc "[T]oggle Terminal")
             # Fugitive
             (nmap "<leader>gc" ":Git commit -a<CR>" // desc "[C]ommit" )
             (nmap "<leader>gp" ":Git push<CR>" // desc "[P]ush")
             # Window Management
-            (nmap "<leader>wh"  ":wincmd h" // desc "Move left")
-            (nmap "<leader>wl"  ":wincmd l" // desc "Move right")
-            (nmap "<leader>wj"  ":wincmd j" // desc "Move down")
-            (nmap "<leader>wk"  ":wincmd k" // desc "Move up")
-            (nmap "<leader>wp"  ":wincmd p" // desc "Move to [p]revious")
-            (nmap "<leader>wp"  ":wincmd n" // desc "Move to [n]ext")
-            (nmap "<leader>wc"  ":wincmd c" // desc "[C]lose active window")
-            (nmap "<leader>ww"  ":wincmd w" // desc "Switch [w]indows")
-            (nmap "<leader>wnh" ":wincmd n" // desc "[N]ew [H]orizontal window")
-            (nmap "<leader>wnv" ":wincmd v" // desc "[N]ew [V]ertical window")
+            (nmap "<leader>wh"  ":wincmd h<CR>" // desc "Move left")
+            (nmap "<leader>wl"  ":wincmd l<CR>" // desc "Move right")
+            (nmap "<leader>wj"  ":wincmd j<CR>" // desc "Move down")
+            (nmap "<leader>wk"  ":wincmd k<CR>" // desc "Move up")
+            (nmap "<leader>wp"  ":wincmd p<CR>" // desc "Move to [p]revious")
+            (nmap "<leader>wp"  ":wincmd n<CR>" // desc "Move to [n]ext")
+            (nmap "<leader>wc"  ":wincmd c<CR>" // desc "[C]lose active window")
+            (nmap "<leader>ww"  ":wincmd w<CR>" // desc "Switch [w]indows")
+            (nmap "<leader>wnh" ":wincmd n<CR>" // desc "[N]ew [H]orizontal window")
+            (nmap "<leader>wnv" ":wincmd v<CR>" // desc "[N]ew [V]ertical window")
             # Buffer Management
-            (nmap "<leader>bn" ":bnext" // desc "Next buffer")
-            (nmap "<leader>bp" ":bNext" // desc "Previous buffer")
+            (nmap "<leader>bn" ":bnext<CR>" // desc "Next buffer")
+            (nmap "<leader>bp" ":bNext<CR>" // desc "Previous buffer")
         ];
 
         options = {