diff --git a/emacs/init.el b/emacs/init.el
index e0a3843..ceb0ea5 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -856,6 +856,16 @@ EMACS-ALTERNATIVE is the Emacs equivalent (e.g., 'C-s')."
          ("C-j" . nil)))
 
 ;;; Programming
+;;;; Agent-shell (Codex)
+(use-package agent-shell
+  :ensure t
+  :bind (("C-c a" . agent-shell))
+  :custom
+  (agent-shell-preferred-agent-config 'codex)
+  :config
+  (setq agent-shell-openai-authentication
+        (agent-shell-openai-make-authentication :login t)))
+
 ;;;; Treesitter
 (use-package treesit-auto
   :ensure t
diff --git a/nix/home.nix b/nix/home.nix
index 9416d9d..d7d9ec2 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -29,6 +29,7 @@
     sops
     just
     codex
+    codex-acp
   ];
 
   imports = [