From 28632414231f15697e28fdf9695e0b50f9e374a8 Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <christoph@cullmann.io>
Date: Thu, 10 Oct 2024 21:59:50 +0200
Subject: [PATCH] cleanup more hardware stuff

---
 beta/hardware-configuration.nix | 12 ++++++------
 mini/hardware-configuration.nix | 12 ++++++------
 neko/hardware-configuration.nix | 12 ++++++------
 share/common.nix                |  3 +++
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/beta/hardware-configuration.nix b/beta/hardware-configuration.nix
index b4960f7..952e368 100644
--- a/beta/hardware-configuration.nix
+++ b/beta/hardware-configuration.nix
@@ -10,6 +10,12 @@
   boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelModules = [ "kvm-amd" ];
 
+  # AMD microcode updates please
+  hardware.cpu.amd.updateMicrocode = true;
+
+  # amd graphics
+  hardware.graphics.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
+
   # /boot efi partition to boot in UEFI mode
   fileSystems."/boot" =
     { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVLB1T0HBLR-000L2_S4DZNX0R362286-part1";
@@ -17,10 +23,4 @@
       options = [ "fmask=0022" "dmask=0022" ];
       neededForBoot = true;
     };
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  # amd graphics
-  hardware.graphics.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
 }
diff --git a/mini/hardware-configuration.nix b/mini/hardware-configuration.nix
index 851b0a8..40e949e 100644
--- a/mini/hardware-configuration.nix
+++ b/mini/hardware-configuration.nix
@@ -10,6 +10,12 @@
   boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelModules = [ "kvm-amd" ];
 
+  # AMD microcode updates please
+  hardware.cpu.amd.updateMicrocode = true;
+
+  # amd graphics
+  hardware.graphics.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
+
   # /boot efi partition to boot in UEFI mode
   fileSystems."/boot" =
     { device = "/dev/disk/by-id/nvme-CT4000P3PSSD8_2325E6E63746-part1";
@@ -17,10 +23,4 @@
       options = [ "fmask=0022" "dmask=0022" ];
       neededForBoot = true;
     };
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  # amd graphics
-  hardware.graphics.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
 }
diff --git a/neko/hardware-configuration.nix b/neko/hardware-configuration.nix
index 76855ae..14fc727 100644
--- a/neko/hardware-configuration.nix
+++ b/neko/hardware-configuration.nix
@@ -10,6 +10,12 @@
   boot.initrd.kernelModules = [ "i915" ];
   boot.kernelModules = [ "kvm-intel" ];
 
+  # Intel microcode updates please
+  hardware.cpu.intel.updateMicrocode = true;
+
+  # intel graphics
+  hardware.graphics.extraPackages = with pkgs; [ intel-media-driver intel-compute-runtime ];
+
   # /boot efi partition to boot in UEFI mode
   fileSystems."/boot" =
     { device = "/dev/disk/by-id/nvme-Seagate_FireCuda_530_ZP4000GM30013_7VS01VBM-part1";
@@ -17,10 +23,4 @@
       options = [ "fmask=0022" "dmask=0022" ];
       neededForBoot = true;
     };
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  # intel graphics
-  hardware.graphics.extraPackages = with pkgs; [ intel-media-driver intel-compute-runtime ];
 }
diff --git a/share/common.nix b/share/common.nix
index 58035da..39f84c6 100644
--- a/share/common.nix
+++ b/share/common.nix
@@ -25,6 +25,9 @@ in
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.05"; # Did you read the comment?
 
+  # atm all stuff is x86_64
+  nixpkgs.hostPlatform = "x86_64-linux";
+
   # enable ZFS
   boot.supportedFilesystems = [ "zfs" ];