modules/plugins/autopairs/nvim-autopairs/config.nix

@@ -4,6 +4,7 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
+  inherit (lib.strings) optionalString;
   inherit (lib.nvim.dag) entryAnywhere;
   inherit (lib.nvim.lua) toLuaObject;
 
@@ -13,7 +14,7 @@ in {
     vim.startPlugins = ["nvim-autopairs"];
 
     vim.luaConfigRC.autopairs = entryAnywhere ''
-      require("nvim-autopairs").setup({ map_cr = ${toLuaObject (!config.vim.autocomplete.enable)} })
+      require("nvim-autopairs").setup{}
     '';
   };
 }

modules/plugins/completion/nvim-cmp/config.nix

@@ -61,19 +61,15 @@ in {
       (mkSetLuaBinding mappings.complete ''
         require('cmp').complete
       '')
-      (let
+      (mkSetLuaBinding mappings.confirm ''
-        defaultKeys =
+        function()
-          if config.vim.autopairs.enable
+          if not require('cmp').confirm({ select = true }) then
-          then "require('nvim-autopairs').autopairs_cr()"
+            local termcode = vim.api.nvim_replace_termcodes(${toJSON mappings.confirm.value}, true, false, true)
-          else "vim.api.nvim_replace_termcodes(${toJSON mappings.confirm.value}, true, false, true)";
+
-      in
+            vim.fn.feedkeys(termcode, 'n')
-        mkSetLuaBinding mappings.confirm ''
-          function()
-            if not require('cmp').confirm({ select = true }) then
-              vim.fn.feedkeys(${defaultKeys}, 'n')
-            end
           end
-        '')
+        end
+      '')
       (mkSetLuaBinding mappings.next ''
         function()
           local has_words_before = function()