From c1c4641509c659e98194bf1f7dd77523a47dea8b Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Mon, 12 Feb 2024 01:20:19 +0100
Subject: [PATCH] Update EDI layout on disk to put swap in LUKS

---
 disko/EDI/configuration.nix | 42 ++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/disko/EDI/configuration.nix b/disko/EDI/configuration.nix
index 7af587c..592e690 100644
--- a/disko/EDI/configuration.nix
+++ b/disko/EDI/configuration.nix
@@ -19,35 +19,29 @@
                 ];
               };
             };
-            encryptedSwap = {
-              size = "20M";
-              content = {
-                type = "swap";
-                randomEncryption = true;
+          };
+          luks = {
+            size = "100%";
+            content = {
+              type = "luks";
+              name = "crypted";
+              # disable settings.keyFile if you want to use interactive password entry
+              #passwordFile = "/tmp/secret.key"; # Interactive
+              settings = {
+                allowDiscards = true;
+                #keyFile = "/tmp/secret.key";
               };
-            };
-            plainSwap = {
-              size = "4G";
+              #additionalKeyFiles = ["/tmp/additionalSecret.key"];
               content = {
-                type = "swap";
-                resumeDevice = true; # resume from hiberation from this device
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "crypted";
-                # disable settings.keyFile if you want to use interactive password entry
-                #passwordFile = "/tmp/secret.key"; # Interactive
-                settings = {
-                  allowDiscards = true;
-                  #keyFile = "/tmp/secret.key";
+                swap = {
+                  type = "swap";
+                  size = "4G";
+                  resumeDevice = true; # resume from hiberation from this device
                 };
-                #additionalKeyFiles = ["/tmp/additionalSecret.key"];
-                content = {
+                root = {
                   type = "filesystem";
                   format = "bcachefs";
+                  size = "100%";
                   mountpoint = "/";
                 };
               };