diff --git a/home.nix b/home.nix
index 7a70b2d..210a7fa 100644
--- a/home.nix
+++ b/home.nix
@@ -221,9 +221,16 @@
     recursive = true;
   };
 
+  # Claude Code agents (managed declaratively via flake inputs)
+  home.file.".claude/agents" = {
+    source = "${oh-my-claudecode}/agents";
+    recursive = true;
+  };
+
   # Claude Code configuration
   home.file.".claude/CLAUDE.md" = {
-    text = ''
+    text = builtins.readFile "${oh-my-claudecode}/CLAUDE.md" + ''
+
       ## Commit Behavior
 
       After completing each logical unit of work, use the /commit skill to stage
@@ -276,6 +283,14 @@
       };
       alwaysThinkingEnabled = true;
       includeCoAuthoredBy = false;
+      statusLine = {
+        type = "command";
+        command = "node \${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hud/omc-hud.mjs";
+      };
+      env = {
+        CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = "1";
+      };
+      teammateMode = "tmux";
     };
     force = true;
   };