diff --git a/home-manager/common/software/cli/nixvim-base.nix b/home-manager/common/software/cli/nixvim-base.nix
index d492ae38..5b9072cc 100644
--- a/home-manager/common/software/cli/nixvim-base.nix
+++ b/home-manager/common/software/cli/nixvim-base.nix
@@ -27,7 +27,7 @@
       map = mode: key: action: { mode = mode; key = key; action = action; };
       nmap = key: action: map [ "n" ] key action;
       nvmap = key: action: map [ "n" "v" ] key action;
-      imap = key: action: map [ "i" ] key action;
+      # imap = key: action: map [ "i" ] key action;
       desc = d: { options.desc = d; };
       silent = { options.silent = true; };
       expr = { options.expr = true; };
@@ -123,6 +123,11 @@
       trouble.enable = true;
       # Indentation guides 
       indent-blankline.enable = true;
+      # cmp
+      cmp-buffer.enable = true;
+      cmp-path.enable = true;
+      cmp-nvim-lsp.enable = true;
+      
 
       # Popup to show shortcuts
       which-key = {
@@ -219,7 +224,7 @@
         };
         sources = [
           { name = "nvim_lua"; }
-          { name = "nvim_lsp"; }
+          { name = "nvim_llsp"; }
           { name = "path";   }
           { name = "buffer";   }
         ];
diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index 8f7a5e34..ecf0a81f 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -26,6 +26,7 @@
                   fuzzy = true;
                 };
                 pylint.enabled = true;
+                pylsp_mypy.enabled = true;
               };
             };
           };