From 430377185781091f6b3f46a6ddfa32996af00c45 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Wed, 6 Nov 2024 12:37:34 +0100
Subject: [PATCH] nixos/magi: Use platform config for kernel

---
 flake.lock            |  8 ++---
 nixos/module/magi.nix | 71 ++-----------------------------------------
 2 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/flake.lock b/flake.lock
index d715ecd..36e6469 100644
--- a/flake.lock
+++ b/flake.lock
@@ -349,11 +349,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1730847151,
-        "narHash": "sha256-8C2YMErF1bYnfXVLrYN7TVIH7HYCWM0xJj2s7kmME34=",
+        "lastModified": 1730892568,
+        "narHash": "sha256-cTTY+eNvq9sxqI2nHPmr9mO3hHVl0aolQVlSs5KD5pk=",
         "ref": "refs/heads/main",
-        "rev": "efc47b94e5aa1cc5c805f4463739afb3988bb1f7",
-        "revCount": 3,
+        "rev": "ec2530c9b532a834777b90fbf34e880aa02395fa",
+        "revCount": 4,
         "type": "git",
         "url": "https://woof.rip/mikael/linux-hardened.git"
       },
diff --git a/nixos/module/magi.nix b/nixos/module/magi.nix
index 537c684..edf9e88 100644
--- a/nixos/module/magi.nix
+++ b/nixos/module/magi.nix
@@ -16,94 +16,27 @@
   ];
 
   boot.kernelPackages = let
-    inherit (linux-hardened.packages.x86_64-linux) default;
-  in pkgs.linuxPackagesFor (default.override {
-    instSetArch = "znver2";
+    inherit (linux-hardened.packages.x86_64-linux) supermicro-h11ssw;
+  in pkgs.linuxPackagesFor (supermicro-h11ssw.override {
     profiles = {
       physical = true;
       dm-crypt = true;
     };
 
     extraConfig = with linux-hardened.lib.kernel; {
-      CPU_SUP_INTEL = false;
-      CPU_SUP_AMD = true;
-      NR_CPUS = 96;
-      AMD_MEM_ENCRYPT = true;
-
-      ACPI_IPMI = true;
-      ACPI_HMAT = true;
-
-      VIRTUALIZATION = true;
-      KVM = true;
-      KVM_AMD = true;
-      KVM_SMM = true;
-
-      NVME_CORE = true;
-      BLK_DEV_NVME = true;
-      NVME_VERBOSE_ERRORS = true;
-      NVME_HWMON = true;
-
-      ATA = true;
-      ATA_VERBOSE_ERROR = true;
-      ATA_ACPI = true;
-      SATA_PMP = true;
-      SATA_AHCI = true;
-      SATA_MOBILE_LPM_POLICY = 1;
-      ATA_SFF = false;
-
       BLK_DEV_MD = true;
       MD_AUTODETECT = true;
       MD_RAID1 = true;
       DM_RAID = true;
 
-      BNXT = true;
-      BNXT_FLOWER_OFFLOAD = true;
-      BNXT_HWMON = true;
       MLX4_EN = true;
       MLX4_CORE_GEN2 = false;
 
-      IPMI_HANDLER = true;
-      IPMI_PANIC_EVENT = true;
-      IPMI_PANIC_STRING = true;
-      IPMI_DEVICE_INTERFACE = true;
-      IPMI_SI = true;
-      IPMI_SSIF = true;
-
-      I2C_PIIX4 = true;
-
-      HWMON = true;
-      SENSORS_K10TEMP = true;
-
-      WATCHDOG = true;
-      WATCHDOG_HANDLE_BOOT_ENABLED = true;
-      WATCHDOG_OPEN_TIMEOUT = 0;
-      WATCHDOG_SYSFS = true;
-      SP5100_TCO = true;
-
-      VIDEO = true;
-      DRM = true;
-      DRM_FBDEV_EMULATION = true;
-      DRM_AST = true;
-
-      EDAC_DECODE_MCE = true;
-      EDAC_AMD64 = true;
-
-      AMD_PTDMA = true;
-      AMD_IOMMU = true;
-
-      INTEL_RAPL = true;
-
       BTRFS_FS = true;
       BTRFS_FS_POSIX_ACL = true;
 
       CEPH_FS = true;
       CEPH_FS_POSIX_ACL = true;
-
-      CRYPTO_DEV_CCP = true;
-      CRYPTO_DEV_CCP_DD = true;
-      CRYPTO_DEV_SP_CCP = true;
-      CRYPTO_DEV_CCP_CRYPTO = true;
-      CRYPTO_DEV_SP_PSP = true;
     };
   });