From 863e9019ac6246f6f2fe4b6aebb69d052ef16fc4 Mon Sep 17 00:00:00 2001 From: lyrathorpe Date: Fri, 10 Jul 2026 11:37:03 +0100 Subject: [PATCH] memory: resolve MEMORY.md conflict (rebase onto main incl. nix-shell-tooling entry) --- home/claude/memory/MEMORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/home/claude/memory/MEMORY.md b/home/claude/memory/MEMORY.md index ebc89c5..d353a62 100644 --- a/home/claude/memory/MEMORY.md +++ b/home/claude/memory/MEMORY.md @@ -9,4 +9,5 @@ - [Review and comments workflow](workflow_review_and_comments.md) — show PR body and non-trivial Jira comments before posting; terse IaC code comments; PR body content rules - [Sandbox prompts](feedback_sandbox_prompts.md) — don't prompt for sandbox-disable or routine read-only shell ops; broaden permissions instead - [Dev clusters disposable](dev_clusters_disposable.md) — Lyra's dev clusters are recreatable; mutate/break freely, no confirmation needed +- [Nix shell tooling](nix_shell_tooling.md) — any nixpkgs tool runs ad hoc via `nix run`/`nix shell nixpkgs#`; a missing command is never a dead end - [SIBO Workabout MX project](sibo_workabout_mx_scanner.md) — RE + barcode-inventory project state; scanner is an OO DYL object (oscanner), blocked on on-device ordinal capture; resume via code/inventory/CONTINUATION.md