From 6fb58846d90cbc46a253441758795b9573c08dc0 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 7 Jan 2022 22:32:47 +0100
Subject: [PATCH] dacbert, pulsebert, radiobert: replace workaround to avoid
 having to build kernels

---
 hosts/dacbert/default.nix   | 16 +++++++---------
 hosts/pulsebert/default.nix | 13 +++++--------
 hosts/radiobert/base.nix    | 13 +++++--------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/hosts/dacbert/default.nix b/hosts/dacbert/default.nix
index 34fb4c45..2583dbeb 100644
--- a/hosts/dacbert/default.nix
+++ b/hosts/dacbert/default.nix
@@ -26,6 +26,11 @@
   };
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
 
+  nixpkgs.config.packageOverrides = pkgs: {
+    makeModulesClosure = x:
+      # prevent kernel install fail due to missing modules
+      pkgs.makeModulesClosure (x // { allowMissing = true; });
+  };
   boot = {
     loader = {
       grub.enable = false;
@@ -40,15 +45,8 @@
         '';
       };
     };
-    kernelPackages = pkgs.linuxPackages_5_14;
-    # TODO: can be removed when https://github.com/NixOS/nixpkgs/pull/142015 is merged
-    kernelPatches = [{
-      name = "disable-FB_SIMPLE";
-      patch = null;
-      extraConfig = ''
-        FB_SIMPLE m
-      '';
-    }];
+    kernelPackages = pkgs.linuxPackages_latest;
+
     # No ZFS on latest kernel:
     supportedFilesystems = lib.mkForce [ "vfat" "ext4" ];
     kernelParams = lib.mkForce [
diff --git a/hosts/pulsebert/default.nix b/hosts/pulsebert/default.nix
index 95718ead..24200a6c 100644
--- a/hosts/pulsebert/default.nix
+++ b/hosts/pulsebert/default.nix
@@ -19,14 +19,6 @@ in
       };
     };
     kernelPackages = pkgs.linuxPackages_latest;
-    # TODO: can be removed when https://github.com/NixOS/nixpkgs/pull/142015 is merged
-    kernelPatches = [{
-      name = "disable-FB_SIMPLE";
-      patch = null;
-      extraConfig = ''
-        FB_SIMPLE m
-      '';
-    }];
     # No ZFS on latest kernel:
     supportedFilesystems = lib.mkForce [ "vfat" "ext4" ];
     tmpOnTmpfs = true;
@@ -35,6 +27,11 @@ in
     enable = true;
     kernelPackage = config.boot.kernelPackages.kernel;
   };
+  nixpkgs.config.packageOverrides = pkgs: {
+    makeModulesClosure = x:
+      # prevent kernel install fail due to missing modules
+      pkgs.makeModulesClosure (x // { allowMissing = true; });
+  };
 
   c3d2 = {
     isInHq = true;
diff --git a/hosts/radiobert/base.nix b/hosts/radiobert/base.nix
index d753bc38..d74bf209 100644
--- a/hosts/radiobert/base.nix
+++ b/hosts/radiobert/base.nix
@@ -38,19 +38,16 @@
       };
     };
     kernelPackages = pkgs.linuxPackages_latest;
-    # TODO: can be removed when https://github.com/NixOS/nixpkgs/pull/142015 is merged
-    kernelPatches = [{
-      name = "disable-FB_SIMPLE";
-      patch = null;
-      extraConfig = ''
-        FB_SIMPLE m
-      '';
-    }];
     # No ZFS on latest kernel:
     supportedFilesystems = lib.mkForce [ "vfat" "ext4" ];
 
     tmpOnTmpfs = true;
   };
+  nixpkgs.config.packageOverrides = pkgs: {
+    makeModulesClosure = x:
+      # prevent kernel install fail due to missing modules
+      pkgs.makeModulesClosure (x // { allowMissing = true; });
+  };
   sdImage = {
     compressImage = false;
     imageBaseName = config.networking.hostName;