Neovim is looking sick now

config/dot/nvim/lua/plugins/lsp.lua

@@ -38,8 +38,8 @@ return {
           }, {
             { name = 'buffer' },
             { name = 'luasnip_choice' },
-            --{ name = 'copilot' },
-            --{ name = 'supermaven' },
+            { name = 'copilot' },
+            { name = 'supermaven' },
             { name = 'nvim_lsp_document_symbol' },
             { name = 'nvim_lsp_signature_help' },
             { name = 'nvim_lua' },
@@ -69,9 +69,10 @@ return {
                 menu = 50,
                 abbr = 50,
               },
-              --symbol_map = {
-                --Supermaven = '',
-              --},
+              symbol_map = {
+                Supermaven = '',
+                Copilot = '',
+              },
               ellipsis_char = '...',
               show_labelDetails = true,
               before = function(entry, vim_item)
@@ -145,7 +146,13 @@ return {
     { 'hrsh7th/cmp-nvim-lua' },
     { 'hrsh7th/cmp-nvim-lsp-signature-help' },
     { 'hrsh7th/cmp-path' },
-    { 'hrsh7th/cmp-copilot' },
+    --{ 'hrsh7th/cmp-copilot' },
+    {
+      'zbirenbaum/copilot-cmp',
+      config = function ()
+        require'copilot_cmp'.setup()
+      end
+    },
     { 'hrsh7th/cmp-buffer' },
     { 'hrsh7th/cmp-emoji' },
     { 'chrisgrieser/cmp-nerdfont' },
@@ -225,25 +232,66 @@ return {
       version = 'v2.*',
       build = 'make install_jsregexp'
     },
+    --{ 'github/copilot.vim' },
     {
-      'github/copilot.vim',
-      --config = function ()
-        --vim.g.copilot_no_tab_map = true
-      --end
+      "zbirenbaum/copilot.lua",
+      requires = {
+        'copilotlsp-nvim/copilot-lsp',
+      },
+      cmd = 'Copilot',
+      event = 'InsertEnter',
+      config = function()
+        require'copilot'.setup({
+          --copilot_model = "",
+          --nes = {
+            --enabled = true,
+            --keymap = {
+              --accept_and_goto = '<leader>,',
+              --accept = false,
+              --dismiss = 'Esc',
+            --},
+          --},
+        })
+      end,
     },
     --{
-      --'supermaven-inc/supermaven-nvim',
-      --config = function()
-        --require'supermaven-nvim'.setup({
-          --keymaps = {
-            --accept_suggestion = '<Tab>',
-            --clear_suggestion = '<C-]>',
-            --accept_word = '<C-.>',
-          --},
-          --disable_inline_completion = true,
-        --})
+      --"copilotlsp-nvim/copilot-lsp",
+      --init = function()
+          --vim.g.copilot_nes_debounce = 500
+          --vim.lsp.enable("copilot_ls")
+          --vim.keymap.set("n", "<tab>", function()
+              --local bufnr = vim.api.nvim_get_current_buf()
+              --local state = vim.b[bufnr].nes_state
+              --if state then
+                  ---- Try to jump to the start of the suggestion edit.
+                  ---- If already at the start, then apply the pending suggestion and jump to the end of the edit.
+                  --local _ = require("copilot-lsp.nes").walk_cursor_start_edit()
+                      --or (
+                          --require("copilot-lsp.nes").apply_pending_nes()
+                          --and require("copilot-lsp.nes").walk_cursor_end_edit()
+                      --)
+                  --return nil
+              --else
+                  ---- Resolving the terminal's inability to distinguish between `TAB` and `<C-i>` in normal mode
+                  --return "<C-i>"
+              --end
+          --end, { desc = "Accept Copilot NES suggestion", expr = true })
       --end,
     --},
+    { 'AndreM222/copilot-lualine' },
+    {
+      'supermaven-inc/supermaven-nvim',
+      config = function()
+        require'supermaven-nvim'.setup({
+          keymaps = {
+            accept_suggestion = '<Tab>',
+            clear_suggestion = '<C-]>',
+            accept_word = '<C-.>',
+          },
+          disable_inline_completion = true,
+        })
+      end,
+    },
     {
       'windwp/nvim-autopairs',
       event = 'InsertEnter',
@@ -289,6 +337,13 @@ return {
     )
     local cmp_autopairs = require'nvim-autopairs.completion.cmp'
     cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+    cmp.event:on("menu_opened", function()
+      vim.b.copilot_suggestion_hidden = true
+    end)
+
+    cmp.event:on("menu_closed", function()
+      vim.b.copilot_suggestion_hidden = false
+    end)
     require 'mason-lspconfig'.setup({
       ensure_installed = {
         'angularls',