From 5709b8b2f1c9a455e58df6920e7e118b42d6aeed Mon Sep 17 00:00:00 2001
From: chaos <chaos@owo.monster>
Date: Wed, 4 Sep 2024 11:59:59 +0100
Subject: [PATCH] add raspberrypi-utils

---
 hosts/raspberry-pi5/hardware.nix  |  3 +++
 outputs.nix                       |  2 +-
 overlay/default.nix               |  6 ++++--
 overlay/raspberrypi-utils.nix     | 20 ++++++++++++++++++++
 profiles/nixos/kernels/latest.nix |  2 ++
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 overlay/raspberrypi-utils.nix

diff --git a/hosts/raspberry-pi5/hardware.nix b/hosts/raspberry-pi5/hardware.nix
index 08ad932..6e9e618 100644
--- a/hosts/raspberry-pi5/hardware.nix
+++ b/hosts/raspberry-pi5/hardware.nix
@@ -1,6 +1,7 @@
 {
   tree,
   pkgs,
+  config,
   lib,
   ...
 }: let
@@ -85,6 +86,8 @@ in {
     "fbdev"
   ];
 
+  environment.systemPackages = [config.boot.kernelPackages.cpupower];
+
   boot = {
     kernelPackages = pkgs.linuxPackages_rpi5;
     supportedFilesystems = mkForce ["vfat"];
diff --git a/outputs.nix b/outputs.nix
index 83ccc27..6d37a0e 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -49,7 +49,7 @@ in
             inherit (pkgs) mk-enc-usb mk-encrypted-drive;
             inherit (pkgs) gotosocial mpd-headless;
             inherit (pkgs) kitty-terminfo;
-            inherit (pkgs) linux_rpi5 raspberrypifw raspberrypiWirelessFirmware;
+            inherit (pkgs) linux_rpi5 raspberrypifw raspberrypiWirelessFirmware raspberrypi-utils;
             inherit (inputs.home-manager-unstable.packages."${system}") home-manager;
           };
         }
diff --git a/overlay/default.nix b/overlay/default.nix
index 0d90b73..139f8be 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -21,7 +21,7 @@ final: prev: rec {
 
   linuxPackages_rpi5 = final.linuxPackagesFor linux_rpi5;
 
-  raspberrypifw = prev.raspberrypifw.overrideAttrs (oldAttrs: rec {
+  raspberrypifw = prev.raspberrypifw.overrideAttrs (_oldAttrs: rec {
     version = "stable_20240529";
 
     src = final.fetchFromGitHub {
@@ -32,7 +32,7 @@ final: prev: rec {
     };
   });
 
-  raspberrypiWirelessFirmware = prev.raspberrypiWirelessFirmware.overrideAttrs (oldAttrs: rec {
+  raspberrypiWirelessFirmware = prev.raspberrypiWirelessFirmware.overrideAttrs (_oldAttrs: rec {
     version = "unstable-2024-09-04";
 
     srcs = [
@@ -53,6 +53,8 @@ final: prev: rec {
     ];
   });
 
+  raspberrypi-utils = final.callPackage ./raspberrypi-utils.nix {};
+
   mpd-headless =
     (prev.mpdWithFeatures.override {
       ffmpeg = final.ffmpeg_6-headless;
diff --git a/overlay/raspberrypi-utils.nix b/overlay/raspberrypi-utils.nix
new file mode 100644
index 0000000..7021d76
--- /dev/null
+++ b/overlay/raspberrypi-utils.nix
@@ -0,0 +1,20 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  dtc,
+}:
+stdenv.mkDerivation {
+  pname = "raspberrypi-utils";
+  version = "2024-05-23";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "utils";
+    rev = "b9c63214c535d7df2b0fa6743b7b3e508363c25a";
+    hash = "sha256-+z3nSILfI0YZHWKy90SV2Z2fziaAGEC4AKamEpf2+pQ=";
+  };
+
+  nativeBuildInputs = [cmake];
+  buildInputs = [dtc];
+}
diff --git a/profiles/nixos/kernels/latest.nix b/profiles/nixos/kernels/latest.nix
index da47adb..a3e2597 100644
--- a/profiles/nixos/kernels/latest.nix
+++ b/profiles/nixos/kernels/latest.nix
@@ -1,9 +1,11 @@
 {
   pkgs,
+  config,
   lib,
   ...
 }: let
   inherit (lib.modules) mkForce;
 in {
   boot.kernelPackages = mkForce pkgs.linuxPackages_latest;
+  environment.systemPackages = [config.boot.kernelPackages.cpupower];
 }