From 25b82e07556045b0b80a3d6cf2c8c408f6bf40f2 Mon Sep 17 00:00:00 2001 From: "Issam E. Maghni" Date: Wed, 18 Feb 2026 18:44:47 -0500 Subject: [PATCH] chore: format raspberry-pi/ with `nixfmt --strict` --- raspberry-pi/2/default.nix | 6 +----- raspberry-pi/3/default.nix | 12 ++---------- raspberry-pi/4/default.nix | 10 ++-------- raspberry-pi/4/leds.nix | 6 +++--- raspberry-pi/4/pkgs-overlays.nix | 4 +--- raspberry-pi/4/xhci.nix | 6 +----- raspberry-pi/5/default.nix | 7 ++----- 7 files changed, 12 insertions(+), 39 deletions(-) diff --git a/raspberry-pi/2/default.nix b/raspberry-pi/2/default.nix index c9178874..66f2bc62 100644 --- a/raspberry-pi/2/default.nix +++ b/raspberry-pi/2/default.nix @@ -4,11 +4,7 @@ boot = { consoleLogLevel = lib.mkDefault 7; kernelPackages = lib.mkDefault ( - pkgs.linuxPackagesFor ( - pkgs.callPackage ../common/kernel.nix { - rpiVersion = 2; - } - ) + pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 2; }) ); kernelParams = [ "dwc_otg.lpm_enable=0" diff --git a/raspberry-pi/3/default.nix b/raspberry-pi/3/default.nix index 6472c6b9..31146ac8 100644 --- a/raspberry-pi/3/default.nix +++ b/raspberry-pi/3/default.nix @@ -1,17 +1,9 @@ -{ - lib, - pkgs, - ... -}: +{ lib, pkgs, ... }: { boot = { kernelPackages = lib.mkDefault ( - pkgs.linuxPackagesFor ( - pkgs.callPackage ../common/kernel.nix { - rpiVersion = 3; - } - ) + pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 3; }) ); initrd.availableKernelModules = [ "usbhid" diff --git a/raspberry-pi/4/default.nix b/raspberry-pi/4/default.nix index 9efb4fcd..8bcd615b 100644 --- a/raspberry-pi/4/default.nix +++ b/raspberry-pi/4/default.nix @@ -29,11 +29,7 @@ boot = { kernelPackages = lib.mkDefault ( - pkgs.linuxPackagesFor ( - pkgs.callPackage ../common/kernel.nix { - rpiVersion = 4; - } - ) + pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 4; }) ); initrd.availableKernelModules = [ "usbhid" @@ -62,7 +58,5 @@ } ]; - hardware.firmware = [ - (pkgs.callPackage ../common/raspberry-pi-wireless-firmware.nix { }) - ]; + hardware.firmware = [ (pkgs.callPackage ../common/raspberry-pi-wireless-firmware.nix { }) ]; } diff --git a/raspberry-pi/4/leds.nix b/raspberry-pi/4/leds.nix index 3860fff5..27de0382 100644 --- a/raspberry-pi/4/leds.nix +++ b/raspberry-pi/4/leds.nix @@ -14,9 +14,9 @@ in { options.hardware = { raspberry-pi."4".leds = { - eth.disable = mkDisableOption ''ethernet LEDs.''; - act.disable = mkDisableOption ''activity LED.''; - pwr.disable = mkDisableOption ''power LED.''; + eth.disable = mkDisableOption "ethernet LEDs."; + act.disable = mkDisableOption "activity LED."; + pwr.disable = mkDisableOption "power LED."; }; }; diff --git a/raspberry-pi/4/pkgs-overlays.nix b/raspberry-pi/4/pkgs-overlays.nix index f36577a5..0588dc2d 100644 --- a/raspberry-pi/4/pkgs-overlays.nix +++ b/raspberry-pi/4/pkgs-overlays.nix @@ -19,7 +19,5 @@ in }; }; - config = lib.mkIf cfg.enable { - nixpkgs.overlays = [ dt_ao_overlay ]; - }; + config = lib.mkIf cfg.enable { nixpkgs.overlays = [ dt_ao_overlay ]; }; } diff --git a/raspberry-pi/4/xhci.nix b/raspberry-pi/4/xhci.nix index 56503df3..dd90cb00 100644 --- a/raspberry-pi/4/xhci.nix +++ b/raspberry-pi/4/xhci.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: +{ config, lib, ... }: let cfg = config.hardware.raspberry-pi."4".xhci; in diff --git a/raspberry-pi/5/default.nix b/raspberry-pi/5/default.nix index f8d82a9a..899f0d2b 100644 --- a/raspberry-pi/5/default.nix +++ b/raspberry-pi/5/default.nix @@ -4,14 +4,11 @@ config, ... }: + { boot = { kernelPackages = lib.mkDefault ( - pkgs.linuxPackagesFor ( - pkgs.callPackage ../common/kernel.nix { - rpiVersion = 5; - } - ) + pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 5; }) ); initrd.availableKernelModules = [ "nvme"