feat(zfs): manage jeeves datasets declaratively from nix #47

Open

Richie wants to merge 2 commits from feature/manage-jeeves-datasets-declaratively-from-nix into main

pull from: feature/manage-jeeves-datasets-declaratively-from-nix

merge into: :main

:main

:automation/update-flake-lock

:feature/reducing-text-exclusions

:feature/configuring-builders-for-x86-64-v3

:feature/manage-jeeves-datasets-declaratively-from-nix

:feature/Implement-authentication-system-with-WebAuthn-and-password-fallback

:feature/adding-tortoise

:bugfix/fixing-update-flake-lock.yaml-permissions

:feature/adding-qwen3.6-27b

:update_flake_lock_action

:feature/removing-brain_substituter.nix-from-bob

:feature/creating-prompt_bench

:claude/add-line-counter-tool-zaW28

:feature/setting-up-bluesky-firehose

:claude/sheet-music-ocr-mxml-4OGMU

:feature/adding-congress-data-to-database

:claude/improve-code-coverage-aW1aD

:claude/implement-todo-item-w2KGe

:feature/adding-open_webui-to-jeeves

:feature/testing-unshare

:bugfix/fixed-energy-out-integrations

:feature/adding-fix_eval_warnings.yml

:feature/building-safe_reboot

:feature/fixing-jeeves-locked-linux-firmware-and-6.12.52

:feature/adding-cool-tools

:feature/adding-xf86_input_wacom

:feature/adding-making-esphome-battery-more-stable

:feature/linux-6.17

:bugfix/added-math-the-jeeves

:feature/improving-treefmt-action-debugging

:feature/added-merge_group

:feature/testing-merge_group

:feature/removing-auto-update

:feature/linux-6.15

:feature/setting-up-unifi-video-archiving

:feature/updating-system_tools

:feature/decreasing-cloud-flair-usage

:feature/creating-a-custom-installer-iso

:feature/setting-up-mxr-deploment

:feature/adding-system-for-brendan

:feature/testing-microvm

:feature/testing-cosmic

:feature/building-nixos-based-router

:feature/setting-up-transmission

:feature/improving-muninns-bluetooth

:intresting-error

:feature/setting-up-keyFile-for-muninn

:feature/setting-up-cleves-for-muninn

:feature/testing-tang-and-clevis

:feature/testing-nixos-router

:updating-bobs-zfs-settings

Conversation 0 Commits 2 Files Changed 15

+1626 -174

Richie commented 2026-07-27 23:38:05 -04:00

Owner

Copy Link

Copy Source

Add a zfs_manager module that reconciles the live datasets on jeeves
against a nix declaration, and generate the snapshot retention config
from that same declaration so the two can no longer drift apart.

systems/jeeves/datasets.nix declares every dataset on the media, storage
and scratch pools, nested the way zfs nests them and flattened into
pool/parent/child names. Values were transcribed from the live pools
rather than from scripts/zfs.sh, which had gone stale: acltype reads back
as posix, and media/secure/important, scratch/kestra and storage/nomad
were never recorded. root_pool datasets are declared for retention only,
their properties stay unmanaged for now.

python.tools.zfs_manager creates missing datasets and corrects drifted
properties, and never destroys anything. Undeclared properties are judged
by the zfs source field, so inherited and default values stay quiet while
locally set ones warn. Size values are normalised to bytes so that 16K and
16384 do not re-issue zfs set on every run.

vars.nix now derives its paths from the declared mountpoints instead of
repeating them, dropping three zfs_* keys that nothing referenced.

Replaces systems/jeeves/snapshot_config.toml, which listed a dataset that
does not exist and omitted thirteen that do.

Add a zfs_manager module that reconciles the live datasets on jeeves against a nix declaration, and generate the snapshot retention config from that same declaration so the two can no longer drift apart. systems/jeeves/datasets.nix declares every dataset on the media, storage and scratch pools, nested the way zfs nests them and flattened into pool/parent/child names. Values were transcribed from the live pools rather than from scripts/zfs.sh, which had gone stale: acltype reads back as posix, and media/secure/important, scratch/kestra and storage/nomad were never recorded. root_pool datasets are declared for retention only, their properties stay unmanaged for now. python.tools.zfs_manager creates missing datasets and corrects drifted properties, and never destroys anything. Undeclared properties are judged by the zfs source field, so inherited and default values stay quiet while locally set ones warn. Size values are normalised to bytes so that 16K and 16384 do not re-issue zfs set on every run. vars.nix now derives its paths from the declared mountpoints instead of repeating them, dropping three zfs_* keys that nothing referenced. Replaces systems/jeeves/snapshot_config.toml, which listed a dataset that does not exist and omitted thirteen that do.

Richie force-pushed feature/manage-jeeves-datasets-declaratively-from-nix from ae18feb0fd to aa552ecca1 2026-08-19 20:14:24 -04:00 Compare

Richie force-pushed feature/manage-jeeves-datasets-declaratively-from-nix from aa552ecca1 to 45479c7d33 2026-08-19 22:11:38 -04:00 Compare

Richie added 2 commits 2026-08-19 22:17:38 -04:00

Implement ZFS dataset management and snapshot configuration ... 0398e5e878

- Introduced a new `datasets.nix` file to define ZFS datasets and their properties, allowing for centralized management of dataset configurations.
- Updated `default.nix` to import and enable the `zfs_manager` service, integrating it into the system configuration.
- Refactored `zfs.sh` to remove dataset creation commands, delegating dataset management to the `zfs_manager` service.
- Removed the legacy `snapshot_config.toml` file, as snapshot configurations are now handled within `datasets.nix`.
- Modified `vars.nix` to derive mountpoint paths from `datasets.nix`, ensuring consistency across the configuration.
- Created a new `zfs.nix` file to define the `zfs_manager` service and its dependencies.
- Added comprehensive tests for the `zfs_manager` functionality, covering dataset creation, property management, and error handling.

feat(zfs): add declarative management for ZFS datasets and integration tests ef4ebc6cdf

Richie force-pushed feature/manage-jeeves-datasets-declaratively-from-nix from 45479c7d33 to ef4ebc6cdf 2026-08-19 22:17:38 -04:00 Compare

All checks were successful

Hide all checks

treefmt / nix fmt (pull_request) Successful in 5s

Details

pytest / pytest (pull_request) Successful in 31s

Details

test ebook search / test-ebook-search (pull_request) Successful in 36s

Details

build_systems / build-brain (pull_request) Successful in 49s

Details

build_systems / build-bob (pull_request) Successful in 49s

Details

build_systems / build-rhapsody-in-green (pull_request) Successful in 1m2s

Details

zfs integration / zfs-integration (pull_request) Successful in 1m9s

Details

build_systems / build-jeeves (pull_request) Successful in 2m18s

Details

Checking for merge conflicts…

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin feature/manage-jeeves-datasets-declaratively-from-nix:feature/manage-jeeves-datasets-declaratively-from-nix

git checkout feature/manage-jeeves-datasets-declaratively-from-nix

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

automated

bug

Something is not working

dependencies

duplicate

This issue or pull request already exists

enhancement

New feature

flake_lock_update

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

jeeves-bot Richie

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Richie/dotfiles#47