From 950e2514a7194749273ec8a2c193ad7f170b0851 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Sun, 20 Oct 2024 17:40:44 +0200
Subject: [PATCH] bakke: Update disk layout

---
 hosts/bakke/disks.nix       | 8 --------
 hosts/bakke/filesystems.nix | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/hosts/bakke/disks.nix b/hosts/bakke/disks.nix
index 08a2c98..3420a85 100644
--- a/hosts/bakke/disks.nix
+++ b/hosts/bakke/disks.nix
@@ -8,10 +8,6 @@
         content = {
           type = "gpt";
           partitions = {
-            BOOT = {
-              size = "1M";
-              type = "EF02"; # for grub MBR
-            };
             ESP = {
               size = "500M";
               type = "EF00";
@@ -36,10 +32,6 @@
         content = {
           type = "gpt";
           partitions = {
-            boot = {
-              size = "1M";
-              type = "EF02"; # for grub MBR
-            };
             ESP = {
               size = "500M";
               type = "EF00";
diff --git a/hosts/bakke/filesystems.nix b/hosts/bakke/filesystems.nix
index 8648924..5bb1172 100644
--- a/hosts/bakke/filesystems.nix
+++ b/hosts/bakke/filesystems.nix
@@ -2,8 +2,9 @@
 {
   # Boot drives:
   imports = [
-    ./boot-disks.nix
+    ./disks.nix
   ];
+  boot.swraid.enable = true;
 
   # ZFS Data pool:
   environment.systemPackages = with pkgs; [ zfs ];