mirror of
https://github.com/harivansh-afk/nix.git
synced 2026-04-15 07:04:47 +00:00
fix codex
This commit is contained in:
parent
550fca2383
commit
ce165c4d77
6 changed files with 12 additions and 56 deletions
10
README.md
10
README.md
|
|
@ -40,7 +40,6 @@ Most tools come from `nixpkgs`. Fast-moving CLIs that you want to update on
|
||||||
their own cadence are pinned as dedicated flake inputs:
|
their own cadence are pinned as dedicated flake inputs:
|
||||||
|
|
||||||
- `googleworkspace-cli`
|
- `googleworkspace-cli`
|
||||||
- `codex`
|
|
||||||
- `claudeCode`
|
- `claudeCode`
|
||||||
|
|
||||||
## Commands
|
## Commands
|
||||||
|
|
@ -69,11 +68,17 @@ just switch
|
||||||
Update only Codex or Claude:
|
Update only Codex or Claude:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
nix flake lock --update-input codex
|
|
||||||
nix flake lock --update-input claudeCode
|
nix flake lock --update-input claudeCode
|
||||||
just switch
|
just switch
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Update Codex:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
brew upgrade --cask codex
|
||||||
|
just switch
|
||||||
|
```
|
||||||
|
|
||||||
## What Still Needs Manual Handling
|
## What Still Needs Manual Handling
|
||||||
|
|
||||||
- Secrets and tokens under `~/.secrets`, `~/.npmrc`, `~/.config/gcloud`, `~/.config/gh`, and similar paths
|
- Secrets and tokens under `~/.secrets`, `~/.npmrc`, `~/.config/gcloud`, `~/.config/gh`, and similar paths
|
||||||
|
|
@ -86,6 +91,7 @@ just switch
|
||||||
The current Homebrew boundary is only:
|
The current Homebrew boundary is only:
|
||||||
|
|
||||||
- `cap`
|
- `cap`
|
||||||
|
- `codex`
|
||||||
- `raycast`
|
- `raycast`
|
||||||
- `riptide-dev`
|
- `riptide-dev`
|
||||||
- `thebrowsercompany-dia`
|
- `thebrowsercompany-dia`
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,8 @@ The structure is intentionally split into three layers:
|
||||||
- [modules/packages.nix](/Users/rathi/Documents/GitHub/nix/modules/packages.nix)
|
- [modules/packages.nix](/Users/rathi/Documents/GitHub/nix/modules/packages.nix)
|
||||||
owns the heavier developer tooling and fonts
|
owns the heavier developer tooling and fonts
|
||||||
- [modules/homebrew.nix](/Users/rathi/Documents/GitHub/nix/modules/homebrew.nix)
|
- [modules/homebrew.nix](/Users/rathi/Documents/GitHub/nix/modules/homebrew.nix)
|
||||||
is the explicitly narrow Brew escape hatch for GUI casks
|
is the explicitly narrow Brew escape hatch for GUI casks, including Codex
|
||||||
|
because the Homebrew-distributed app is a better fit here than a source build
|
||||||
- [modules/macos.nix](/Users/rathi/Documents/GitHub/nix/modules/macos.nix)
|
- [modules/macos.nix](/Users/rathi/Documents/GitHub/nix/modules/macos.nix)
|
||||||
owns system defaults and macOS-specific integration
|
owns system defaults and macOS-specific integration
|
||||||
|
|
||||||
|
|
@ -47,7 +48,6 @@ Exceptions:
|
||||||
Current dedicated inputs:
|
Current dedicated inputs:
|
||||||
|
|
||||||
- `googleworkspace-cli`
|
- `googleworkspace-cli`
|
||||||
- `codex`
|
|
||||||
- `claudeCode`
|
- `claudeCode`
|
||||||
|
|
||||||
## Intentional Pragmatism
|
## Intentional Pragmatism
|
||||||
|
|
|
||||||
43
flake.lock
generated
43
flake.lock
generated
|
|
@ -38,27 +38,6 @@
|
||||||
"type": "github"
|
"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": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
|
|
@ -194,7 +173,6 @@
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"claudeCode": "claudeCode",
|
"claudeCode": "claudeCode",
|
||||||
"codex": "codex",
|
|
||||||
"googleworkspace-cli": "googleworkspace-cli",
|
"googleworkspace-cli": "googleworkspace-cli",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
|
|
@ -202,27 +180,6 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"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": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
|
|
|
||||||
|
|
@ -24,11 +24,6 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
codex = {
|
|
||||||
url = "github:openai/codex";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
nix-homebrew = {
|
nix-homebrew = {
|
||||||
url = "github:zhaofengli-wip/nix-homebrew";
|
url = "github:zhaofengli-wip/nix-homebrew";
|
||||||
};
|
};
|
||||||
|
|
@ -40,7 +35,6 @@
|
||||||
nix-darwin,
|
nix-darwin,
|
||||||
home-manager,
|
home-manager,
|
||||||
claudeCode,
|
claudeCode,
|
||||||
codex,
|
|
||||||
nix-homebrew,
|
nix-homebrew,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
|
|
@ -63,6 +57,7 @@
|
||||||
|
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.extraSpecialArgs = {inherit inputs self username hostname;};
|
||||||
home-manager.backupFileExtension = "hm-bak";
|
home-manager.backupFileExtension = "hm-bak";
|
||||||
home-manager.users.${username} = import ./home;
|
home-manager.users.${username} = import ./home;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
casks = [
|
casks = [
|
||||||
"cap"
|
"cap"
|
||||||
|
"codex"
|
||||||
"raycast"
|
"raycast"
|
||||||
"riptide-dev"
|
"riptide-dev"
|
||||||
"thebrowsercompany-dia"
|
"thebrowsercompany-dia"
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,6 @@
|
||||||
inputs.googleworkspace-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
inputs.googleworkspace-cli.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||||
claudePackage =
|
claudePackage =
|
||||||
inputs.claudeCode.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
inputs.claudeCode.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||||
codexPackage =
|
|
||||||
inputs.codex.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
|
||||||
|
|
||||||
memex = pkgs.stdenvNoCC.mkDerivation rec {
|
memex = pkgs.stdenvNoCC.mkDerivation rec {
|
||||||
pname = "memex";
|
pname = "memex";
|
||||||
|
|
@ -84,7 +82,6 @@ in {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
awscli2
|
awscli2
|
||||||
claudePackage
|
claudePackage
|
||||||
codexPackage
|
|
||||||
coreutils-prefixed
|
coreutils-prefixed
|
||||||
delta
|
delta
|
||||||
diff-so-fancy
|
diff-so-fancy
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue