From aaf4d1e5a38e8aac565ba149690a3a87976c2010 Mon Sep 17 00:00:00 2001 From: Kaare Hoff Skovgaard Date: Thu, 7 Aug 2025 00:01:36 +0200 Subject: [PATCH] Get basic PoC up and running on mx.kaareskovgaard.net Now zpool-helper can create the zpool and datasets. But there's no reconsiliation of existing zpools and datasets. However everything gets encrypted as it should, and unlocked on boot. --- nix/modules/nixos/fs/zfs/default.nix | 5 ++--- nix/packages/zpool-setup/default.nix | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nix/modules/nixos/fs/zfs/default.nix b/nix/modules/nixos/fs/zfs/default.nix index 92bf4c9..557e2c9 100644 --- a/nix/modules/nixos/fs/zfs/default.nix +++ b/nix/modules/nixos/fs/zfs/default.nix @@ -12,11 +12,10 @@ let { name, value }: let enc = lib.strings.optionalString (!isTest) '' - + \ --encryption-key-mount=${lib.escapeShellArg value.encryptionKeyOpenbao.mount} \ --encryption-key-name=${lib.escapeShellArg value.encryptionKeyOpenbao.name} \ - --encryption-key-field=${lib.escapeShellArg value.encryptionKeyOpenbao.field} \ - ''; + --encryption-key-field=${lib.escapeShellArg value.encryptionKeyOpenbao.field}''; in '' ${zpoolSetup} setup ${enc} \ diff --git a/nix/packages/zpool-setup/default.nix b/nix/packages/zpool-setup/default.nix index 41eec54..af858f6 100644 --- a/nix/packages/zpool-setup/default.nix +++ b/nix/packages/zpool-setup/default.nix @@ -7,6 +7,8 @@ crateName = "zpool-setup"; replacePath = true; runtimeInputs = [ + pkgs.openbao + pkgs.uutils-coreutils-noprefix pkgs.zfs ]; }