From 7b065da4a02903489d0a82119bd5ab73636823b6 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 12 Sep 2023 22:48:54 -0400
Subject: treewide: un-nest all attrsets

---
 hosts/glados/hardware-configuration.nix | 69 ++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 31 deletions(-)

(limited to 'hosts/glados/hardware-configuration.nix')

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 = [];
-- 
cgit v1.2.3