From 347a04b62e6fa57323e7b7fe3b1ff8d40624f3ec Mon Sep 17 00:00:00 2001
From: Ching Pei Yang <badnam3o.0@gmail.com>
Date: Sun, 3 Nov 2024 18:02:50 +0100
Subject: [PATCH] cmp: deduplicate attr key

---
 .../plugins/completion/nvim-cmp/config.nix    | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/modules/plugins/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix
index 27d0bfb..4d4c257 100644
--- a/modules/plugins/completion/nvim-cmp/config.nix
+++ b/modules/plugins/completion/nvim-cmp/config.nix
@@ -74,50 +74,50 @@ in {
           };
 
           formatting.format = cfg.format;
-        };
 
-        # `cmp` and `luasnip` are defined above, in the `nvim-cmp` section
-        setupOpts.mapping = {
-          ${mappings.complete} = mkLuaInline "cmp.mapping.complete()";
-          ${mappings.close} = mkLuaInline "cmp.mapping.abort()";
-          ${mappings.scrollDocsUp} = mkLuaInline "cmp.mapping.scroll_docs(-4)";
-          ${mappings.scrollDocsDown} = mkLuaInline "cmp.mapping.scroll_docs(4)";
-          ${mappings.confirm} = mkLuaInline "cmp.mapping.confirm({ select = true })";
+          # `cmp` and `luasnip` are defined above, in the `nvim-cmp` section
+          mapping = {
+            ${mappings.complete} = mkLuaInline "cmp.mapping.complete()";
+            ${mappings.close} = mkLuaInline "cmp.mapping.abort()";
+            ${mappings.scrollDocsUp} = mkLuaInline "cmp.mapping.scroll_docs(-4)";
+            ${mappings.scrollDocsDown} = mkLuaInline "cmp.mapping.scroll_docs(4)";
+            ${mappings.confirm} = mkLuaInline "cmp.mapping.confirm({ select = true })";
 
-          ${mappings.next} = mkLuaInline ''
-            cmp.mapping(function(fallback)
-              local has_words_before = function()
-                local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-                return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-              end
+            ${mappings.next} = mkLuaInline ''
+              cmp.mapping(function(fallback)
+                local has_words_before = function()
+                  local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+                  return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
+                end
 
-              if cmp.visible() then
-                cmp.select_next_item()
-                ${optionalString luasnipEnable ''
-              elseif luasnip.locally_jumpable(1) then
-                luasnip.jump(1)
-            ''}
-              elseif has_words_before() then
-                cmp.complete()
-              else
-                fallback()
-              end
-            end)
-          '';
+                if cmp.visible() then
+                  cmp.select_next_item()
+                  ${optionalString luasnipEnable ''
+                elseif luasnip.locally_jumpable(1) then
+                  luasnip.jump(1)
+              ''}
+                elseif has_words_before() then
+                  cmp.complete()
+                else
+                  fallback()
+                end
+              end)
+            '';
 
-          ${mappings.previous} = mkLuaInline ''
-            cmp.mapping(function(fallback)
-              if cmp.visible() then
-                cmp.select_prev_item()
-                ${optionalString luasnipEnable ''
-              elseif luasnip.locally_jumpable(-1) then
-                luasnip.jump(-1)
-            ''}
-              else
-                fallback()
-              end
-            end)
-          '';
+            ${mappings.previous} = mkLuaInline ''
+              cmp.mapping(function(fallback)
+                if cmp.visible() then
+                  cmp.select_prev_item()
+                  ${optionalString luasnipEnable ''
+                elseif luasnip.locally_jumpable(-1) then
+                  luasnip.jump(-1)
+              ''}
+                else
+                  fallback()
+                end
+              end)
+            '';
+          };
         };
       };
     };