Skip to content

Converge on the org flake standard - #4

Merged
andrewthomaslee merged 1 commit into
mainfrom
claude/project-thread-mh70vg
Oct 31, 2026
Merged

andrewthomaslee merged 1 commit into
mainfrom
claude/project-thread-mh70vg

Conversation

@andrewthomaslee

Copy link
Copy Markdown
Member

Requested by Andrew · project thread

Brings presenting to the org flake standard (nix-style skill, pkgs template).

Changes

  • Inputs: org-pkgs; nixpkgs (was its own nixos-26.05 pin), flake-parts, import-tree follow it. mkdocs-flake and reveal-js stay at the root because the exports need them (mkdocs-flake's follows now nested, per the nesting rule).
  • Dev partition: dev/flake.nix + dev/flake.lock (dev-nixpkgs, treefmt-nix; no presenting input, the repo uses its own module). dev/flake-module.nix imports org-pkgs.flakeModules.dev: checks.treefmt replaces the lint check and formatter = pkgs.alejandra; adds lock-sync and apps.sync-locks.
  • Own docs + deck move into the partition: documentation/flake-module.nix imports self.flakeModules.default (still eats its own cooking). packages.documentation/slides become legacyPackages in dev, so nix build .#documentation and the Pages workflow keep working. slides/ → documentation/slides/; mkdocs.yml gets the org settings (dev_addr 8981, use_directory_urls: false, offline), and the presentation page's iframe path follows.
  • flake-parts/default.nix and checks.nix removed (their content moved above); flake-parts/template.nix stays.
  • Flake devShells dropped; devenv CLI shell (devenv.yaml imports org-pkgs/devenv, pinned with the lock).
  • systems: x86_64-linux and aarch64-linux. debug = true and .vscode/ nixd settings. AGENTS.md; README and docs pages updated (layout, commands, ports).

Consumers

lib (mkSlides), flakeModules (default, slides) and templates.default are unchanged (compared on both trees). A scratch consumer flake importing flakeModules.default builds docs with the embedded deck. The consumer README snippet (nixpkgs/flake-parts follows) still applies. Consumers' dev locks will gain presenting's org-pkgs node on their next nix flake update presenting.

Main lock

Added: org-pkgs (+ its nixpkgs, flake-parts, import-tree). treefmt-nix lives only in dev/flake.lock.

Verification

  • nix fmt: 0 changes. nix flake check: exit 0, checks documentation lock-sync slides treefmt. nix build .#documentation produces the site with slides/.
  • The dev partition was checked in a scratch copy with seeded store paths (this session blocks third-party GitHub tarballs); dev/flake.lock was assembled from the same locked revs as the other org dev locks and nix flake lock ./dev accepts it unchanged. devenv shell not runnable here.

Generated by Claude Code

- Inputs: org-pkgs; nixpkgs (was nixos-26.05), flake-parts and
  import-tree follow it. mkdocs-flake and reveal-js stay at the root:
  the exports need them.
- Dev partition with its own inputs (dev/flake.nix, dev/flake.lock:
  dev-nixpkgs, treefmt-nix) importing org-pkgs flakeModules.dev:
  checks.treefmt replaces the lint check and pkgs.alejandra formatter;
  adds lock-sync and sync-locks. This repo's docs and deck move into the
  partition (documentation/flake-module.nix imports
  self.flakeModules.default), exposed as legacyPackages so
  `nix build .#documentation` still works.
- Drop the flake devShell; devenv CLI shell (org-pkgs/devenv).
- slides/ moves to documentation/slides; mkdocs.yml gets the org
  settings (dev_addr 8981, use_directory_urls false, offline).
- systems: x86_64-linux and aarch64-linux. debug = true and .vscode nixd
  settings. AGENTS.md; README and docs updated.

lib, flakeModules and templates are unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01E5NrkgRkUQCo4RecQu5LUr
@andrewthomaslee andrewthomaslee self-assigned this Oct 31, 2026
@andrewthomaslee
andrewthomaslee merged commit 5b1b5ae into main Oct 31, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants