From 98bf5db3475522fec6797f97b3172f240c596c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 26 Dec 2022 02:52:46 +0100
Subject: [PATCH] Enable enableRedistributableFirmware everywhere, remove
 duplicated kernelPackages

---
 config/default.nix            | 2 ++
 hosts/pulsebert/default.nix   | 7 +------
 hosts/radiobert/default.nix   | 5 +----
 hosts/rpi-netboot/default.nix | 5 +----
 hosts/server10/default.nix    | 2 --
 hosts/server8/default.nix     | 2 --
 hosts/server9/default.nix     | 2 --
 7 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/config/default.nix b/config/default.nix
index ad67cc50..bbbc2646 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -33,6 +33,8 @@ lib.mkMerge [
       ];
     };
 
+    hardware.enableRedistributableFirmware = true;
+
     i18n = {
       defaultLocale = "en_US.UTF-8";
       supportedLocales = [
diff --git a/hosts/pulsebert/default.nix b/hosts/pulsebert/default.nix
index 6b3096b3..ef636add 100644
--- a/hosts/pulsebert/default.nix
+++ b/hosts/pulsebert/default.nix
@@ -14,7 +14,6 @@
 
   boot = {
     growPartition = true;
-    # kernelPackages = pkgs.linuxKernel.packages.linux_5_15;
     kernelParams = [ "console=tty0" ];
     loader.grub.enable = false;
     loader.efi.canTouchEfiVariables = true;
@@ -24,11 +23,7 @@
 
   hardware = {
     bluetooth.enable = true;
-    deviceTree = {
-      enable = true;
-      kernelPackage = config.boot.kernelPackages.kernel;
-    };
-    enableRedistributableFirmware = true;
+    deviceTree.enable = true;
   };
 
   nix = {
diff --git a/hosts/radiobert/default.nix b/hosts/radiobert/default.nix
index 15fe4c86..01037123 100644
--- a/hosts/radiobert/default.nix
+++ b/hosts/radiobert/default.nix
@@ -71,10 +71,7 @@
 
   swapDevices = [ ];
 
-  hardware = {
-    deviceTree.enable = false;
-    enableRedistributableFirmware = true;
-  };
+  hardware.deviceTree.enable = false;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 
diff --git a/hosts/rpi-netboot/default.nix b/hosts/rpi-netboot/default.nix
index 96755623..fafb6b9f 100644
--- a/hosts/rpi-netboot/default.nix
+++ b/hosts/rpi-netboot/default.nix
@@ -14,10 +14,7 @@
 
   swapDevices = [ ];
 
-  hardware = {
-    bluetooth.enable = true;
-    enableRedistributableFirmware = true;
-  };
+  hardware.bluetooth.enable = true;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 
diff --git a/hosts/server10/default.nix b/hosts/server10/default.nix
index 842c8b85..5fbbdb54 100644
--- a/hosts/server10/default.nix
+++ b/hosts/server10/default.nix
@@ -18,8 +18,6 @@
       version = 2;
       device = "/dev/sda";
     };
-
-    # kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
     kernelParams = [
       "preempt=none"
       # No server/router runs any untrusted user code
diff --git a/hosts/server8/default.nix b/hosts/server8/default.nix
index 75e62f90..5dd90169 100644
--- a/hosts/server8/default.nix
+++ b/hosts/server8/default.nix
@@ -18,8 +18,6 @@
       # Define on which hard drive you want to install Grub.
       device = "/dev/disk/by-id/scsi-3600300570140a6102b0acad9825149f2"; # or "nodev" for efi only
     };
-
-    # kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
     kernelParams = [
       "preempt=none"
       # No server/router runs any untrusted user code
diff --git a/hosts/server9/default.nix b/hosts/server9/default.nix
index cee66be1..8e79ceb5 100644
--- a/hosts/server9/default.nix
+++ b/hosts/server9/default.nix
@@ -17,8 +17,6 @@ _:
       version = 2;
       device = "/dev/sdc";
     };
-
-    # kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
     kernelParams = [
       "preempt=none"
       # No server/router runs any untrusted user code