treewide: un-nest all attrsets

2 files changed, 55 insertions, 41 deletions

diff --git a/hosts/atlas/hardware-configuration.nix b/hosts/atlas/hardware-configuration.nix
index 46b295b..00c6cd8 100644
--- a/hosts/atlas/hardware-configuration.nix
+++ b/hosts/atlas/hardware-configuration.nix
@@ -3,19 +3,26 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["virtio_pci" "usbhid"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
+  boot = {
+    extraModulePackages = [];
+    kernelModules = [];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/f0c84809-83f5-414b-a973-496d25d74c6d";
-    fsType = "ext4";
+    initrd = {
+      availableKernelModules = ["virtio_pci" "usbhid"];
+      kernelModules = [];
+    };
   };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A253-0826";
-    fsType = "vfat";
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/f0c84809-83f5-414b-a973-496d25d74c6d";
+      fsType = "ext4";
+    };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/A253-0826";
+      fsType = "vfat";
+    };
   };
 
   swapDevices = [];
diff --git a/hosts/glados/hardware-configuration.nix b/hosts/glados/hardware-configuration.nix
index 21afbab..a7ff9e9 100644
--- a/hosts/glados/hardware-configuration.nix
+++ b/hosts/glados/hardware-configuration.nix
@@ -11,44 +11,51 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-amd"];
-  boot.extraModulePackages = [];
+  boot = {
+    extraModulePackages = [];
+    kernelModules = ["kvm-amd"];
 
-  fileSystems."/" = {
-    device = "/dev/mapper/cryptroot";
-    fsType = "btrfs";
-    options = ["subvol=root" "compress=zstd" "noatime"];
-  };
+    initrd = {
+      availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+      kernelModules = [];
 
-  boot.initrd.luks.devices."cryptroot" = {
-    device = "/dev/disk/by-uuid/bbbc1f37-53f5-4776-a70e-f2779179de50";
-    allowDiscards = true;
-    crypttabExtraOpts = ["tpm2-device=auto"];
+      luks.devices."cryptroot" = {
+        device = "/dev/disk/by-uuid/bbbc1f37-53f5-4776-a70e-f2779179de50";
+        allowDiscards = true;
+        crypttabExtraOpts = ["tpm2-device=auto"];
+      };
+    };
   };
 
-  fileSystems."/var/log" = {
-    device = "/dev/mapper/cryptroot";
-    fsType = "btrfs";
-    options = ["subvol=var_log" "compress=zstd" "noatime"];
-  };
+  fileSystems = {
+    "/" = {
+      device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = ["subvol=root" "compress=zstd" "noatime"];
+    };
 
-  fileSystems."/nix" = {
-    device = "/dev/mapper/cryptroot";
-    fsType = "btrfs";
-    options = ["subvol=nix" "compress=zstd" "noatime" "nodatacow"];
-  };
+    "/var/log" = {
+      device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = ["subvol=var_log" "compress=zstd" "noatime"];
+    };
 
-  fileSystems."/home" = {
-    device = "/dev/mapper/cryptroot";
-    fsType = "btrfs";
-    options = ["subvol=home" "compress=zstd" "noatime"];
-  };
+    "/nix" = {
+      device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = ["subvol=nix" "compress=zstd" "noatime" "nodatacow"];
+    };
+
+    "/home" = {
+      device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = ["subvol=home" "compress=zstd" "noatime"];
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B95B-9412";
-    fsType = "vfat";
+    "/boot" = {
+      device = "/dev/disk/by-uuid/B95B-9412";
+      fsType = "vfat";
+    };
   };
 
   swapDevices = [];