From d32c2275e768f7d58399bd6399510cb08966f8aa Mon Sep 17 00:00:00 2001
From: L-Nafaryus <l.nafaryus@gmail.com>
Date: Tue, 8 Apr 2025 00:23:49 +0500
Subject: [PATCH] preconfiguredModules.nixos: exclude fileSystems

---
 lib/preconfiguredModules/nixos/common.nix | 52 +++++++++++------------
 nixosConfigurations/astora/hardware.nix   |  4 ++
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/lib/preconfiguredModules/nixos/common.nix b/lib/preconfiguredModules/nixos/common.nix
index 7b19b9a..88f3d4f 100644
--- a/lib/preconfiguredModules/nixos/common.nix
+++ b/lib/preconfiguredModules/nixos/common.nix
@@ -28,36 +28,36 @@
   };
 
   # Filesystem
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/nixos";
-      fsType = "btrfs";
-      options = ["subvol=root" "compress=zstd"];
-    };
+  # fileSystems = {
+  #   "/" = {
+  #     device = "/dev/disk/by-label/nixos";
+  #     fsType = "btrfs";
+  #     options = ["subvol=root" "compress=zstd"];
+  #   };
 
-    "/boot" = {
-      device = "/dev/disk/by-label/boot";
-      fsType = "vfat";
-    };
+  #   "/boot" = {
+  #     device = "/dev/disk/by-label/boot";
+  #     fsType = "vfat";
+  #   };
 
-    "/nix" = {
-      device = "/dev/disk/by-label/nixos";
-      fsType = "btrfs";
-      options = ["subvol=nix" "compress=zstd" "noatime"];
-    };
+  #   "/nix" = {
+  #     device = "/dev/disk/by-label/nixos";
+  #     fsType = "btrfs";
+  #     options = ["subvol=nix" "compress=zstd" "noatime"];
+  #   };
 
-    "/home" = {
-      device = "/dev/disk/by-label/nixos";
-      fsType = "btrfs";
-      options = ["subvol=home" "compress=zstd"];
-    };
+  #   "/home" = {
+  #     device = "/dev/disk/by-label/nixos";
+  #     fsType = "btrfs";
+  #     options = ["subvol=home" "compress=zstd"];
+  #   };
 
-    "/swap" = {
-      device = "/dev/disk/by-label/nixos";
-      fsType = "btrfs";
-      options = ["subvol=swap" "noatime"];
-    };
-  };
+  #   "/swap" = {
+  #     device = "/dev/disk/by-label/nixos";
+  #     fsType = "btrfs";
+  #     options = ["subvol=swap" "noatime"];
+  #   };
+  # };
 
   swapDevices = [
     {device = "/swap/swapfile";}
diff --git a/nixosConfigurations/astora/hardware.nix b/nixosConfigurations/astora/hardware.nix
index bce624d..2821c3e 100644
--- a/nixosConfigurations/astora/hardware.nix
+++ b/nixosConfigurations/astora/hardware.nix
@@ -55,6 +55,10 @@
     };
   };
 
+  swapDevices = [
+    {device = "/swap/swapfile";}
+  ];
+
   services.fstrim.enable = true;
 
   # Hardware etc