chore: fmt

modules/common.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, inputs, ... }:
 
-let
+let meta = import ../meta.nix;
-  meta = import ../meta.nix;
 in {
   imports = with inputs; [
     nix-index-database.nixosModules.nix-index

nixos/akamanto/default.nix

@@ -31,7 +31,6 @@ let
       sha256 = "sha256-0uoq5bvL/4L9oa/JY54qHMRw5vE7V//HxLFMOEqGUjA=";
     };
   });
-  rootfsBuilder = import "${inputs.nixpkgs}/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix" { pkgs = pkgs.buildPackages; };
 in {
   # https://en.wikipedia.org/wiki/Aka_Manto
   networking.hostName = "akamanto";
@@ -44,7 +43,7 @@ in {
   ];
 
   nixpkgs.overlays = [ inputs.self.overlays.rpi5 ];
-  
+
   sdImage = {
     compressImage = false;
     firmwareSize = 1024;
@@ -64,10 +63,16 @@ in {
       kernelFile=$(storePath ${config.boot.kernelPackages.kernel})-${config.system.boot.loader.kernelFile}
       initrdFile=$(storePath ${config.system.build.initialRamdisk})-${config.system.boot.loader.initrdFile}
 
-      cp ${config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile} \
+      cp ${
+        config.boot.kernelPackages.kernel + "/"
+        + config.system.boot.loader.kernelFile
+      } \
         firmware/EFI/nixos/$kernelFile
 
-      cp ${config.system.build.initialRamdisk + "/" + config.system.boot.loader.initrdFile} \
+      cp ${
+        config.system.build.initialRamdisk + "/"
+        + config.system.boot.loader.initrdFile
+      } \
         firmware/EFI/nixos/$initrdFile
 
       mkdir -p firmware/EFI/boot
@@ -79,7 +84,7 @@ in {
       ${pkgs.grub2_efi}/bin/grub-mkimage --directory=${pkgs.grub2_efi}/lib/grub/arm64-efi \
         -o firmware/EFI/boot/bootaa64.efi \
         -p /EFI/boot -O arm64-efi ''${MODULES[@]}
-      
+
       cat <<EOF > firmware/EFI/boot/grub.cfg
       search --set=root --file /EFI/nixos-sd-system-image
 
@@ -90,7 +95,9 @@ in {
       set default="0"
 
       menuentry '${config.system.nixos.distroName} ${config.system.nixos.label}' {
-        linux /EFI/nixos/$kernelFile init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+        linux /EFI/nixos/$kernelFile init=${config.system.build.toplevel}/init ${
+          toString config.boot.kernelParams
+        }
         initrd /EFI/nixos/$initrdFile
         devicetree /bcm2712-rpi-5-b.dtb
       }
@@ -107,7 +114,12 @@ in {
   boot = {
     kernelPackages = lib.mkForce pkgs.linuxPackages_rpi5;
     supportedFilesystems = lib.mkForce [ "vfat" "ext4" ];
-    kernelParams = [ "fbcon=rotate:2" "8250.nr_uarts=11" "console=ttyAMA10,115200" "console=tty0" ];
+    kernelParams = [
+      "fbcon=rotate:2"
+      "8250.nr_uarts=11"
+      "console=ttyAMA10,115200"
+      "console=tty0"
+    ];
     initrd.availableKernelModules = lib.mkForce [
       "usbhid"
       "usb_storage"
@@ -122,7 +134,7 @@ in {
       device = "nodev";
     };
   };
-  
+
   fileSystems = lib.mkForce {
     "/" = {
       device = "/dev/disk/by-label/NIXOS_SD";
@@ -237,7 +249,7 @@ in {
       bluez
       pipewire
       (v4l-utils.override { withGUI = false; })
-      
+
       rpi5-arm-tf
     ];
   programs.nix-index.enable = lib.mkForce false;

nixos/zorigami/default.nix

@@ -469,7 +469,7 @@
       forceSSL = true;
       enableACME = true;
     };
-    ${config.services.matrix-synapse.settings.server_name} = {
+    "${config.services.matrix-synapse.settings.server_name}" = {
       enableACME = true;
       forceSSL = true;
 

pkgs/rpi5-arm-tf.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "arm-trusted-firmware-rpi5";
   version = "20240316";
-  
+
   # src = fetchFromGitHub {
   #   owner = "worproject";
   #   repo = "rpi5-uefi";
@@ -11,14 +11,14 @@ stdenv.mkDerivation rec {
   #   fetchSubmodules = true;
   #   hash = "sha256-mGMqgJXsEFq79aHes8HUGcKrfbGjeAHTA/xzbq5qURs=";
   # };
-  
+
   src = fetchFromGitHub {
     owner = "worproject";
     repo = "arm-trusted-firmware";
     rev = "682607fbd775e37fb5631508434dab9e60220c9a";
     hash = "sha256-Kdn9xJtHhwxvqpzC6osW2xWdZrlOmowaxBLPYGmtHYQ=";
   };
-  
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ pkgsCross.arm-embedded.stdenv.cc ];
 
@@ -36,17 +36,15 @@ stdenv.mkDerivation rec {
     "SUPPORT_VFP=1"
     "SMC_PCI_SUPPORT=1"
   ];
-  
+
-  filesToInstall = [
+  filesToInstall = [ "build/rpi5/release" ];
-    "build/rpi5/release"
+
-  ];
-  
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out
     cp -r ${lib.concatStringsSep " " filesToInstall} $out
-    
+
     runHook postInstall
   '';
 

pkgs/rpi5-uefi-bin.nix

@@ -1,28 +1,25 @@
 { stdenv, lib, fetchzip }:
 
-let
+let version = "v0.3";
-  version = "v0.3";
+in stdenv.mkDerivation {
-in
-stdenv.mkDerivation {
   pname = "rpi5-uefi";
-  version = version;
+  inherit version;
-  
+
   src = fetchzip {
-    url = "https://github.com/worproject/rpi5-uefi/releases/download/${version}/RPi5_UEFI_Release_${version}.zip";
+    url =
+      "https://github.com/worproject/rpi5-uefi/releases/download/${version}/RPi5_UEFI_Release_${version}.zip";
     sha256 = "sha256-bjEvq7KlEFANnFVL0LyexXEeoXj7rHGnwQpq09PhIb0=";
     stripRoot = false;
   };
-  
+
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/boot
     mv ./* $out/boot
-    
+
     runHook postInstall
   '';
-  
+
-  meta = with lib; {
+  meta = with lib; { description = "EDK2 port for raspberry pi 5"; };
-    description = "EDK2 port for raspberry pi 5";
-  };
 }

pkgs/rpi5-uefi.nix

@@ -1,6 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchFromGitLab, openssl, pkgsCross, buildPackages }:
+{ lib, stdenv, fetchFromGitHub, fetchFromGitLab, openssl, pkgsCross
+, buildPackages }:
 
-let
+stdenv.mkDerivation { }
-in
-stdenv.mkDerivation {
-}