diff --git a/modules/home/zed/default.nix b/modules/home/zed/default.nix
index 8a39bcc..cbd96aa 100644
--- a/modules/home/zed/default.nix
+++ b/modules/home/zed/default.nix
@@ -13,6 +13,7 @@
     enable = true;
     package = pkgs.zed-editor;
     installRemoteServer = lib.mkIf config.zed-editor.remote-server.enable true;
+    mutableUserSettings = true;
   };
 
   imports = [
diff --git a/modules/home/zed/extra-packages.nix b/modules/home/zed/extra-packages.nix
index 83ec384..a46eb37 100644
--- a/modules/home/zed/extra-packages.nix
+++ b/modules/home/zed/extra-packages.nix
@@ -12,5 +12,6 @@
     tailwindcss-language-server
     typescript-language-server
     omnisharp-roslyn
+    codex-acp
   ];
 }
diff --git a/modules/home/zed/user-settings/agent-servers.nix b/modules/home/zed/user-settings/agent-servers.nix
new file mode 100644
index 0000000..9dbfa03
--- /dev/null
+++ b/modules/home/zed/user-settings/agent-servers.nix
@@ -0,0 +1,6 @@
+_: {
+  programs.zed-editor.userSettings.agent_servers = {
+    codex-acp.type = "registry";
+    opencode-v2.type = "registry";
+  };
+}
diff --git a/modules/home/zed/user-settings/default.nix b/modules/home/zed/user-settings/default.nix
index aa8b94b..d835ae2 100644
--- a/modules/home/zed/user-settings/default.nix
+++ b/modules/home/zed/user-settings/default.nix
@@ -36,6 +36,7 @@ _: {
 
   imports = [
     ./agent.nix
+    ./agent-servers.nix
     ./language-models.nix
     ./languages.nix
     ./lsp.nix