@@ -27,30 +27,26 @@
   sudo ~/git/dot/tools/backup-to-sata
   ```
 
-- [ ] Let the Mac log in as root, which nixos-anywhere needs. Paste the Mac's
-      public key (`cat ~/.ssh/id_ed25519.pub` on the Mac) into:
-
-  ```bash
-  sudo install -d -m700 /root/.ssh && sudo nano /root/.ssh/authorized_keys
-  ```
-
 ## 2. On the Mac
 
 Needs Nix (with flakes) and the GitHub CLI signed in to your account: `dot`
 and `philly` are private, and `gh auth setup-git` lets Nix fetch them. The
 Mac's public key must also be in `macKeys` in `hosts/desktop/default.nix`
-(committed and pushed), so it can still log in after the install.
+(committed and pushed), so it can log in to the new system.
 
 ```bash
 gh auth setup-git
 gh repo clone Eiziv/dot ~/dot
+cd ~/dot && nix develop
 ```
 
-Check from the Mac that `ssh root@10.0.0.40` logs in. Then install. **This wipes
-the desktop's NVMe drive** without asking again:
+`nix develop` opens a shell with nixos-anywhere in it. Then install. It logs
+in as you (with your password, or the Mac's key if CachyOS has it), asks for
+your sudo password once, and from then on **wipes the desktop's NVMe drive**
+without asking again:
 
 ```bash
-nix run github:nix-community/nixos-anywhere -- --flake ~/dot#desktop --build-on remote --copy-host-keys --no-use-machine-substituters root@10.0.0.40
+nixos-anywhere --flake .#desktop --build-on remote --copy-host-keys --no-use-machine-substituters vizie@10.0.0.40
 ```
 
 It takes a while: the CachyOS kernel's binary cache has been down, so the
@@ -98,6 +98,9 @@
 generic x86-64 builds outside the kernel and Proton. The difference in games is
 small.
 
+`nix develop` opens a shell with nixos-anywhere and nixfmt, on this machine or
+the Mac.
+
 ## Testing in a VM
 
 ```bash
@@ -66,6 +66,24 @@
         modules = [ ./hosts/desktop ];
       };
 
+      # Tools for working on this repo, here and on the MacBook:
+      #   nix develop
+      devShells = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-darwin" ] (
+        shellSystem:
+        let
+          shellPkgs = nixpkgs.legacyPackages.${shellSystem};
+        in
+        {
+          default = shellPkgs.mkShellNoCC {
+            packages = [
+              # Installs the desktop over SSH (MIGRATION.md).
+              shellPkgs.nixos-anywhere
+              shellPkgs.nixfmt
+            ];
+          };
+        }
+      );
+
       formatter.${system} = pkgs.nixfmt;
     };
 }
		`@@ -27,30 +27,26 @@`
27	27	`sudo ~/git/dot/tools/backup-to-sata`
28	28	```
29	29
30		`-- [ ] Let the Mac log in as root, which nixos-anywhere needs. Paste the Mac's`
31		- public key (`cat ~/.ssh/id_ed25519.pub` on the Mac) into:
32		`-`
33		- ```bash
34		`- sudo install -d -m700 /root/.ssh && sudo nano /root/.ssh/authorized_keys`
35		- ```
36		`-`
37	30	`## 2. On the Mac`
38	31
39	32	Needs Nix (with flakes) and the GitHub CLI signed in to your account: `dot`
40	33	and `philly` are private, and `gh auth setup-git` lets Nix fetch them. The
41	34	Mac's public key must also be in `macKeys` in `hosts/desktop/default.nix`
42		`-(committed and pushed), so it can still log in after the install.`
	35	`+(committed and pushed), so it can log in to the new system.`
43	36
44	37	```bash
45	38	`gh auth setup-git`
46	39	`gh repo clone Eiziv/dot ~/dot`
	40	`+cd ~/dot && nix develop`
47	41	```
48	42
49		-Check from the Mac that `ssh root@10.0.0.40` logs in. Then install. **This wipes
50		`-the desktop's NVMe drive** without asking again:`
	43	+`nix develop` opens a shell with nixos-anywhere in it. Then install. It logs
	44	`+in as you (with your password, or the Mac's key if CachyOS has it), asks for`
	45	`+your sudo password once, and from then on wipes the desktop's NVMe drive`
	46	`+without asking again:`
51	47
52	48	```bash
53		`-nix run github:nix-community/nixos-anywhere -- --flake ~/dot#desktop --build-on remote --copy-host-keys --no-use-machine-substituters root@10.0.0.40`
	49	`+nixos-anywhere --flake .#desktop --build-on remote --copy-host-keys --no-use-machine-substituters vizie@10.0.0.40`
54	50	```
55	51
56	52	`It takes a while: the CachyOS kernel's binary cache has been down, so the`
		`@@ -98,6 +98,9 @@`
98	98	`generic x86-64 builds outside the kernel and Proton. The difference in games is`
99	99	`small.`
100	100
	101	+`nix develop` opens a shell with nixos-anywhere and nixfmt, on this machine or
	102	`+the Mac.`
	103	`+`
101	104	`## Testing in a VM`
102	105
103	106	```bash
		`@@ -66,6 +66,24 @@`
66	66	`modules = [ ./hosts/desktop ];`
67	67	`};`
68	68
	69	`+ # Tools for working on this repo, here and on the MacBook:`
	70	`+ # nix develop`
	71	`+ devShells = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-darwin" ] (`
	72	`+ shellSystem:`
	73	`+ let`
	74	`+ shellPkgs = nixpkgs.legacyPackages.${shellSystem};`
	75	`+ in`
	76	`+ {`
	77	`+ default = shellPkgs.mkShellNoCC {`
	78	`+ packages = [`
	79	`+ # Installs the desktop over SSH (MIGRATION.md).`
	80	`+ shellPkgs.nixos-anywhere`
	81	`+ shellPkgs.nixfmt`
	82	`+ ];`
	83	`+ };`
	84	`+ }`
	85	`+ );`
	86	`+`
69	87	`formatter.${system} = pkgs.nixfmt;`
70	88	`};`
71	89	`}`