From 31701d2a3cec2f9cba10c81f7996eb4b04968856 Mon Sep 17 00:00:00 2001
From: Miguel Palhas <mpalhas@gmail.com>
Date: Mon, 28 Oct 2024 16:14:14 +0000
Subject: [PATCH] supermaven

---
 lazy-lock.json               | 18 ++++++++++--------
 lua/configs/cmp.lua          | 16 ++++++++++++++--
 lua/options.lua              |  1 +
 lua/plugins/autocomplete.lua | 17 ++++++++++++++++-
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index b94e720..c2ae7f1 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -8,41 +8,43 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "5fbea7d7043bae2499d643c97b407f6da44abff4" },
+  "conform.nvim": { "branch": "master", "commit": "278376b953bcab65e2ab9508b5575d1f9a2cbac1" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
-  "fzf-lua": { "branch": "main", "commit": "fc0f2b5781587d388b743c2c114127a7036d1a31" },
+  "fzf-lua": { "branch": "main", "commit": "052491ee887b04e231787515a81aa3f358a68147" },
   "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" },
   "hardtime.nvim": { "branch": "main", "commit": "027d6f991927a71bd510a7673ae5bb404ca2a1c7" },
   "hop.nvim": { "branch": "master", "commit": "08ddca799089ab96a6d1763db0b8adc5320bf050" },
   "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
   "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
   "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" },
+  "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "menu": { "branch": "main", "commit": "ee85b2e394fde354bd24e35ff7a688d10c9212fa" },
   "mini.pick": { "branch": "main", "commit": "b7ee06ca0b692023d87a17ba855012047c6bec6f" },
   "minty": { "branch": "main", "commit": "157e91c04cce2f01643519338d6b854275a77547" },
-  "neogit": { "branch": "master", "commit": "5e51097f964c01bc457f3a0f6fb7287d6782c04e" },
+  "neogit": { "branch": "master", "commit": "20f84056c8ae570cc2997b80ec85afa17eae1b2b" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
   "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
   "nvim-lsp-endhints": { "branch": "main", "commit": "391ef40521b631a8a2fb7aef78db6967ead6b39d" },
-  "nvim-lspconfig": { "branch": "master", "commit": "edd9591199d1c78c0cb20514231f7f936f9412a2" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4ae8ea049034a4f1b95b3e671ab9d35c16eeafb9" },
   "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" },
-  "nvim-tree.lua": { "branch": "master", "commit": "2a268f631da85e83b7a95291be589bcddfc785d8" },
-  "nvim-treesitter": { "branch": "master", "commit": "377039daa260b71f304c881d1b21d643c501a261" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" },
+  "nvim-tree.lua": { "branch": "master", "commit": "8760d76c1d316aa46f141f3f2b80b853a2acc41e" },
+  "nvim-treesitter": { "branch": "master", "commit": "48fc5d1dfe3dded8028826dfee7526e26212c73b" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
   "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "rustaceanvim": { "branch": "master", "commit": "6eb1c41463a0ad02a4fe799321cc7f651b87e576" },
   "statuscol.nvim": { "branch": "main", "commit": "5998d16044159ad3779f62c45e756c555e3051f0" },
+  "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
   "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" },
   "tint.nvim": { "branch": "master", "commit": "02bd0527a315a80e4e25bb2dd7b6994fb0daae01" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
   "typescript-tools.nvim": { "branch": "master", "commit": "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7" },
-  "ui": { "branch": "v3.0", "commit": "785bcbbf84eadcf3a831f9247577969e33c8f2ca" },
+  "ui": { "branch": "v3.0", "commit": "cfafe4aeb7b5d7ffde097d3d8df61289e33a6d51" },
   "vim-kitty": { "branch": "main", "commit": "9cc594a634308aa3bfaf3da5b5e741da1c0144c1" },
   "volt": { "branch": "main", "commit": "229b4f1bc865c866227dd0e2ecda11ab6ec2c8cc" },
   "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
diff --git a/lua/configs/cmp.lua b/lua/configs/cmp.lua
index eb97294..c6ecf66 100644
--- a/lua/configs/cmp.lua
+++ b/lua/configs/cmp.lua
@@ -1,13 +1,25 @@
+local lspkind = require "lspkind"
+
+local nvchad_options = require "nvchad.configs.cmp"
+
 local options = {
   sources = {
+    -- { name = "supermaven" },
     { name = "nvim_lsp" },
-    -- { name = "cmp_ai" },
     { name = "luasnip" },
     { name = "copilot" },
     { name = "buffer" },
     { name = "nvim_lua" },
     { name = "path" },
   },
+
+  formatting = {
+    format = lspkind.cmp_format {
+      mode = "symbol",
+      max_width = 50,
+      symbol_map = { Supermaven = "" },
+    },
+  },
 }
 
-return options
+return vim.tbl_deep_extend("force", nvchad_options, options)
diff --git a/lua/options.lua b/lua/options.lua
index 94e7120..71c5399 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -14,3 +14,4 @@ o.smartcase = true
 o.gdefault = true
 
 o.fillchars = "eob: ,diff: "
+o.scrolloff = 5
diff --git a/lua/plugins/autocomplete.lua b/lua/plugins/autocomplete.lua
index 8d0bda6..bb44056 100644
--- a/lua/plugins/autocomplete.lua
+++ b/lua/plugins/autocomplete.lua
@@ -2,10 +2,25 @@ return {
   {
     "hrsh7th/nvim-cmp",
     opts = function()
-      require "configs.cmp"
+      return require "configs.cmp"
     end,
   },
 
+  {
+    "supermaven-inc/supermaven-nvim",
+    event = "VeryLazy",
+    config = function()
+      require("supermaven-nvim").setup {
+        keymaps = {
+          accept_suggestion = "<C-Enter>",
+        },
+        -- disable_inline_completion = true,
+      }
+    end,
+  },
+
+  { "onsails/lspkind.nvim", event = "VeryLazy" },
+
   -- {
   -- 	"zbirenbaum/copilot.lua",
   -- 	cmd = "Copilot",