nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

claude-code: add enableMcpIntegration
Some checks failed
/ triage (push) Has been cancelled
Details
GitHub Pages / publish (ubuntu-latest) (push) Has been cancelled
Details

Browse source 
Add `enableMcpIntegration` option to merge MCP servers from
`programs.mcp.servers` into Claude Code configuration. Claude Code
servers take precedence over general MCP servers when both define
the same server name.
This commit is contained in:
Thierry Delafontaine 2026-01-18 04:33:01 +01:00 • committed by GitHub
parent 1c27557d99
commit 83bcb17377
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 106 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/programs/claude-code.nix
View file

@ -7,6 +7,17 @@
let
cfg = config.programs.claude-code;
jsonFormat = pkgs.formats.json { };
transformedMcpServers = lib.optionalAttrs (cfg.enableMcpIntegration && config.programs.mcp.enable) (
lib.mapAttrs (
name: server:
(removeAttrs server [ "disabled" ])
// (lib.optionalAttrs (server ? url) { type = "http"; })
// (lib.optionalAttrs (server ? command) { type = "stdio"; })
// {
enabled = !(server.disabled or false);
}
) config.programs.mcp.servers
);
in
{
meta.maintainers = [ lib.maintainers.khaneliman ];
@ -23,6 +34,20 @@ in
description = "Resulting customized claude-code package.";
};
enableMcpIntegration = lib.mkOption {
type = lib.types.bool;
default = false;
description = ''
Whether to integrate the MCP servers config from
{option}`programs.mcp.servers` into
{option}`programs.opencode.settings.mcp`.
Note: Settings defined in {option}`programs.mcp.servers` are merged
with {option}`programs.claude-code.mcpServers`, with Claude Code servers
taking precedence.
'';
};
settings = lib.mkOption {
inherit (jsonFormat) type;
default = { };
@ -359,8 +384,8 @@ in
config = lib.mkIf cfg.enable {
assertions = [
{
assertion = cfg.mcpServers == { } || cfg.package != null;
message = "`programs.claude-code.package` cannot be null when `mcpServers` is configured";
assertion = (cfg.mcpServers == { } && !cfg.enableMcpIntegration) || cfg.package != null;
message = "`programs.claude-code.package` cannot be null when `mcpServers` or `enableMcpIntegration` is configured";
}
{
assertion = !(cfg.memory.text != null && cfg.memory.source != null);
@ -390,11 +415,14 @@ in
programs.claude-code.finalPackage =
let
mergedMcpServers = transformedMcpServers // cfg.mcpServers;
makeWrapperArgs = lib.flatten (
lib.filter (x: x != [ ]) [
(lib.optional (cfg.mcpServers != { }) [
(lib.optional (cfg.mcpServers != { } || transformedMcpServers != { }) [
"--append-flags"
"--mcp-config ${jsonFormat.generate "claude-code-mcp-config.json" { inherit (cfg) mcpServers; }}"
"--mcp-config ${
jsonFormat.generate "claude-code-mcp-config.json" { mcpServers = mergedMcpServers; }
}"
])
]
);