diff --git a/modules/nix/nvim/cmp.nix b/modules/nix/nvim/cmp.nix
index 10bd699..88dd88e 100644
--- a/modules/nix/nvim/cmp.nix
+++ b/modules/nix/nvim/cmp.nix
@@ -7,40 +7,13 @@
 		cmp = {
 			enable = true;
       		autoEnableSources = true;
-      		settings = {
+			settings = {
 				sources = [
 					{name = "nvim_lsp";}
 					{name = "path";}
 					{name = "buffer";}
 					{name = "luasnip";}
       			];
-      			
-
-				mapping = {
-					__raw = ''
-						"<Tab>" = cmp.mapping(function(fallback)
-							if cmp.visible() then
-					  			cmp.select_next_item()
-							else
-								fallback()
-							end
-				  		end, { "i", "s" });
-
-				  		"<S-Tab>" = cmp.mapping(function(fallback)
-							if cmp.visible() then
-					  			cmp.select_prev_item()
-							else
-					  			fallback()
-							end
-				  		end, { "i", "s" });
-					'';
-				  "<C-b>" = "cmp.mapping.scroll_docs(-4)";
-				  "<C-f>" = "cmp.mapping.scroll_docs(4)";
-				  "<C-Space>" = "cmp.mapping.complete()";
-				  "<C-e>" = "cmp.mapping.abort()";
-				  "<C-Left>" = "cmp.mapping.abort()";
-				  "<CR>" = "cmp.mapping.confirm({ select = false })";
-				};
 			};
 		};
 	};
diff --git a/modules/nix/nvim/default.nix b/modules/nix/nvim/default.nix
index ef67bb5..a769b2a 100644
--- a/modules/nix/nvim/default.nix
+++ b/modules/nix/nvim/default.nix
@@ -8,7 +8,34 @@
     programs.nixvim = {
         enable = true;
         colorschemes.oxocarbon.enable = true;
-        plugins = {
+        extraConfigLua = ''
+			mapping = cmp.mapping.preset.insert({
+				["<Tab>"] = cmp.mapping(function(fallback)
+					if cmp.visible() then
+						cmp.select_next_item()
+					else
+						fallback()
+					end
+				end, { "i", "s" }),
+
+				["<S-Tab>"] = cmp.mapping(function(fallback)
+					if cmp.visible() then
+						cmp.select_prev_item()
+					else
+						fallback()
+					end
+				end, { "i", "s" }),
+
+				["<C-b>"] = cmp.mapping.scroll_docs(-4),
+				["<C-f>"] = cmp.mapping.scroll_docs(4),
+				["<C-Space>"] = cmp.mapping.complete(),
+				["<C-e>"] = cmp.mapping.abort(),
+				["<C-Left>"] = cmp.mapping.abort(),
+				["<CR>"] = cmp.mapping.confirm({ select = false }),
+			}),
+		'';
+
+		plugins = {
             lualine = {
                 enable = true;
             };