diff --git a/lazy-lock.json b/lazy-lock.json
index 6ccbde2..f55c427 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -7,6 +7,7 @@
   "blink.nvim": { "branch": "main", "commit": "d1e7c7c45d45c6b6a25427bf62db4db73b03ff3d" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "cmdhistory.nvim": { "branch": "master", "commit": "26d3fbbe53c00422be64afb24cc9228062740074" },
+  "copilot.vim": { "branch": "release", "commit": "206011a8bc5078a02560d5c44177e9849e8f8d6c" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "fzf-lua": { "branch": "main", "commit": "9a0704e8af8f8442110ff22a83b5608366b235df" },
@@ -14,6 +15,7 @@
   "glance.nvim": { "branch": "master", "commit": "bf86d8b79dce808e65fdb6e9269d0b4ed6d2eefc" },
   "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" },
   "haskell-mod.nvim": { "branch": "main", "commit": "f403618030ef9687e63eecfca7798e53b969f763" },
+  "hererocks": { "branch": "master", "commit": "1cefef350109770ffa39e064e0eae5c28a1f5455" },
   "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
@@ -22,6 +24,7 @@
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "7d527c76c43f46294de9c19d39c5a86317809b4b" },
   "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
+  "mcphub.nvim": { "branch": "main", "commit": "5193329d510a68f1f5bf189960642c925c177a3a" },
   "molten-nvim": { "branch": "main", "commit": "4fd7be6a12b5efda5179db642f13bad60893acca" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
   "neoconf.nvim": { "branch": "main", "commit": "3fdd84804c397059d4698fd8933f443058c4858e" },
@@ -39,6 +42,7 @@
   "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
   "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "sidekick.nvim": { "branch": "main", "commit": "c2bdf8cfcd87a6be5f8b84322c1b5052e78e302e" },
   "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
   "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
diff --git a/lua/plugins/copilot.lua b/lua/plugins/copilot.lua
new file mode 100644
index 0000000..8e490ed
--- /dev/null
+++ b/lua/plugins/copilot.lua
@@ -0,0 +1,3 @@
+return {
+    'github/copilot.vim',
+}
diff --git a/lua/plugins/mcp-hub.lua b/lua/plugins/mcp-hub.lua
new file mode 100644
index 0000000..083441a
--- /dev/null
+++ b/lua/plugins/mcp-hub.lua
@@ -0,0 +1,17 @@
+return {
+    "ravitemer/mcphub.nvim",
+    dependencies = {
+        "nvim-lua/plenary.nvim",
+    },
+    build = "pnpm install -g mcp-hub@latest", -- Installs `mcp-hub` node binary globally
+    opts = {
+        extensions = {
+            copilotchat = {
+                enabled = true,
+                convert_tools_to_functions = true,
+                convert_resources_to_functions = true,
+                add_mcp_prefix = false,
+            }
+        }
+    },
+}
diff --git a/lua/plugins/sidekick.lua b/lua/plugins/sidekick.lua
new file mode 100644
index 0000000..d977c60
--- /dev/null
+++ b/lua/plugins/sidekick.lua
@@ -0,0 +1,69 @@
+return {
+    "folke/sidekick.nvim",
+    opts = {
+        nes = {
+            enabled = false,
+        },
+        -- add any options here
+        cli = {
+            mux = {
+                backend = "zellij",
+                enabled = true,
+            },
+        },
+    },
+    keys = {
+        {
+            ".",
+            function() require("sidekick.cli").toggle("opencode") end,
+            desc = "Sidekick Toggle",
+            mode = { "n", "t", "i", "x" },
+        },
+        {
+            "<leader>aa",
+            function() require("sidekick.cli").toggle() end,
+            desc = "Sidekick Toggle CLI",
+        },
+        {
+            "<leader>as",
+            function() require("sidekick.cli").select() end,
+            -- Or to select only installed tools:
+            -- require("sidekick.cli").select({ filter = { installed = true } })
+            desc = "Select CLI",
+        },
+        {
+            "<leader>ad",
+            function() require("sidekick.cli").close() end,
+            desc = "Detach a CLI Session",
+        },
+        {
+            "<leader>at",
+            function() require("sidekick.cli").send({ msg = "{this}" }) end,
+            mode = { "x", "n" },
+            desc = "Send This",
+        },
+        {
+            "<leader>af",
+            function() require("sidekick.cli").send({ msg = "{file}" }) end,
+            desc = "Send File",
+        },
+        {
+            "<leader>av",
+            function() require("sidekick.cli").send({ msg = "{selection}" }) end,
+            mode = { "x" },
+            desc = "Send Visual Selection",
+        },
+        {
+            "<leader>ap",
+            function() require("sidekick.cli").prompt() end,
+            mode = { "n", "x" },
+            desc = "Sidekick Select Prompt",
+        },
+        -- Example of a keybinding to open Claude directly
+        {
+            "<leader>ac",
+            function() require("sidekick.cli").toggle({ name = "claude", focus = true }) end,
+            desc = "Sidekick Toggle Claude",
+        },
+    },
+}