Add extra substituters, set up MCPs explicitly (without an extra flake input)

flake.nix

@@ -5,13 +5,17 @@
     extra-experimental-features = "nix-command flakes";
 
     extra-substituters = [
+      "https://cache.nixos.org"
+      "https://cache.lix.systems"
       "https://cache.e10.camp/tilde"
       "https://tilde.cachix.org"
       "https://nix-community.cachix.org"
       "https://numtide.cachix.org"
     ];
 
     extra-trusted-public-keys = [
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
       "tilde:Urwh7kyCsSsNmV1gu4sMYFVZCI0ZPwEXjxxtNH06G8U="
       "tilde.cachix.org-1:vjup2ixrsWKk+v8FXCqusKWBRwU0l7EzumjnMV4n2Vg="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
@@ -48,9 +52,6 @@
     emacs-overlay.url = "github:nix-community/emacs-overlay";
     emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
 
-    mcp-servers.url = "github:natsukium/mcp-servers-nix";
-    mcp-servers.inputs.nixpkgs.follows = "nixpkgs";
-
     pragmatapro.url = "git+ssh://git@github.com/ethnt/pragmatapro";
     pragmatapro.inputs.nixpkgs.follows = "nixpkgs";
     pragmatapro.inputs.flake-parts.follows = "flake-parts";

lib/src/hm.nix

@@ -5,10 +5,8 @@ let
 
   l = inputs.nixpkgs.lib // builtins;
 
-  sharedModules = l.attrValues flake.homeModules ++ (with inputs; [
-    sops-nix.homeManagerModules.sops
-    mcp-servers.homeManagerModules.default
-  ]);
+  sharedModules = l.attrValues flake.homeModules
+    ++ (with inputs; [ sops-nix.homeManagerModules.sops ]);
 
   extraSpecialArgs = {
     inherit flake inputs secrets;

modules/profiles/home/mcp/context7.nix

@@ -0,0 +1,6 @@
+{ lib, pkgs, ... }: {
+  programs.mcp.servers.context7 = {
+    command = lib.getExe pkgs.context7-mcp;
+    args = [ ];
+  };
+}

modules/profiles/home/mcp/github/default.nix

@@ -1,4 +1,11 @@
-{ config, ... }: {
+{ config, pkgs, ... }:
+
+let
+  github-mcp-wrapper = pkgs.writeShellScript "github-mcp-wrapper" ''
+    export GITHUB_PERSONAL_ACCESS_TOKEN="$(cat ${config.sops.secrets.github_mcp_pat.path})"
+    exec ${pkgs.github-mcp-server}/bin/github-mcp-server stdio
+  '';
+in {
   sops = {
     secrets.github_mcp_pat = {
       sopsFile = ./secrets.json;
@@ -13,8 +20,8 @@
     };
   };
 
-  mcp-servers.programs.github = {
-    enable = true;
-    envFile = config.sops.templates.github_mcp_env_file.path;
+  programs.mcp.servers.github = {
+    command = github-mcp-wrapper;
+    args = [ ];
   };
 }

modules/profiles/home/mcp/memory.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+let memoryDir = "${config.xdg.dataHome}/mcp-memory";
+in {
+  programs.mcp.servers.memory = {
+    command = lib.getExe pkgs.mcp-server-memory;
+    args = [ ];
+    env = { MEMORY_FILE_PATH = "${memoryDir}/memory.jsonl"; };
+  };
+
+  home.activation.createMcpMemoryDir =
+    lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+      run mkdir -p "${memoryDir}"
+    '';
+}

modules/profiles/home/mcp/nixos.nix

@@ -1 +1,6 @@
-{ mcp-servers.programs.nixos.enable = true; }
+{ lib, pkgs, ... }: {
+  programs.mcp.servers.nixos = {
+    command = lib.getExe pkgs.mcp-nixos;
+    args = [ ];
+  };
+}

modules/suites/home.nix

@@ -36,8 +36,11 @@ with profiles;
     git.mergiraf
     git.worktrunk
     gh
+    gh-dash
+    mcp.context7
     mcp.default
     mcp.github.default
+    mcp.memory
     mcp.nixos
     mise
     vscode

users/et/home.nix

@@ -4,6 +4,7 @@
     ++ (with profiles; [ haskell nodejs ]) ++ [ secrets.users.et.home ] ++ [
       ./profiles/git.nix
       ./profiles/jujutsu.nix
+      ./profiles/mcp.nix
       ./profiles/tmuxp.nix
       ./profiles/tools.nix
       ./profiles/vscode.nix

users/et/profiles/mcp.nix

@@ -1 +1,6 @@
-{ mcp-servers.programs.notion.enable = true; }
+{
+  programs.mcp.servers = {
+    notion.url = "https://mcp.notion.com/mcp";
+    linear.url = "https://mcp.linear.app/mcp";
+  };
+}