From d47710ebe2b4bd8b61d8446a9ed00fea9ceb46d3 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Fri, 18 Sep 2026 21:13:06 +0800
Subject: [PATCH] fix(agents): merge Codex privacy settings

---
 home/base/codex-privacy.nu      | 13 +++++++++++++
 home/base/codex.nix             | 17 +++++++++++++++++
 home/base/core/privacy.nix      |  3 +++
 home/base/gui/dev-tools.nix     | 13 ++-----------
 home/base/tui/agent-env.nix     |  2 --
 home/hosts/linux/idols-ruby.nix |  5 ++++-
 hosts/idols-ruby/packages.nix   | 11 -----------
 modules/base/codex.nix          | 11 -----------
 8 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 home/base/codex-privacy.nu
 create mode 100644 home/base/codex.nix
 create mode 100644 home/base/core/privacy.nix
 delete mode 100644 modules/base/codex.nix

diff --git a/home/base/codex-privacy.nu b/home/base/codex-privacy.nu
new file mode 100644
index 00000000..ef95cd66
--- /dev/null
+++ b/home/base/codex-privacy.nu
@@ -0,0 +1,13 @@
+def main [config_file: path, yq: path] {
+  mkdir ($config_file | path dirname)
+
+  if not ($config_file | path exists) {
+    touch $config_file
+  }
+
+  ^$yq eval --inplace --input-format toml --output-format toml (
+    '.analytics.enabled = false | ' +
+    '.feedback.enabled = false | ' +
+    '.check_for_update_on_startup = false'
+  ) $config_file
+}
diff --git a/home/base/codex.nix b/home/base/codex.nix
new file mode 100644
index 00000000..bf4f22a9
--- /dev/null
+++ b/home/base/codex.nix
@@ -0,0 +1,17 @@
+{
+  config,
+  lib,
+  pkgs,
+  llm-agents,
+  ...
+}:
+let
+  configFile = "${config.home.homeDirectory}/.codex/config.toml";
+in
+{
+  home.packages = [ llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.codex ];
+
+  home.activation.configureCodexPrivacy = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+    run ${pkgs.nushell}/bin/nu ${./codex-privacy.nu} ${lib.escapeShellArg configFile} ${lib.escapeShellArg "${pkgs.yq-go}/bin/yq"}
+  '';
+}
diff --git a/home/base/core/privacy.nix b/home/base/core/privacy.nix
new file mode 100644
index 00000000..10043265
--- /dev/null
+++ b/home/base/core/privacy.nix
@@ -0,0 +1,3 @@
+{
+  home.sessionVariables.DO_NOT_TRACK = "1";
+}
diff --git a/home/base/gui/dev-tools.nix b/home/base/gui/dev-tools.nix
index 32fd69aa..dc1a4288 100644
--- a/home/base/gui/dev-tools.nix
+++ b/home/base/gui/dev-tools.nix
@@ -1,18 +1,10 @@
 { pkgs, llm-agents, ... }:
 let
   agentPackages = llm-agents.packages.${pkgs.stdenv.hostPlatform.system};
-  codexNoAnalytics = pkgs.writeShellApplication {
-    name = "codex";
-    text = ''
-      exec ${agentPackages.codex}/bin/codex \
-        --config analytics.enabled=false \
-        --config feedback.enabled=false \
-        --config check_for_update_on_startup=false \
-        "$@"
-    '';
-  };
 in
 {
+  imports = [ ../codex.nix ];
+
   home.packages =
     with pkgs;
     [
@@ -23,7 +15,6 @@ in
     # AI Agent Tools
     ++ [
       # Agents
-      codexNoAnalytics
       agentPackages.opencode
       agentPackages.kimi-code
       agentPackages.pi
diff --git a/home/base/tui/agent-env.nix b/home/base/tui/agent-env.nix
index 806542c3..455c4e93 100644
--- a/home/base/tui/agent-env.nix
+++ b/home/base/tui/agent-env.nix
@@ -1,7 +1,5 @@
 {
   home.sessionVariables = {
-    DO_NOT_TRACK = "1";
-
     KIMI_DISABLE_TELEMETRY = "1";
 
     PI_TELEMETRY = "0";
diff --git a/home/hosts/linux/idols-ruby.nix b/home/hosts/linux/idols-ruby.nix
index a67103bf..9ede1379 100644
--- a/home/hosts/linux/idols-ruby.nix
+++ b/home/hosts/linux/idols-ruby.nix
@@ -1,3 +1,6 @@
 {
-  imports = [ ../../linux/core.nix ];
+  imports = [
+    ../../linux/core.nix
+    ../../base/codex.nix
+  ];
 }
diff --git a/hosts/idols-ruby/packages.nix b/hosts/idols-ruby/packages.nix
index 166b7a30..b7e1cedf 100644
--- a/hosts/idols-ruby/packages.nix
+++ b/hosts/idols-ruby/packages.nix
@@ -1,16 +1,6 @@
 { pkgs, llm-agents, ... }:
 let
   agentPackages = llm-agents.packages.${pkgs.stdenv.hostPlatform.system};
-  codexNoAnalytics = pkgs.writeShellApplication {
-    name = "codex";
-    text = ''
-      exec ${agentPackages.codex}/bin/codex \
-        --config analytics.enabled=false \
-        --config feedback.enabled=false \
-        --config check_for_update_on_startup=false \
-        "$@"
-    '';
-  };
 in
 {
   # https://github.com/Mic92/nix-ld
@@ -95,7 +85,6 @@ in
     # AI Agent Tools
     ++ [
       # Agents
-      codexNoAnalytics
       agentPackages.opencode
       agentPackages.kimi-code
       agentPackages.pi
diff --git a/modules/base/codex.nix b/modules/base/codex.nix
deleted file mode 100644
index a46c01e3..00000000
--- a/modules/base/codex.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  environment.etc."codex/config.toml".text = ''
-    check_for_update_on_startup = false
-
-    [analytics]
-    enabled = false
-
-    [feedback]
-    enabled = false
-  '';
-}