diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix
index 2087c7c..8623ec5 100644
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -25,6 +25,7 @@
   };
   ai-tools = {
     claude-code.enable = true;
+    codex.enable = true;
     opencode.enable = true;
   };
   anki.enable = true;
diff --git a/home/modules/ai-tools/codex.nix b/home/modules/ai-tools/codex.nix
new file mode 100644
index 0000000..7d52171
--- /dev/null
+++ b/home/modules/ai-tools/codex.nix
@@ -0,0 +1,13 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+{
+  config = lib.mkIf config.ai-tools.codex.enable {
+    programs.codex.enable = true;
+    home.packages = with pkgs; [ codex ];
+  };
+}
diff --git a/home/modules/ai-tools/default.nix b/home/modules/ai-tools/default.nix
index 09aabba..8a44da6 100644
--- a/home/modules/ai-tools/default.nix
+++ b/home/modules/ai-tools/default.nix
@@ -20,6 +20,9 @@ in
         default = [ ];
       };
     };
+    codex = {
+      enable = lib.mkEnableOption "codex";
+    };
     opencode = {
       enable = lib.mkEnableOption "opencode";
     };
@@ -31,6 +34,7 @@ in
   imports = [
     ./claude-code.nix
     ./fabric.nix
+    ./codex.nix
     ./opencode.nix
     ./skills.nix
     ./tirith.nix