From d765ead0202ebe0a0979654e03b434147c4c922d Mon Sep 17 00:00:00 2001
From: Hermes <hermes@lazyworkhorse.net>
Date: Sat, 20 Jun 2026 15:07:00 -0400
Subject: [PATCH] fix: kismet --log-base -> --log-prefix (wrong flag), aiov2
 pinctrl from raspberrypi-utils not libraspberrypi

---
 hosts/cyt-pi/configuration.nix                 | 2 +-
 hosts/uconsole-cm5/configuration.nix           | 2 +-
 modules/nixos/hardware/uconsole-cm5-aio-v2.nix | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hosts/cyt-pi/configuration.nix b/hosts/cyt-pi/configuration.nix
index 2e33723..f97442f 100644
--- a/hosts/cyt-pi/configuration.nix
+++ b/hosts/cyt-pi/configuration.nix
@@ -50,7 +50,7 @@
       User = "gortium";
       Group = "kismet";
       ExecStart = ''
-        ${pkgs.kismet}/bin/kismet -c panda --log-base=/home/gortium/kismet_logs --no-nc-ui
+        ${pkgs.kismet}/bin/kismet -c panda --log-prefix=/home/gortium/kismet_logs --no-nc-ui
       '';
       Restart = "always";
       RestartSec = "10s";
diff --git a/hosts/uconsole-cm5/configuration.nix b/hosts/uconsole-cm5/configuration.nix
index 4c23890..0e72a36 100644
--- a/hosts/uconsole-cm5/configuration.nix
+++ b/hosts/uconsole-cm5/configuration.nix
@@ -156,7 +156,7 @@
     serviceConfig = {
       User = "gortium";
       Group = "kismet";
-      ExecStart = "${pkgs.kismet}/bin/kismet -c wlan0 --log-base=/home/gortium/kismet_logs --no-nc-ui";
+      ExecStart = "${pkgs.kismet}/bin/kismet -c wlan0 --log-prefix=/home/gortium/kismet_logs --no-nc-ui";
       Restart = "always";
       RestartSec = "10s";
     };
diff --git a/modules/nixos/hardware/uconsole-cm5-aio-v2.nix b/modules/nixos/hardware/uconsole-cm5-aio-v2.nix
index 7c70505..5973ea3 100644
--- a/modules/nixos/hardware/uconsole-cm5-aio-v2.nix
+++ b/modules/nixos/hardware/uconsole-cm5-aio-v2.nix
@@ -21,7 +21,7 @@ let
   applyRailsScript = pkgs.writeShellScript "apply-aio-v2-rails" (
     ''
       set -e
-      PINCTRL=${pkgs.libraspberrypi}/bin/pinctrl
+      PINCTRL=${pkgs.raspberrypi-utils}/bin/pinctrl
     ''
     + concatStringsSep "" (mapAttrsToList (name: pin: ''
       if [ "${if cfg.bootRails.${name} then "1" else "0"}" = "1" ]; then
@@ -123,7 +123,7 @@ in {
     # Package the aiov2_ctl tool + pinctrl
     environment.systemPackages = with pkgs; [
       cfg.package
-      libraspberrypi      # provides pinctrl
+      raspberrypi-utils  # provides pinctrl
     ];
 
     # Boot rail systemd oneshot service