From 1430bf9d6d39fbdf21b95e83b86cd93764dd2a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Thu, 14 Sep 2023 07:43:18 +0300
Subject: [PATCH] fwminex: swap

---
 hosts/fwminex/configuration.nix | 4 +---
 modules/base/boot/default.nix   | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 975c131..2192fe8 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -11,7 +11,7 @@
       bootDevices = ["nvme-Samsung_SSD_970_EVO_Plus_2TB_S6P1NS0TA01331A"];
       immutable = false;
       forceNoDev2305 = true;
-      availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" ];
+      availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usbhid"];
       removableEfi = true;
       partitionScheme = {
         efiBoot = "-part1";
@@ -71,7 +71,6 @@
         enable = true;
         email = "motiejus+alerts@jakstys.lt";
       };
-
     };
 
     services = {
@@ -97,7 +96,6 @@
         user = "motiejus";
         group = "users";
       };
-
     };
   };
 
diff --git a/modules/base/boot/default.nix b/modules/base/boot/default.nix
index 71e45cd..7e77c54 100644
--- a/modules/base/boot/default.nix
+++ b/modules/base/boot/default.nix
@@ -109,7 +109,9 @@ in {
           map (diskName: diskName + cfg.partitionScheme.efiBoot)
           cfg.bootDevices;
         swapPartitions =
-          map (diskName: diskName + cfg.partitionScheme.swap) cfg.bootDevices;
+          if cfg.partitionScheme ? swap
+          then map (diskName: diskName + cfg.partitionScheme.swap) cfg.bootDevices
+          else [];
       };
       boot = {
         kernelPackages =