Fix Darwin switch after remote reconciliation

dotfiles/codex/config.toml

@@ -128,6 +128,9 @@ trust_level = "trusted"
 [projects."/Users/kat/Documents/Codex/2026-04-25/it-seems-like-maybe-we-dont"]
 trust_level = "trusted"
 
+[projects."/Users/kat/Documents/Codex/2026-04-25/what-is-the-state-of-tiling"]
+trust_level = "trusted"
+
 [notice]
 hide_gpt5_1_migration_prompt = true
 "hide_gpt-5.1-codex-max_migration_prompt" = true
@@ -156,6 +159,11 @@ last_updated = "2026-04-21T17:43:57Z"
 source_type = "local"
 source = "/Users/kat/.codex/.tmp/bundled-marketplaces/openai-bundled"
 
+[marketplaces.openai-primary-runtime]
+last_updated = "2026-04-25T23:49:36Z"
+source_type = "local"
+source = "/Users/kat/.cache/codex-runtimes/codex-primary-runtime/plugins/openai-primary-runtime"
+
 [plugins."google-calendar@openai-curated"]
 enabled = true
 
@@ -171,5 +179,20 @@ enabled = true
 [plugins."computer-use@openai-bundled"]
 enabled = true
 
+[plugins."documents@openai-primary-runtime"]
+enabled = true
+
+[plugins."spreadsheets@openai-primary-runtime"]
+enabled = true
+
+[plugins."presentations@openai-primary-runtime"]
+enabled = true
+
+[plugins."browser-use@openai-bundled"]
+enabled = true
+
+[plugins."vercel@openai-curated"]
+enabled = true
+
 [tui.model_availability_nux]
 "gpt-5.5" = 4

nix-darwin/flake.lock

@@ -319,11 +319,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1777159280,
+        "lastModified": 1777163228,
-        "narHash": "sha256-Ee14+tYJi5uKL912+99acc/ouWVhpHzrOjZuBQOGTmY=",
+        "narHash": "sha256-cJDlhBik9s65QyN55EAlKWUpFf86u8XNhDGU0Fb028A=",
         "owner": "colonelpanic8",
         "repo": "git-sync-rs",
-        "rev": "45ffa4301f740fa0193ecd5bc493ef1ffb4feb05",
+        "rev": "ab34487bc966a920d3c02798bba43f2a5951b12f",
         "type": "github"
       },
       "original": {

nix-darwin/flake.nix

@@ -114,7 +114,7 @@
             just
             git-lfs
             isort
-            gitFull
+            git
             gnused
             ncdu
             nixVersions.stable

nix-darwin/flake.nix.save

@@ -58,7 +58,7 @@
             just
             git-lfs
             isort
-            gitFull
+            git
             gnused
             ncdu
             nixFlakes
@@ -118,7 +118,7 @@
         emacs
         alejandra
         cocoapods
-        gitFull
+        git
         just
         tmux
         htop

nix-shared/overlays/default.nix

@@ -75,6 +75,10 @@ in
     dontCheckRuntimeDeps = true;
   });
 
+  direnv = prev.direnv.overrideAttrs (_: {
+    doCheck = false;
+  });
+
   magma = prev.magma.overrideAttrs (oldAttrs: {
     # The CUDA codegen step in magma 2.9.0 can segfault when `make generate`
     # fans out across all cores. Keep the rest of the build parallel.

nix-shared/system/essential.nix

@@ -4,9 +4,17 @@
   inputs,
   ...
 }: let
-  git-blame-rank = inputs.git-blame-rank.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  system = pkgs.stdenv.hostPlatform.system;
-  coqui-tts-streamer = inputs.coqui-tts-streamer.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  inputPackageOrNull = inputName: packageName: let
-  keepbook = inputs.keepbook.packages.${pkgs.stdenv.hostPlatform.system}.keepbook.overrideAttrs (_: {
+    input = inputs.${inputName} or null;
+    packages = if input == null then null else input.packages or null;
+    systemPackages = if packages == null then null else packages.${system} or null;
+  in
+    if systemPackages == null then null else systemPackages.${packageName} or null;
+
+  git-blame-rank = inputs.git-blame-rank.packages.${system}.default;
+  coquiTtsStreamer = inputPackageOrNull "coqui-tts-streamer" "default";
+  keepbook = inputs.keepbook.packages.${system}.keepbook.overrideAttrs (_: {
     # Upstream checks currently depend on TS artifacts that are not built in Nix.
     doCheck = false;
   });
@@ -20,7 +28,6 @@
     cachix
     bubblewrap
     cmake
-    coqui-tts-streamer
     dex
     direnv
     fd
@@ -33,7 +40,7 @@
     git-blame-rank
     git-lfs
     git-sync
-    gitFull
+    git
     gnumake
     home-manager
     htop
@@ -61,7 +68,9 @@
     wget
     xkcdpass
     yubikey-manager
-  ]) ++ lib.optionals (builtins.hasAttr "git-sync-rs" pkgs) [pkgs.git-sync-rs]);
+  ])
+  ++ lib.optionals (coquiTtsStreamer != null) [coquiTtsStreamer]
+  ++ lib.optionals (builtins.hasAttr "git-sync-rs" pkgs) [pkgs.git-sync-rs]);
 
   linuxOnly = with pkgs; [
     dex
@@ -80,6 +89,7 @@
     sshfs
     sysz
     gdb
+    gitFull
     udiskie
     usbutils
     tzupdate

nixos/flake.lock

@@ -628,11 +628,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1772717837,
+        "lastModified": 1777163228,
-        "narHash": "sha256-Q95ZH+Mr6dnSLLdy3vfX5l0cFal75bS1LI2IrN34sBQ=",
+        "narHash": "sha256-cJDlhBik9s65QyN55EAlKWUpFf86u8XNhDGU0Fb028A=",
         "owner": "colonelpanic8",
         "repo": "git-sync-rs",
-        "rev": "2fc9bddfedfa93ca600f4c21edbdc35e72b29d59",
+        "rev": "ab34487bc966a920d3c02798bba43f2a5951b12f",
         "type": "github"
       },
       "original": {

nixos/nix.nix

@@ -95,17 +95,7 @@
         (final: prev: {
           codex = inputs.codex-cli-nix.packages.${prev.stdenv.hostPlatform.system}.default;
           claude-code = inputs.claude-code-nix.packages.${prev.stdenv.hostPlatform.system}.default;
-          git-sync-rs = let
+          git-sync-rs = inputs.git-sync-rs.packages.${prev.stdenv.hostPlatform.system}.default;
-            base = inputs.git-sync-rs.packages.${prev.stdenv.hostPlatform.system}.default;
-          in
-            prev.symlinkJoin {
-              name = "${base.name}-wrapped";
-              paths = [base];
-              postBuild = ''
-                ln -s $out/bin/git-sync-rs $out/bin/git-sync-on-inotify
-                ln -s $out/bin/git-sync-rs $out/bin/git-sync
-              '';
-            };
         })
       ]
       ++ (