Merge branch 'main' into feature/basic-iso

.envrc

@@ -1,3 +1,13 @@
 # reload when these files change
 watch_file shell/* flake.nix
 use flake || use nix
+
+#watch_file flake.nix
+#watch_file shell.nix
+#
+#{
+#  # shell gc root dir
+#  mkdir -p "$(direnv_layout_dir)"
+#
+#  eval "$(nix print-dev-env --profile $(direnv_layout_dir)/flake-profile)"
+#} || use nix

README.md

@@ -58,14 +58,15 @@ following giants][giants]:
 - [devshell](https://github.com/numtide/devshell)
 
 ## Divnix
-The divnix org is an open space that spontaniously formed out of "the Nix".
-It is really just a place where otherwise unrelated people a) get
-together and b) stuff done.
+The divnix org is an open space that spontaneously formed out of "the Nix".
+It is really just a place where otherwise unrelated people work
+together and get stuff done.
 
-It's a place to stop "geeking out in isolation" (or within company boundaries),
-experiment and learn together and iterate quickly on best practices. That's what it is.
+It's a place to stop "geeking out in isolation" (or within company boundaries).
+A place to experiment, learn together, and iterate quickly on best practices.
+That's what it is.
 
-It might eventually become a non-profit if that's not too complicated or if those
+It might eventually become a non-profit if that's not too complicated or, if those
 goals are sufficiently upstreamed into "the Nix", dissolved.
 
 # License

doc/secrets.md

@@ -14,7 +14,7 @@ to easily setup those secret files declaratively.
 [agenix][agenix] encrypts secrets and stores them as .age files in your repository.
 Age files are encrypted with multiple ssh public keys, so any host or user with a
 matching ssh private key can read the data. The [age module][age module] will add those
-encrypted files to the nix store and decrypt them on activation to `/run/secrets`.
+encrypted files to the nix store and decrypt them on activation to `/run/agenix`.
 
 ### Setup
 All hosts must have openssh enabled, this is done by default in the core profile.