remove fs from hardware configurations

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

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;
 }

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;
 }