From d98be4eea538513867ede7a60e1b454551cb89ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Tue, 12 Dec 2023 20:59:31 +0100
Subject: [PATCH] Fix to curacao partition scheme

---
 curacao/dk.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/curacao/dk.nix b/curacao/dk.nix
index 219fc52..2a66f7d 100644
--- a/curacao/dk.nix
+++ b/curacao/dk.nix
@@ -1,7 +1,5 @@
 { passwordFile ? "/should_not_be_needed_in_this_context", ... }:
 # FIXME Subvolumes for backup. If they're not created with the script. Add the script btw.
-# FIXME Add partlabels to the partitions so disko can mount them
-# FIXME Test. Somehow.
 # FIXME Make it work for NixOS, duh
 # TODO Not relatime everywhere, thank you
 # TODO Default options
@@ -23,8 +21,7 @@ in
         content = {
           type = "gpt";
           partitions = {
-            razswap = {
-              # Currently without partlabel
+            swap = {
               priority = 1;
               start = "2048";
               size = "8G";
@@ -41,8 +38,7 @@ in
                 # Untranslated options from /etc/fstab: defaults,pri=100
               };
             };
-            razesp = {
-              # Currently without partlabel
+            esp = {
               priority = 2;
               size = "128M";
               type = "EF00"; # EFI system partition
@@ -64,8 +60,7 @@ in
                 ];
               };
             };
-            razboot = {
-              # Currently without partlabel
+            boot = {
               priority = 3;
               size = "128M";
               content = {
@@ -80,6 +75,7 @@ in
                 content = {
                   type = "filesystem";
                   format = "ext2";
+                  mountpoint = "/boot";
                   mountOptions = [
                     "rw"
                     "relatime"
@@ -88,8 +84,7 @@ in
                 };
               };
             };
-            razmo = {
-              # Currently without partlabel
+            main = {
               priority = 4;
               content = {
                 type = "luks";
@@ -121,8 +116,7 @@ in
         content = {
           type = "gpt";
           partitions = {
-            rapswap = {
-              # Currently without partlabel
+            swap = {
               priority = 1;
               start = "2048";
               size = "8G";
@@ -142,8 +136,7 @@ in
                 };
               };
             };
-            rapido = {
-              # Currently without partlabel
+            main = {
               priority = 2;
               content = {
                 type = "luks";