diff --git a/machines/ray/configuration.nix b/machines/ray/configuration.nix
index c24a89b..c09950d 100644
--- a/machines/ray/configuration.nix
+++ b/machines/ray/configuration.nix
@@ -5,19 +5,8 @@
     ./hardware-configuration.nix
   ];
 
-  firmware.x86_64.enable = true;
-  efi.enable = true;
-
-  boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce";
-    allowDiscards = true;
-  };
-
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
   networking.hostName = "ray";
 
-  hardware.enableAllFirmware = true;
 
   hardware.openrazer.enable = true;
   hardware.openrazer.users = [ "googlebot" ];
@@ -28,18 +17,6 @@
     SUBSYSTEM=="usb", ATTRS{idVendor}=="03e7", MODE="0666"
   '';
 
-  # gpu
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.nvidia = {
-    modesetting.enable = true; # for nvidia-vaapi-driver
-    prime = {
-      reverseSync.enable = true;
-      offload.enableOffloadCmd = true;
-      nvidiaBusId = "PCI:1:0:0";
-      amdgpuBusId = "PCI:4:0:0";
-    };
-  };
-
   # virt-manager
   virtualisation.libvirtd.enable = true;
   programs.dconf.enable = true;
@@ -47,6 +24,9 @@
   environment.systemPackages = with pkgs; [ virt-manager ];
   users.users.googlebot.extraGroups = [ "libvirtd" ];
 
+  # allow building ARM derivations
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
   services.spotifyd.enable = true;
 
   # vpn-container.enable = true;
diff --git a/machines/ray/hardware-configuration.nix b/machines/ray/hardware-configuration.nix
index 5a91ad8..f876e17 100644
--- a/machines/ray/hardware-configuration.nix
+++ b/machines/ray/hardware-configuration.nix
@@ -8,34 +8,54 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
+  # boot
+  efi.enable = true;
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
+
+  # kernel
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
+  # firmware
+  firmware.x86_64.enable = true;
+  hardware.enableAllFirmware = true;
+
+  # gpu
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia = {
+    modesetting.enable = true; # for nvidia-vaapi-driver
+    prime = {
+      reverseSync.enable = true;
+      offload.enableOffloadCmd = true;
+      nvidiaBusId = "PCI:1:0:0";
+      amdgpuBusId = "PCI:4:0:0";
+    };
+  };
+
+  # disks
+  boot.initrd.luks.devices."enc-pv" = {
+    device = "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce";
+    allowDiscards = true;
+  };
   fileSystems."/" =
     { device = "/dev/vg/root";
       fsType = "btrfs";
       options = [ "subvol=root" ];
     };
-
   fileSystems."/home" =
     { device = "/dev/vg/root";
       fsType = "btrfs";
       options = [ "subvol=home" ];
     };
-
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/2C85-2B59";
       fsType = "vfat";
     };
-
   swapDevices =
     [ { device = "/dev/vg/swap"; }
     ];
 
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
 }