From 254019c5ee5765d63823332b7d1e0e59c0a2899a Mon Sep 17 00:00:00 2001
From: Nicole Dresselhaus <nicole.dresselhaus@hu-berlin.de>
Date: Wed, 11 Jun 2025 09:22:08 +0200
Subject: [PATCH] chore: create persistent mountpoints

---
 disko.nix  |  8 ++++++-
 flake.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 flake.lock

diff --git a/disko.nix b/disko.nix
index 079927d..4539387 100644
--- a/disko.nix
+++ b/disko.nix
@@ -14,8 +14,10 @@
             size = "512M"; type = "EF00";
             content = {
               type       = "filesystem";
-              format     = "fat32";
+              format     = "vfat";
+              extraArgs   = [ "-F32" ];
               mountpoint = "/boot";
+              mountpointCreate = true;
             };
           };
           rpool = {
@@ -37,16 +39,19 @@
         root = {
           type       = "zfs_fs";
           mountpoint = "/";
+          mountpointCreate = true;
           options.compression = "zstd";
         };
         nix = {
           type       = "zfs_fs";
           mountpoint = "/nix";
+          mountpointCreate = true;
           options.compression = "zstd";
         };
         home = {
           type       = "zfs_fs";
           mountpoint = "/home";
+          mountpointCreate = true;
           options.compression = "zstd";
         };
       };
@@ -58,6 +63,7 @@
       datasets.media = {
         type       = "zfs_fs";
         mountpoint = "/tank";
+        mountpointCreate = true;
         options.compression = "zstd";
       };
     };
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..6a84dc3
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,64 @@
+{
+  "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749436314,
+        "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1749195551,
+        "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1749494155,
+        "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "88331c17ba434359491e8d5889cce872464052c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "disko": "disko",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}