diff --git a/machines/genmaicha/hardware.nix b/machines/genmaicha/hardware.nix
index 63f30c0a173df31d7cedb05fa1b6b80e6b58b404..8820810b7c984210b8dcba41cb3d81c6d7476679 100644
--- a/machines/genmaicha/hardware.nix
+++ b/machines/genmaicha/hardware.nix
@@ -1,48 +1,49 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
+
-  lib,
+{
+# to /etc/nixos/configuration.nix instead.
   modulesPath,
+# to /etc/nixos/configuration.nix instead.
   ...
+# to /etc/nixos/configuration.nix instead.
 }: {
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
+# to /etc/nixos/configuration.nix instead.
+{
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
 # and may be overwritten by future invocations.  Please make changes
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
 # to /etc/nixos/configuration.nix instead.
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
+# to /etc/nixos/configuration.nix instead.
+{
 {
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
   config,
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
   lib,
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
   modulesPath,
 
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
   ...
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
 }: {
-# and may be overwritten by future invocations.  Please make changes
+  config,
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B03F-3B27";
-# and may be overwritten by future invocations.  Please make changes
 {
+  modulesPath,
-# and may be overwritten by future invocations.  Please make changes
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
+# to /etc/nixos/configuration.nix instead.
+  config,
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
-# to /etc/nixos/configuration.nix instead.
-# and may be overwritten by future invocations.  Please make changes
   config,
 # and may be overwritten by future invocations.  Please make changes
-  lib,
-  ];
+    ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/machines/sencha/hardware.nix b/machines/sencha/hardware.nix
index fcd7fc478726a2bbf835214f9aef652d41f1b68e..096e4e171a737edfdd9e0df4477366c5d35caea1 100644
--- a/machines/sencha/hardware.nix
+++ b/machines/sencha/hardware.nix
@@ -1,48 +1,48 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
+
-  lib,
+{
-  modulesPath,
-  ...
+# to /etc/nixos/configuration.nix instead.
 }: {
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
+# to /etc/nixos/configuration.nix instead.
+{
 # and may be overwritten by future invocations.  Please make changes
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
 # to /etc/nixos/configuration.nix instead.
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
 {
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
   config,
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
+# to /etc/nixos/configuration.nix instead.
+{
   lib,
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
   modulesPath,
-
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
   ...
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{
 }: {
-    fsType = "ext4";
-  };
 
   boot.initrd.luks.devices."luks-75db2e03-a875-43ee-8ca8-70507b421641".device = "/dev/disk/by-uuid/75db2e03-a875-43ee-8ca8-70507b421641";
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A8A8-1D01";
+  fileSystems."/boot" =
-# and may be overwritten by future invocations.  Please make changes
   config,
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+  config,
 # and may be overwritten by future invocations.  Please make changes
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+    };
 
-  swapDevices = [
+  swapDevices =
-    {device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504";}
+    [ { device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504"; }
+{
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's