From 578e045a53cbe3973d7cb09d9a4dbd6390a46d27 Mon Sep 17 00:00:00 2001
From: Lyra Thorpe <iam@emmathe.dev>
Date: Tue, 9 Jun 2026 17:53:57 +0100
Subject: [PATCH] feat(macpro): add hardware config

---
 .../MacPro31/hardware-configuration.nix       | 61 +++++++------------
 1 file changed, 21 insertions(+), 40 deletions(-)

diff --git a/system/machine/MacPro31/hardware-configuration.nix b/system/machine/MacPro31/hardware-configuration.nix
index 713a78e..120d1b1 100644
--- a/system/machine/MacPro31/hardware-configuration.nix
+++ b/system/machine/MacPro31/hardware-configuration.nix
@@ -1,52 +1,33 @@
-# PLACEHOLDER -- hand-written, not machine-generated. Regenerate on the real
-# Mac Pro 3,1 with `nixos-generate-config` and commit the result. The device
-# labels below are guesses; replace them with the generated UUIDs (or label the
-# partitions accordingly at install time).
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
+# 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, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "ahci"
-    "ata_piix"
-    "ehci_pci"
-    "uhci_hcd"
-    "firewire_ohci"
-    "usb_storage"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "ahci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  # EFI System Partition for systemd-boot. Label the ESP `ESP` at install, or
-  # replace with the generated UUID.
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/ESP";
-    fsType = "vfat";
-  };
+  fileSystems."/" =
+    { device = "/dev/mapper/MacPro-Root";
+      fsType = "ext4";
+    };
 
-  # Label your root partition `nixos` at install, or replace with the generated UUID.
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-label/swap"; }
-  ];
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/0E9C-C099";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/dec138b4-320f-4b69-acbc-3014a1032cbd"; }
+    ];
   networking.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }