From e9146a4e4d6911102f1c82bf475bf4aeb19ce124 Mon Sep 17 00:00:00 2001 From: imbytecat Date: Fri, 10 Apr 2026 23:59:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E4=B8=8E=E4=BB=A3=E7=A0=81=E4=B8=AD=E7=9A=84=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=92=8C=E5=AE=89=E8=A3=85=E5=99=A8=E6=8E=A8?= =?UTF-8?q?=E8=8D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - AGENTS.md: 移除'README 还指向 Determinate'的过时描述 - fish.nix: rebuild/update 路径从 ~/.config 改为 ~/Developer - fish.nix: darwin rebuild 加 sudo - AGENTS.md: repo location 描述与实际一致 --- .sisyphus/ralph-loop.local.md | 4 +++- AGENTS.md | 4 ++-- home/shell/fish.nix | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.sisyphus/ralph-loop.local.md b/.sisyphus/ralph-loop.local.md index f643e13..84c7e5d 100644 --- a/.sisyphus/ralph-loop.local.md +++ b/.sisyphus/ralph-loop.local.md @@ -2,11 +2,13 @@ active: true iteration: 2 max_iterations: 500 -completion_promise: "DONE" +completion_promise: "VERIFIED" initial_completion_promise: "DONE" +verification_attempt_id: "8bd02d34-4ca9-4686-b3ad-ae8a2330ad40" started_at: "2026-04-10T15:43:59.279Z" session_id: "ses_28863d32affeOW6Iiz2415uZSk" ultrawork: true +verification_pending: true strategy: "continue" message_count_at_start: 169 --- diff --git a/AGENTS.md b/AGENTS.md index aa887ca..44d39ca 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -22,12 +22,12 @@ flake.nix ## Critical gotchas -- **Determinate Nix on macOS (tech debt)**: macOS currently runs Determinate Nix (commercial downstream). `modules/shared/nix.nix` sets `nix.enable = !pkgs.stdenv.isDarwin` — on darwin, nix-darwin does NOT manage: nix daemon, `/etc/nix/nix.conf`, nix version, `nix.settings`. All nix configuration on macOS is controlled by Determinate's `determinate-nixd`. The `nix.settings` block (flakes, warn-dirty) only applies on NixOS/WSL. **nix-darwin officially recommends Lix installer (not Determinate) as of 2025-12.** Migration to Lix would restore `nix.enable = true` and unified `nix.settings` across all 3 devices. README still references `install.determinate.systems` — update if/when migrating. +- **Determinate Nix on macOS (tech debt)**: macOS currently runs Determinate Nix (commercial downstream). `modules/shared/nix.nix` sets `nix.enable = !pkgs.stdenv.isDarwin` — on darwin, nix-darwin does NOT manage: nix daemon, `/etc/nix/nix.conf`, nix version, `nix.settings`. All nix configuration on macOS is controlled by Determinate's `determinate-nixd`. The `nix.settings` block (flakes, warn-dirty) only applies on NixOS/WSL. **nix-darwin officially recommends Lix installer (not Determinate) as of 2025-12.** README already updated to recommend Lix for new installs. Migration to Lix would restore `nix.enable = true` and unified `nix.settings` across all 3 devices. - **catppuccin.nvim disabled**: `catppuccin.nvim.enable = false` in `home/theme.nix` due to `catppuccin.lib.detect_integrations` require check failure in nixpkgs. Re-test periodically. - **catppuccin module name**: Uses `catppuccin.homeModules.catppuccin` (not the old `homeManagerModules`). - **Homebrew tap casks**: Casks from taps need full path in the casks list (e.g. `"goooler/repo/fl-clash"`), not just the short name. - **`onActivation.cleanup = "zap"`**: Any brew formula/cask NOT declared in `modules/darwin/default.nix` WILL be removed on rebuild. Be comprehensive. -- **Repo location**: The repo lives at `~/Developer/nix-config`, NOT `~/.config/nix-config`. The `rebuild` fish abbreviation references `~/.config/nix-config` — symlink or update if needed. +- **Repo location**: The repo lives at `~/Developer/nix-config`. Fish abbreviations (`rebuild`, `update`) reference this path. - **First-time bootstrap requires sudo**: `sudo nix run nix-darwin -- switch --flake .#mac-mini` (not `darwin-rebuild` which doesn't exist yet). ## Commands diff --git a/home/shell/fish.nix b/home/shell/fish.nix index 472b37d..cde8d10 100644 --- a/home/shell/fish.nix +++ b/home/shell/fish.nix @@ -25,7 +25,7 @@ http = "xh"; # Nix - update = "nix flake update --flake ~/.config/nix-config"; + update = "nix flake update --flake ~/Developer/nix-config"; }; interactiveShellInit = '' @@ -43,9 +43,9 @@ # Platform-specific rebuild command if test (uname) = Darwin - abbr --add rebuild "darwin-rebuild switch --flake ~/.config/nix-config" + abbr --add rebuild "sudo darwin-rebuild switch --flake ~/Developer/nix-config" else - abbr --add rebuild "sudo nixos-rebuild switch --flake ~/.config/nix-config" + abbr --add rebuild "sudo nixos-rebuild switch --flake ~/Developer/nix-config" end # WSL clipboard