diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 1ba1752b..f6e182d8 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -42,14 +42,13 @@
             # Insert Mode
 
             # Normal Mode
-                # NVimTree
+            # NVimTree
             (nmap "<leader>n" "<Nop>" // desc "[N]vimTree" // silent)
-            (nmap "<leader>nf" ":NvimTreeFocus<CR>"// desc "[F]ocus NvimTree")
-            (nmap "<leader>nt" ":NvimTreeToggle<CR>" // desc "[T]oggle NvimTree")
-            (nmap "<leader>ns" ":NvimTreeToggle<CR>" // desc "[S]earch NvimTree")
-            (nmap "<leader>nc" ":NvimTreeClose<CR>" // desc "[C]lose NvimTree")
-
-                # ToggleTerm
+            (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>tt" ":ToggleTerm<CR>" // desc "[T]oggle Terminal")
         ];
@@ -146,6 +145,27 @@
             nvim-cmp = {
                 enable = true;
                 autoEnableSources = true;
+                mapping = {
+                    "<CR>" = "cmp.mapping.autocomplete()";
+                    "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+                    "<C-e>" = "cmp.mapping.close()";
+                    "<C-f>" = "cmp.mapping.scroll_docs(4)";
+                    "<CR>" = "cmp.mapping.confirm({ select = true })";
+                    "<S-Tab>" = {
+                        action = "cmp.mapping.select_prev_item()";
+                        modes = [
+                        "i"
+                        "s"
+                        ];
+                    };
+                    "<Tab>" = {
+                        action = "cmp.mapping.select_next_item()";
+                        modes = [
+                        "i"
+                        "s"
+                        ];
+                    };
+                };
                 sources = [
                     { name = "nvim_lua"; }
                     { name = "nvim_lsp"; }