diff --git a/flake.lock b/flake.lock
index ad06eda..39f5d0b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3229,6 +3229,7 @@
         "system-manager": "system-manager",
         "tangled-core": "tangled-core",
         "tmux-float": "tmux-float",
+        "tmux-mcp": "tmux-mcp",
         "tmux-super-fingers-src": "tmux-super-fingers-src",
         "tree-sitter-d2": "tree-sitter-d2",
         "tree-sitter-just": "tree-sitter-just",
@@ -4242,6 +4243,29 @@
         "type": "github"
       }
     },
+    "tmux-mcp": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1782822704,
+        "narHash": "sha256-fukHL8qOJTaB9tuiKx6X7pvMBtrLUYcVF18w5vPvXO0=",
+        "ref": "refs/heads/main",
+        "rev": "f2e457a0d6d1c499eb38732c03397c0352a8504d",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://git.darksailor.dev/servius/tmux-mcp"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.darksailor.dev/servius/tmux-mcp"
+      }
+    },
     "tmux-super-fingers-src": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 1f83d4c..41d40ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -103,6 +103,12 @@
       url = "github:uttarayan21/tmux-float";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    tmux-mcp = {
+      url = "git+https://git.darksailor.dev/servius/tmux-mcp";
+      # url = "path:/home/servius/Projects/tmux-mcp";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
     ddcbacklight = {
       url = "github:uttarayan21/ddcbacklight";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home/programs/codex.nix b/home/programs/codex.nix
index a7b6edc..edd423c 100644
--- a/home/programs/codex.nix
+++ b/home/programs/codex.nix
@@ -6,5 +6,15 @@
   programs.codex = {
     enable = device.is "ryu" || device.is "kuro";
     package = pkgs.codex;
+
+    settings.mcp_servers.tmux = {
+      command = "${pkgs.tmux-mcp}/bin/tmux-mcp";
+      startup_timeout_sec = 10;
+      tool_timeout_sec = 60;
+      tools = {
+        spawn_command.approval_mode = "prompt";
+        send_keys.approval_mode = "prompt";
+      };
+    };
   };
 }
diff --git a/overlays.nix b/overlays.nix
index 02591f7..2c8a32d 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -24,6 +24,7 @@ in
     inputs.hdbctrl.overlays.default
     inputs.nix-minecraft.overlay
     inputs.nur.overlays.default
+    inputs.tmux-mcp.overlays.default
     inputs.vicinae.overlays.default
     inputs.hyprland.overlays.hyprland-packages
     inputs.hyprland.overlays.hyprland-extras