From 1ceac40ac932b4521025dfd73e30ef4ac159a33d Mon Sep 17 00:00:00 2001 From: Sam Estep Date: Wed, 18 Mar 2026 10:38:53 -0400 Subject: [PATCH] Revert Codex to before v0.113.0 --- docker-arm/home-manager/home.nix | 9 +++++++-- docker-x86/home-manager/home.nix | 9 +++++++-- flake.lock | 6 +++--- macos/home-manager/home.nix | 2 +- nixos/home-manager/home.nix | 2 +- ubuntu/home-manager/home.nix | 2 +- util.nix | 10 +++++++--- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/docker-arm/home-manager/home.nix b/docker-arm/home-manager/home.nix index 1250f7a..a368e20 100644 --- a/docker-arm/home-manager/home.nix +++ b/docker-arm/home-manager/home.nix @@ -1,6 +1,11 @@ -{ config, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - util = import ../../util.nix { inherit config pkgs; }; + util = import ../../util.nix { inherit config lib pkgs; }; in { nixpkgs = util.nixpkgs; diff --git a/docker-x86/home-manager/home.nix b/docker-x86/home-manager/home.nix index d3a9824..107df59 100644 --- a/docker-x86/home-manager/home.nix +++ b/docker-x86/home-manager/home.nix @@ -1,6 +1,11 @@ -{ config, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - util = import ../../util.nix { inherit config pkgs; }; + util = import ../../util.nix { inherit config lib pkgs; }; in { nixpkgs = util.nixpkgs; diff --git a/flake.lock b/flake.lock index 25341f9..ca0e38b 100644 --- a/flake.lock +++ b/flake.lock @@ -193,11 +193,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773628058, - "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", + "lastModified": 1773231277, + "narHash": "sha256-Xy3WEpUAbpsz8ydgvVAQAGGB/WB+8cNA5cshiL0McTI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", + "rev": "75690239f08f885ca9b0267580101f60d10fbe62", "type": "github" }, "original": { diff --git a/macos/home-manager/home.nix b/macos/home-manager/home.nix index 4477391..51b9e6b 100644 --- a/macos/home-manager/home.nix +++ b/macos/home-manager/home.nix @@ -5,7 +5,7 @@ ... }: let - util = import ../../util.nix { inherit config pkgs; }; + util = import ../../util.nix { inherit config lib pkgs; }; in { nixpkgs = util.nixpkgs; diff --git a/nixos/home-manager/home.nix b/nixos/home-manager/home.nix index ff2e01a..737351a 100644 --- a/nixos/home-manager/home.nix +++ b/nixos/home-manager/home.nix @@ -5,7 +5,7 @@ ... }: let - util = import ../../util.nix { inherit config pkgs; }; + util = import ../../util.nix { inherit config lib pkgs; }; in { nixpkgs = util.nixpkgs; diff --git a/ubuntu/home-manager/home.nix b/ubuntu/home-manager/home.nix index 0c922ca..199c4f5 100644 --- a/ubuntu/home-manager/home.nix +++ b/ubuntu/home-manager/home.nix @@ -5,7 +5,7 @@ ... }: let - util = import ../../util.nix { inherit config pkgs; }; + util = import ../../util.nix { inherit config lib pkgs; }; in { nixpkgs = util.nixpkgs; diff --git a/util.nix b/util.nix index 5f64841..7cff8c3 100644 --- a/util.nix +++ b/util.nix @@ -1,4 +1,8 @@ -{ config, pkgs }: +{ + config, + lib, + pkgs, +}: rec { symlink = subpath: { source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/github/samestep/env/${subpath}"; @@ -115,8 +119,8 @@ rec { assertions = [ { - assertion = config.programs.vscode.package.version != "1.108.0"; - message = "VS Code 1.108.0 is broken: https://github.com/microsoft/vscode/issues/286825"; + assertion = lib.versionOlder pkgs.codex.version "0.113.0"; + message = "Codex 0.113.0 introduced unwanted prompts: https://github.com/openai/codex/issues/14345"; } ]; }