From bcbe527ac62aebb123d4f108dff7821dc5993d5b Mon Sep 17 00:00:00 2001
From: Marty Oehme <contact@martyoeh.me>
Date: Thu, 19 Jun 2025 17:25:59 +0200
Subject: [PATCH] nvim: Add mcphub for mcp llm agent installation

---
 nvim/.config/nvim/lazy-lock.json        |  1 +
 nvim/.config/nvim/lua/core/commands.lua |  2 +-
 nvim/.config/nvim/lua/plugins/llm.lua   | 26 ++++++++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 1b1884a..b5ad494 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -42,6 +42,7 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "5477d67a5ca12b704f2a8a55a057fc79750f3dbb" },
   "mason-nvim-lint": { "branch": "main", "commit": "b579a00ee39dcd590b1023028dc8fb3d203a67b0" },
   "mason.nvim": { "branch": "main", "commit": "7f265cd6ae56cecdd0aa50c8c73fc593b0604801" },
+  "mcphub.nvim": { "branch": "main", "commit": "85a7a659fc82da1429a2241ab61e9ce07b3db374" },
   "mdeval.nvim": { "branch": "master", "commit": "0e1b248db174a9659a9ab16eb8c90ff3aec55264" },
   "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
   "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
diff --git a/nvim/.config/nvim/lua/core/commands.lua b/nvim/.config/nvim/lua/core/commands.lua
index 7323422..5ed10e2 100644
--- a/nvim/.config/nvim/lua/core/commands.lua
+++ b/nvim/.config/nvim/lua/core/commands.lua
@@ -31,7 +31,7 @@ vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, {
 })
 vim.api.nvim_create_autocmd({ "BufNewFile", "BufReadPre" }, {
 	group = vim.api.nvim_create_augroup("PrivateJrnl", {}),
-	pattern = "*.jrnl",
+	pattern = { "*.jrnl", "jrnl.*" },
 	desc = "Don't leak information when editing jrnl files",
 	callback = private_mode,
 })
diff --git a/nvim/.config/nvim/lua/plugins/llm.lua b/nvim/.config/nvim/lua/plugins/llm.lua
index 46c14b5..f2430f5 100644
--- a/nvim/.config/nvim/lua/plugins/llm.lua
+++ b/nvim/.config/nvim/lua/plugins/llm.lua
@@ -23,7 +23,6 @@ return {
 			},
 		},
 	},
-	-- TODO: Add completion w blink, see https://codecompanion.olimorris.dev/installation.html
 	{
 		"olimorris/codecompanion.nvim",
 		dependencies = {
@@ -33,6 +32,23 @@ return {
 			{ "ibhagwan/fzf-lua", optional = true },
 			"ravitemer/codecompanion-history.nvim",
 			"jinzhongjia/codecompanion-gitcommit.nvim",
+
+			{ -- enable mcp server agent extensions
+				"ravitemer/mcphub.nvim",
+				build = "bundled_build.lua",
+				opts = {
+					use_bundled_binary = true,
+				},
+				cmd = "MCPHub",
+				keys = {
+					{
+						"<leader>va",
+						"<cmd>MCPHub<cr>",
+						desc = "MCP Hub",
+						silent = true,
+					},
+				},
+			},
 		},
 		init = function(_)
 			if require("core.util").is_available("which-key") then
@@ -95,6 +111,14 @@ return {
 						},
 					},
 				},
+				mcphub = {
+					callback = "mcphub.extensions.codecompanion",
+					opts = {
+						show_results_in_chat = true,
+						make_vars = true,
+						make_slash_commands = true,
+					},
+				},
 			},
 		},
 		keys = {