diff --git a/modules/editors/neovim/default.nix b/modules/editors/neovim/default.nix
index 1e1b9e2..3525d87 100644
--- a/modules/editors/neovim/default.nix
+++ b/modules/editors/neovim/default.nix
@@ -27,6 +27,12 @@ in {
         splitbelow = true;
         splitright = true;
         undofile = true;
+        updatetime = 100;
+      };
+
+      globals = {
+        mapleader = ",";
+        maplocalleader = ",";
       };
 
       clipboard = {
@@ -74,6 +80,11 @@ in {
           { name = "path"; }
           { name = "buffer"; }
         ];
+        mapping = {
+          "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+          "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+          "<CR>" = "cmp.mapping.confirm({ select = true })";
+        };
       };
 
       plugins.telescope = {
@@ -102,6 +113,7 @@ in {
         enable = true;
         highlightDefinitions = {
           enable = true;
+          clearOnCursorMove = false;
         };
       };