From 673acfe7963d44a4898c2a6ac50a6e52400c00cd Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:26:23 -0500
Subject: [PATCH] update init

---
 init.lua                           | 52 ++----------------------------
 lua/custom/plugins/copilot-cmp.lua |  4 +++
 lua/custom/plugins/copilot.lua     |  4 +++
 3 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/init.lua b/init.lua
index 4a1283b4..029976d6 100644
--- a/init.lua
+++ b/init.lua
@@ -188,55 +188,9 @@ require('lazy').setup({
   { -- Useful plugin to show you pending keybinds.
     'folke/which-key.nvim',
     event = 'VimEnter', -- Sets the loading event to 'VimEnter'
-    opts = {
-      icons = {
-        -- set icon mappings to true if you have a Nerd Font
-        mappings = vim.g.have_nerd_font,
-        -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
-        -- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
-        keys = vim.g.have_nerd_font and {} or {
-          Up = '<Up> ',
-          Down = '<Down> ',
-          Left = '<Left> ',
-          Right = '<Right> ',
-          C = '<C-…> ',
-          M = '<M-…> ',
-          D = '<D-…> ',
-          S = '<S-…> ',
-          CR = '<CR> ',
-          Esc = '<Esc> ',
-          ScrollWheelDown = '<ScrollWheelDown> ',
-          ScrollWheelUp = '<ScrollWheelUp> ',
-          NL = '<NL> ',
-          BS = '<BS> ',
-          Space = '<Space> ',
-          Tab = '<Tab> ',
-          F1 = '<F1>',
-          F2 = '<F2>',
-          F3 = '<F3>',
-          F4 = '<F4>',
-          F5 = '<F5>',
-          F6 = '<F6>',
-          F7 = '<F7>',
-          F8 = '<F8>',
-          F9 = '<F9>',
-          F10 = '<F10>',
-          F11 = '<F11>',
-          F12 = '<F12>',
-        },
-      },
-
-      -- Document existing key chains
-      spec = {
-        { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
-        { '<leader>d', group = '[D]ocument' },
-        { '<leader>r', group = '[R]ename' },
-        { '<leader>s', group = '[S]earch' },
-        { '<leader>w', group = '[W]orkspace' },
-        { '<leader>t', group = '[T]oggle' },
-        { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
-      },
-    },
+    config = function() -- This is the function that runs, AFTER loading
+      require('which-key').setup()
+    end,
   },
 
   -- NOTE: Plugins can specify dependencies.
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index 560f181a..983da19c 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -7,9 +7,13 @@ return {
     require('copilot_cmp').setup()
   end,
   opts = {
+<<<<<<< HEAD
     filetypes = {
       ['.'] = false,
       go = true,
     },
+=======
+    filetypes = { ['.'] = false },
+>>>>>>> 605d213 (disable copilot)
   },
 }
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
index ca5fa63c..6fbac8a3 100644
--- a/lua/custom/plugins/copilot.lua
+++ b/lua/custom/plugins/copilot.lua
@@ -6,5 +6,9 @@ return {
   opts = {
     suggestion = { enabled = false },
     panel = { enabled = false },
+    filetypes = {
+      ['.'] = false,
+      go = true,
+    },
   },
 }