From 1e86db92a8e2b9c37124b7ec547d0c1085e7e5d1 Mon Sep 17 00:00:00 2001
From: k3t <k3t@k3t.dev>
Date: Tue, 23 Jun 2026 15:31:29 -0600
Subject: [PATCH] remove fs from hardware configurations

---
 flake.nix                                    | 10 ++++++++++
 hosts/IdeaPad/hardware-configuration.nix     | 15 ---------------
 hosts/TheBlackBox/hardware-configuration.nix | 15 ---------------
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/flake.nix b/flake.nix
index c02a444..fa6fa9e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,7 +82,12 @@
         
         ./modules/sys/compat.nix
         ./modules/sys/firewall.nix
+        
         ./modules/sys/fs/btrfs.nix
+        ./modules/sys/fs/mounts/efi.nix
+        ./modules/sys/fs/mounts/root-btrfs.nix
+        ./modules/sys/fs/mounts/swap.nix
+
         ./modules/sys/hw/boot.nix
         ./modules/sys/hw/cpu/amd64.nix
         ./modules/sys/hw/gpu/amd.nix
@@ -134,7 +139,12 @@
         
         ./modules/sys/compat.nix
         ./modules/sys/firewall.nix
+
         ./modules/sys/fs/btrfs.nix
+        ./modules/sys/fs/mounts/efi.nix
+        ./modules/sys/fs/mounts/root-btrfs.nix
+        ./modules/sys/fs/mounts/swap.nix
+
         ./modules/sys/hw/boot.nix
         ./modules/sys/hw/cpu/intel.nix
         ./modules/sys/hw/gpu/amd.nix
diff --git a/hosts/IdeaPad/hardware-configuration.nix b/hosts/IdeaPad/hardware-configuration.nix
index 548ea66..a300879 100644
--- a/hosts/IdeaPad/hardware-configuration.nix
+++ b/hosts/IdeaPad/hardware-configuration.nix
@@ -13,21 +13,6 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/NixOS";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/EFI";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-label/Swap"; }
-    ];
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/TheBlackBox/hardware-configuration.nix b/hosts/TheBlackBox/hardware-configuration.nix
index 6e9c796..bec0a67 100644
--- a/hosts/TheBlackBox/hardware-configuration.nix
+++ b/hosts/TheBlackBox/hardware-configuration.nix
@@ -13,21 +13,6 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b17472f2-bf78-4850-abe1-f324dbb4d361";
-      fsType = "btrfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/894A-AE22";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/9d20f606-cd87-40e1-adad-c470acf0a66a"; }
-    ];
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }