From 4a431d410d078310e373523f28f084d8abac3cc7 Mon Sep 17 00:00:00 2001 From: Kat Huang Date: Thu, 5 Feb 2026 14:42:02 -0800 Subject: [PATCH] Update codex input and switch command --- nix-darwin/flake.lock | 69 ++++++++++++++++++++++--------------------- nix-darwin/flake.nix | 41 +++++++++++++------------ nix-darwin/justfile | 5 +++- 3 files changed, 59 insertions(+), 56 deletions(-) diff --git a/nix-darwin/flake.lock b/nix-darwin/flake.lock index 7616fe3a..610f2784 100644 --- a/nix-darwin/flake.lock +++ b/nix-darwin/flake.lock @@ -27,16 +27,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1763638478, - "narHash": "sha256-n/IMowE9S23ovmTkKX7KhxXC2Yq41EAVFR2FBIXPcT8=", + "lastModified": 1769363988, + "narHash": "sha256-BiGPeulrDVetXP+tjxhMcGLUROZAtZIhU5m4MqawCfM=", "owner": "Homebrew", "repo": "brew", - "rev": "fbfdbaba008189499958a7aeb1e2c36ab10c067d", + "rev": "d01011cac6d72032c75fd2cd9489909e95d9faf2", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "5.0.3", + "ref": "5.0.12", "repo": "brew", "type": "github" } @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1770168651, - "narHash": "sha256-SxzTEu49iaAA/nAT28Rsr4BmjC3eCkiaM4/ZYBVhhNQ=", + "lastModified": 1770315205, + "narHash": "sha256-yOYprNUvMHRBC7EfmhNOYYLqNm43cLtydV39ITnCfZk=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "f256f48c037a6e54afa332795328f753f2fafbaf", + "rev": "b774ffcdcd9987f4a2e6e3809130d04438e29a13", "type": "github" }, "original": { @@ -70,15 +70,16 @@ ] }, "locked": { - "lastModified": 1770232831, - "narHash": "sha256-C5e2wjd//pLJA1LqSYc/y9aZkM8wmZo/BAuzhZDuyFE=", - "owner": "sadjow", + "lastModified": 1770321000, + "narHash": "sha256-g5Q2VES3eKkLiHfRTeuhmStxZvgb+/oTtRnSEXrPZQk=", + "owner": "colonelpanic8", "repo": "codex-cli-nix", - "rev": "64805eb1d1afffcbbcef0ffc053295f0065cd51d", + "rev": "9386e1dfd5555b949bb934f062e8cb7971868f8d", "type": "github" }, "original": { - "owner": "sadjow", + "owner": "colonelpanic8", + "ref": "fix/add-libcap-to-rpath", "repo": "codex-cli-nix", "type": "github" } @@ -167,11 +168,11 @@ ] }, "locked": { - "lastModified": 1767930051, - "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=", + "lastModified": 1770318660, + "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", "owner": "nix-community", "repo": "home-manager", - "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb", + "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", "type": "github" }, "original": { @@ -205,11 +206,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1767937441, - "narHash": "sha256-hiGvxqI6npGOAnNwMXkF1628IkyKhhYsAqO5kmSAuqM=", + "lastModified": 1770329113, + "narHash": "sha256-Os2PWAIdjdsVcBjHcI8Ylwty5qnR+Dhvb1LQ2kuR29A=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "cc94d21fe7abb3cc93db50671bf5048176711be9", + "rev": "9db89c6e9fe65f0fe9c8ecf6070e788532161fde", "type": "github" }, "original": { @@ -221,11 +222,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1767948289, - "narHash": "sha256-a6s+kRHOXRq4QoA4bDLZVKpC1woi6tTRqEt8Vk0ikGo=", + "lastModified": 1770328672, + "narHash": "sha256-l9sCOH8PyK7QyjsT8W8k4ql/2Hzv7FCYGq6l0WEh5AM=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "f268dcd932823c65f8feb2cfc533300ccbcc4541", + "rev": "a483f6dd19f9d604f5db5edaa58c3ad43c23e2b3", "type": "github" }, "original": { @@ -241,11 +242,11 @@ ] }, "locked": { - "lastModified": 1767718503, - "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", + "lastModified": 1770184146, + "narHash": "sha256-DsqnN6LvXmohTRaal7tVZO/AKBuZ02kPBiZKSU4qa/k=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", + "rev": "0d7874ef7e3ba02d58bebb871e6e29da36fa1b37", "type": "github" }, "original": { @@ -259,11 +260,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1764473698, - "narHash": "sha256-C91gPgv6udN5WuIZWNehp8qdLqlrzX6iF/YyboOj6XI=", + "lastModified": 1769437432, + "narHash": "sha256-8d7KnCpT2LweRvSzZYEGd9IM3eFX+A78opcnDM0+ndk=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "6a8ab60bfd66154feeaa1021fc3b32684814a62a", + "rev": "a5409abd0d5013d79775d3419bcac10eacb9d8c5", "type": "github" }, "original": { @@ -274,11 +275,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", + "lastModified": 1770169770, + "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", + "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2", "type": "github" }, "original": { @@ -311,11 +312,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1766173571, - "narHash": "sha256-iYU5oTgXkZHqkb03IDPVMHA4Yte4AFhusTem0nf7pcc=", + "lastModified": 1769653852, + "narHash": "sha256-c4OP02iityp81ww01JDvPQ9cVrbU5S7z3i2iFKltIH4=", "ref": "refs/heads/master", - "rev": "5b42885b7c702fb30b4678e5cb51cc8501fd7830", - "revCount": 139, + "rev": "2a750e0356b6dad548e32f7e99117e40ad901c66", + "revCount": 144, "type": "git", "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git" }, diff --git a/nix-darwin/flake.nix b/nix-darwin/flake.nix index 919f25f7..c9feb8a9 100644 --- a/nix-darwin/flake.nix +++ b/nix-darwin/flake.nix @@ -23,7 +23,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; codex-cli-nix = { - url = "github:sadjow/codex-cli-nix"; + url = "github:colonelpanic8/codex-cli-nix/fix/add-libcap-to-rpath"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -36,7 +36,10 @@ outputs = inputs@{ self, nix-darwin, nixpkgs, home-manager, ... }: let libDir = ../dotfiles/lib; - configuration = { pkgs, config, ... }: { + configuration = { pkgs, lib, config, ... }: + let + essentialPkgs = (import ../nixos/essential.nix { inherit pkgs lib; }).environment.systemPackages; + in { networking.hostName = "mac-demarco-mini"; imports = [ (import ./gitea-actions-runner.nix) ]; services.gitea-actions-runner = { @@ -130,25 +133,21 @@ claude-code = inputs.claude-code-nix.packages.${prev.stdenv.hostPlatform.system}.default; }) ]; - environment.systemPackages = with pkgs; [ - #python-with-my-packages - emacs - alejandra - cocoapods - gitFull - just - tmux - htop - nodePackages.prettier - nodejs - ripgrep - slack - claude-code - codex - typescript - vim - yarn - ]; + environment.systemPackages = + essentialPkgs + ++ (with pkgs; [ + alejandra + claude-code + cocoapods + codex + nodePackages.prettier + nodejs + slack + tea + typescript + vim + yarn + ]); nixpkgs.config.allowUnfree = true; diff --git a/nix-darwin/justfile b/nix-darwin/justfile index 423fd176..6d96e5d0 100644 --- a/nix-darwin/justfile +++ b/nix-darwin/justfile @@ -1,2 +1,5 @@ switch: - nix run nix-darwin -- switch --flake .# + sudo -H /run/current-system/sw/bin/nix run nix-darwin -- switch --flake .# + +update-nix-darwin: + nix flake lock --update-input nix-darwin