diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua
index f129647f..84299fef 100644
--- a/.config/nvim/lua/plugins/blink.lua
+++ b/.config/nvim/lua/plugins/blink.lua
@@ -36,9 +36,9 @@ return {
           -- enabled = false,
         },
       },
-      sources = {
-        default = { "lsp", "path", "snippets", "buffer" },
-      },
+      -- sources = {
+      --   default = { "lsp", "path", "snippets", "buffer" },
+      -- },
 
       keymap = {
         preset = "default",
diff --git a/.config/nvim/lua/plugins/copilot.lua b/.config/nvim/lua/plugins/copilot.lua
index a92fd299..2a17792f 100644
--- a/.config/nvim/lua/plugins/copilot.lua
+++ b/.config/nvim/lua/plugins/copilot.lua
@@ -1,40 +1,36 @@
 local chat_opts = {
   auto_insert_mode = false,
-  question_header = "  Fic",
+  question_header = "  Me ",
   answer_header = "  Copilot ",
   window = {
     width = 0.4,
   },
 }
 return {
-  {
-    "zbirenbaum/copilot-cmp",
-    enabled = false,
-    opts = function()
-      -- require("copilot.command").disable()
-      -- local cptoggle = Snacks.toggle.new({
-      --   name = "Copilot",
-      --   -- map = vim.keymap.set,
-      --   which_key = true,
-      --   get = function()
-      --     return not require("copilot.client").is_disabled()
-      --   end,
-      --   notify = true,
-      --   set = function(state)
-      --     if state then
-      --       require("copilot.command").enable()
-      --     else
-      --       require("copilot.command").disable()
-      --     end
-      --   end,
-      -- })
-      -- Snacks.toggle.map(cptoggle, "<leader>at", { desc = "Toggle Copilot" })
-    end,
-  },
   {
     "CopilotC-Nvim/CopilotChat.nvim",
+    dependencies = {
+      {
+        "zbirenbaum/copilot.lua",
+        cmd = "Copilot",
+        build = ":Copilot auth",
+        -- event = "Buf",
+        lazy = true,
+        opts = {
+          suggestion = {
+            enabled = false,
+          },
+          panel = { enabled = false },
+          filetypes = {
+            markdown = true,
+            help = true,
+          },
+        },
+      },
+    },
     branch = "main",
     cmd = "CopilotChat",
+    opts = chat_opts,
     keys = {
       { "<c-s>", "<CR>", ft = "copilot-chat", desc = "Submit Prompt", remap = true },
       { "<leader>a", "", desc = "+ai", mode = { "n", "v" } },
@@ -66,38 +62,25 @@ return {
         mode = { "n", "v" },
       },
       -- Show prompts actions with telescope
-      -- { "<leader>ap", M.pick("prompt"), desc = "Prompt Actions (CopilotChat)", mode = { "n", "v" } },
-      config = function()
-        local chat = require("CopilotChat")
-
-        vim.api.nvim_create_autocmd("BufEnter", {
-          pattern = "copilot-chat",
-          callback = function()
-            vim.opt_local.relativenumber = false
-            vim.opt_local.number = false
-            vim.opt_local.spell = false
-          end,
-        })
-
-        chat.setup(chat_opts)
-      end,
-    },
-  },
-  {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
-    build = ":Copilot auth",
-    -- event = "Buf",
-    lazy = true,
-    opts = {
-      suggestion = {
-        enabled = false,
-      },
-      panel = { enabled = false },
-      filetypes = {
-        markdown = true,
-        help = true,
-      },
+      -- CURRENTLY BROKEN!!!!!!!!
+      -- {
+      --   "<leader>ap",
+      --   require("CopilotChat").pick("prompt"),
+      --   desc = "Prompt Actions (CopilotChat)",
+      --   mode = { "n", "v" },
+      -- },
     },
+    config = function(_, opts)
+      local chat = require("CopilotChat")
+      vim.api.nvim_create_autocmd("BufEnter", {
+        pattern = "copilot-chat",
+        callback = function()
+          vim.opt_local.relativenumber = false
+          vim.opt_local.number = false
+          vim.opt_local.spell = false
+        end,
+      })
+      chat.setup(opts)
+    end,
   },
 }