From 898cc97a9c1e757edc77cd0060db690ab087109a Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <cullmann@kde.org>
Date: Wed, 29 May 2024 22:13:47 +0200
Subject: [PATCH] more zfs preparations

---
 README.md        | 29 +++++++++++++++++++++
 mini/install.txt | 23 -----------------
 neko/install.txt | 66 +-----------------------------------------------
 3 files changed, 30 insertions(+), 88 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5a20751
--- /dev/null
+++ b/README.md
@@ -0,0 +1,29 @@
+# build unstable installer
+
+{
+  description = "installation media";
+  inputs.nixos.url = "nixpkgs/nixos-unstable";
+  outputs = { self, nixos }: {
+    nixosConfigurations = {
+      exampleIso = nixos.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          "${nixos}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
+        ];
+      };
+    };
+  };
+}
+
+git init
+git add flake.nix
+nix --extra-experimental-features flakes --extra-experimental-features nix-command build .#nixosConfigurations.exampleIso.config.system.build.isoImage
+
+sudo dd if=result/iso/nixos-24.05.20240108.317484b-x86_64-linux.iso of=/dev/sda bs=4M conv=fsync
+
+# good ZFS links
+
+- https://openzfs.github.io/openzfs-docs/Getting%20Started/NixOS/Root%20on%20ZFS.html
+- https://carjorvaz.com/posts/installing-nixos-with-root-on-tmpfs-and-encrypted-zfs-on-a-netcup-vps/
+- https://astrid.tech/2021/12/17/0/two-disk-encrypted-zfs/
+- https://mzhang.io/posts/2022-05-09-installing-nixos-on-encrypted-zfs/
diff --git a/mini/install.txt b/mini/install.txt
index 2c834c0..849ac9e 100644
--- a/mini/install.txt
+++ b/mini/install.txt
@@ -1,26 +1,3 @@
-# build unstable installer
-
-{
-  description = "installation media";
-  inputs.nixos.url = "nixpkgs/nixos-unstable";
-  outputs = { self, nixos }: {
-    nixosConfigurations = {
-      exampleIso = nixos.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          "${nixos}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix"
-        ];
-      };
-    };
-  };
-}
-
-git init
-git add flake.nix
-nix --extra-experimental-features flakes --extra-experimental-features nix-command build .#nixosConfigurations.exampleIso.config.system.build.isoImage
-
-sudo dd if=result/iso/nixos-24.05.20240108.317484b-x86_64-linux.iso of=/dev/sda bs=4M conv=fsync
-
 #
 # enable ssh for root
 #
diff --git a/neko/install.txt b/neko/install.txt
index 66da359..9b47a76 100644
--- a/neko/install.txt
+++ b/neko/install.txt
@@ -1,33 +1,3 @@
-# build unstable installer
-
-{
-  description = "installation media";
-  inputs.nixos.url = "nixpkgs/nixos-unstable";
-  outputs = { self, nixos }: {
-    nixosConfigurations = {
-      exampleIso = nixos.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          "${nixos}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix"
-        ];
-      };
-    };
-  };
-}
-
-git init
-git add flake.nix
-nix --extra-experimental-features flakes --extra-experimental-features nix-command build .#nixosConfigurations.exampleIso.config.system.build.isoImage
-
-sudo dd if=result/iso/nixos-24.05.20240108.317484b-x86_64-linux.iso of=/dev/sda bs=4M conv=fsync
-
-# good ZFS links
-
-https://openzfs.github.io/openzfs-docs/Getting%20Started/NixOS/Root%20on%20ZFS.html
-https://carjorvaz.com/posts/installing-nixos-with-root-on-tmpfs-and-encrypted-zfs-on-a-netcup-vps/
-https://astrid.tech/2021/12/17/0/two-disk-encrypted-zfs/
-https://mzhang.io/posts/2022-05-09-installing-nixos-on-encrypted-zfs/
-
 #
 # enable ssh for root
 #
@@ -157,7 +127,7 @@ nixos-install --option experimental-features 'nix-command flakes' --no-root-pass
 # unmount all stuff
 
 umount -Rl /data /mnt
-cryptsetup luksClose crypt-system
+zpool export -a
 
 # sync all /data after the install
 
@@ -180,23 +150,6 @@ wipefs -a $DD
 
 sleep 5
 
-# create the crypto containers
-cryptsetup luksFormat --batch-mode --verify-passphrase $DD
-
-sleep 5
-
-# open them, set right options persistently
-cryptsetup luksOpen --allow-discards --perf-no_read_workqueue --perf-no_write_workqueue --persistent $DD crypt-vms
-
-sleep 5
-lsblk --fs
-
-# create btrfs with fast & strong checksumming and fast mounting
-mkfs.btrfs -f --csum xxhash --features block-group-tree /dev/mapper/crypt-vms
-
-sleep 5
-btrfs filesystem show
-
 # create projects disk
 
 DD=/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S69ENF0R846614L
@@ -205,20 +158,3 @@ blkdiscard -v $DD
 wipefs -a $DD
 
 sleep 5
-
-# create the crypto containers
-cryptsetup luksFormat --batch-mode --verify-passphrase $DD
-
-sleep 5
-
-# open them, set right options persistently
-cryptsetup luksOpen --allow-discards --perf-no_read_workqueue --perf-no_write_workqueue --persistent $DD crypt-projects
-
-sleep 5
-lsblk --fs
-
-# create btrfs with fast & strong checksumming and fast mounting
-mkfs.btrfs -f --csum xxhash --features block-group-tree /dev/mapper/crypt-projects
-
-sleep 5
-btrfs filesystem show