From 5e1a871c7e34f26203ceffe62064042c1c69ad2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 21 May 2023 21:12:56 +0200
Subject: [PATCH] disko: fix zfs mountpoints

---
 modules/disko.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/disko.nix b/modules/disko.nix
index d1975e4a..76957a25 100644
--- a/modules/disko.nix
+++ b/modules/disko.nix
@@ -138,6 +138,7 @@ in
             datasets =
               let
                 dataset = mountpoint: {
+                  inherit mountpoint;
                   options = {
                     canmount = "on";
                     compression = "zstd";
@@ -158,7 +159,8 @@ in
                 "data/var/backup" = dataset "/var/backup";
                 "data/var/lib" = dataset "/var/lib";
                 "data/var/log" = dataset "/var/log";
-                "nixos" = {
+                "nixos" = lib.recursiveUpdate (dataset "nixos") {
+                  mountpoint = null;
                   options = {
                     canmount = "off";
                     mountpoint = "none";
@@ -166,17 +168,13 @@ in
                   type = "zfs_fs";
                 };
                 "nixos/nix" = dataset "/nix";
-                "nixos/nix/store" = {
-                  options = {
-                    atime = "off";
-                    canmount = "on";
-                    mountpoint = "/nix/store";
-                  };
-                  type = "zfs_fs";
+                "nixos/nix/store" = lib.recursiveUpdate (dataset "nixos/nix/store") {
+                  options.atime = "off";
                 };
                 "nixos/nix/var" = dataset "/nix/var";
-                "reserved" = {
-                  # zfs uses copy on write and requires some free space to delete files when the disk is completely filled
+                # zfs uses copy on write and requires some free space to delete files when the disk is completely filled
+                "reserved" = lib.recursiveUpdate (dataset "reserved") {
+                  mountpoint = null;
                   options = {
                     canmount = "off";
                     mountpoint = "none";