diff --git a/flake.lock b/flake.lock index ff9fcf6..bd8ae5a 100644 --- a/flake.lock +++ b/flake.lock @@ -17,6 +17,27 @@ "type": "github" } }, + "codex": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1773430824, + "narHash": "sha256-Rq1IozLlXBCoiOBzwgRhIUAGKojWMaueVUX2qOj5vhs=", + "owner": "openai", + "repo": "codex", + "rev": "914f7c73175b038b4d396219754fe21ba6678af2", + "type": "github" + }, + "original": { + "owner": "openai", + "repo": "codex", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -43,11 +64,11 @@ ] }, "locked": { - "lastModified": 1773361138, - "narHash": "sha256-rfesDZC5H0q+i+C8f8qmwvnC/8n6G7hC/M3fxF4orVQ=", + "lastModified": 1773431608, + "narHash": "sha256-VnbyLo7+0r7x/DOwqAFMzynH8qZi2nft3UgQBeo2ls8=", "owner": "googleworkspace", "repo": "cli", - "rev": "4b827cdd258db555cfccb2a66e02ef73d0a53fe2", + "rev": "fc873dcc0035bbe3a6f112be130dd07a33860fc8", "type": "github" }, "original": { @@ -133,6 +154,7 @@ }, "root": { "inputs": { + "codex": "codex", "googleworkspace-cli": "googleworkspace-cli", "home-manager": "home-manager", "nix-darwin": "nix-darwin", @@ -140,6 +162,27 @@ "nixpkgs": "nixpkgs" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "codex", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769828398, + "narHash": "sha256-zmnvRUm15QrlKH0V1BZoiT3U+Q+tr+P5Osi8qgtL9fY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a1d32c90c8a4ea43e9586b7e5894c179d5747425", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index bba494c..cbc9fc2 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + codex = { + url = "github:openai/codex"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-homebrew = { url = "github:zhaofengli-wip/nix-homebrew"; }; @@ -29,6 +34,7 @@ nixpkgs, nix-darwin, home-manager, + codex, nix-homebrew, ... }: let diff --git a/modules/packages.nix b/modules/packages.nix index 4d56fae..ae62f3f 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -6,6 +6,8 @@ }: let gwsPackage = inputs.googleworkspace-cli.packages.${pkgs.stdenv.hostPlatform.system}.default; + codexPackage = + inputs.codex.packages.${pkgs.stdenv.hostPlatform.system}.default; memex = pkgs.stdenvNoCC.mkDerivation rec { pname = "memex"; @@ -79,7 +81,7 @@ in { environment.systemPackages = with pkgs; [ awscli2 - codex + codexPackage coreutils-prefixed delta diff-so-fancy