From 737787b787c0c1337013d70b9e788e7190fdf95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=BF=20corey?= <corey@x64.co>
Date: Sun, 5 Apr 2026 16:04:54 -0700
Subject: [PATCH 1/2] feat(home): configure claude-code MCP via programs.mcp
 integration

Define glyph MCP server in programs.mcp.servers and enable
enableMcpIntegration instead of configuring mcpServers directly
on the claude-code module.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 modules/home/development.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/home/development.nix b/modules/home/development.nix
index 61891882..b531c758 100644
--- a/modules/home/development.nix
+++ b/modules/home/development.nix
@@ -27,15 +27,17 @@ in {
 
   config = lib.mkMerge [
     (mkIf cfg.ai.enable {
+      programs.mcp = {
+        enable = true;
+        servers.glyph = {
+          url = "http://glyph:8090/mcp";
+        };
+      };
+
       programs.claude-code = {
         enable = true;
+        enableMcpIntegration = true;
         memory.source = "${llm-profile}/README.md";
-        mcpServers = {
-          glyph = {
-            type = "http";
-            url = "http://glyph:8090/mcp";
-          };
-        };
         settings = {
           model = "sonnet";
           # Disabled in favor of Basic Memory MCP for cross-device access

From 6244310139048437bc363c37ede3f40f35d1a9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=BF=20corey?= <corey@x64.co>
Date: Sun, 5 Apr 2026 16:35:23 -0700
Subject: [PATCH 2/2] feat(glyph): use enableMcpIntegration for opencode

Replace manually-defined mcp.glyph in opencode settings with
enableMcpIntegration, picking up the shared programs.mcp.servers config.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 hosts/glyph/home.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/hosts/glyph/home.nix b/hosts/glyph/home.nix
index 538c66b7..1a3d4150 100644
--- a/hosts/glyph/home.nix
+++ b/hosts/glyph/home.nix
@@ -9,6 +9,7 @@
 
   programs.opencode = {
     enable = true;
+    enableMcpIntegration = true;
     web.enable = true;
     web.extraArgs = ["--port" "8890" "--hostname" "0.0.0.0"];
     rules = builtins.readFile "${llm-profile}/README.md";
@@ -22,10 +23,6 @@
         port = 8890;
         hostname = "0.0.0.0";
       };
-      mcp.glyph = {
-        type = "remote";
-        url = "http://127.0.0.1:8090/mcp";
-      };
     };
   };