treewide: introduce formatter

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# You can set this file as a default ignore file for blame by running
+# the following command.
+#
+# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+#
+
+# treewide: re-format
+69532003a7d4b95c0fc508c6ee777411a9b3dd3b

apple-silicon-support/modules/boot-m1n1/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   pkgs' = config.hardware.asahi.pkgs;
 
@@ -13,7 +18,7 @@ let
   };
 
   bootFiles = {
-    "m1n1/boot.bin" = pkgs.runCommand "boot.bin" {} ''
+    "m1n1/boot.bin" = pkgs.runCommand "boot.bin" { } ''
       cat ${bootM1n1}/build/m1n1.bin > $out
       cat ${config.boot.kernelPackages.kernel}/dtbs/apple/*.dtb >> $out
       cat ${bootUBoot}/u-boot-nodtb.bin.gz >> $out
@@ -22,14 +27,18 @@ let
       fi
     '';
   };
-in {
+in
+{
   config = lib.mkIf config.hardware.asahi.enable {
     # install m1n1 with the boot loader
     boot.loader.grub.extraFiles = bootFiles;
     boot.loader.systemd-boot.extraFiles = bootFiles;
 
     # ensure the installer has m1n1 in the image
-    system.extraDependencies = lib.mkForce [ bootM1n1 bootUBoot ];
+    system.extraDependencies = lib.mkForce [
+      bootM1n1
+      bootUBoot
+    ];
     system.build.m1n1 = bootFiles."m1n1/boot.bin";
   };
 

apple-silicon-support/modules/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   imports = [
     ./kernel
@@ -8,20 +13,22 @@
     ./sound
   ];
 
-  config = let
+  config =
+    let
       cfg = config.hardware.asahi;
-    in lib.mkIf cfg.enable {
+    in
+    lib.mkIf cfg.enable {
       nixpkgs.overlays = lib.mkBefore [ cfg.overlay ];
 
       hardware.asahi.pkgs =
-        if cfg.pkgsSystem != "aarch64-linux"
-        then
+        if cfg.pkgsSystem != "aarch64-linux" then
           import (pkgs.path) {
             crossSystem.system = "aarch64-linux";
             localSystem.system = cfg.pkgsSystem;
             overlays = [ cfg.overlay ];
           }
-        else pkgs;
+        else
+          pkgs;
     };
 
   options.hardware.asahi = {

apple-silicon-support/modules/kernel/default.nix

@@ -1,11 +1,17 @@
 # the Asahi Linux kernel and options that must go along with it
 
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   config = lib.mkIf config.hardware.asahi.enable {
-    boot.kernelPackages = let
-      pkgs' = config.hardware.asahi.pkgs;
-    in
+    boot.kernelPackages =
+      let
+        pkgs' = config.hardware.asahi.pkgs;
+      in
       pkgs'.linux-asahi.override {
         _kernelPatches = config.boot.kernelPatches;
       };
@@ -91,9 +97,11 @@
   };
 
   imports = [
-    (lib.mkRemovedOptionModule [ "hardware" "asahi" "addEdgeKernelConfig" ]
-      "All edge kernel config options are now the default.")
-    (lib.mkRemovedOptionModule [ "hardware" "asahi" "withRust" ]
-      "Rust support is now the default.")
+    (lib.mkRemovedOptionModule [
+      "hardware"
+      "asahi"
+      "addEdgeKernelConfig"
+    ] "All edge kernel config options are now the default.")
+    (lib.mkRemovedOptionModule [ "hardware" "asahi" "withRust" ] "Rust support is now the default.")
   ];
 }

apple-silicon-support/modules/mesa/default.nix

@@ -1,22 +1,24 @@
 { config, lib, ... }:
 {
-  config = lib.mkIf config.hardware.asahi.enable (lib.mkMerge [
-    {
-      # required for proper DRM setup even without GPU driver
-      services.xserver.config = ''
-        Section "OutputClass"
-            Identifier "appledrm"
-            MatchDriver "apple"
-            Driver "modesetting"
-            Option "PrimaryGPU" "true"
-        EndSection
-      '';
-    }
-    (lib.mkIf config.hardware.asahi.useExperimentalGPUDriver {
-      # install the Asahi Mesa version
-      hardware.graphics.package = config.hardware.asahi.pkgs.mesa-asahi-edge;
-    })
-  ]);
+  config = lib.mkIf config.hardware.asahi.enable (
+    lib.mkMerge [
+      {
+        # required for proper DRM setup even without GPU driver
+        services.xserver.config = ''
+          Section "OutputClass"
+              Identifier "appledrm"
+              MatchDriver "apple"
+              Driver "modesetting"
+              Option "PrimaryGPU" "true"
+          EndSection
+        '';
+      }
+      (lib.mkIf config.hardware.asahi.useExperimentalGPUDriver {
+        # install the Asahi Mesa version
+        hardware.graphics.package = config.hardware.asahi.pkgs.mesa-asahi-edge;
+      })
+    ]
+  );
 
   options.hardware.asahi.useExperimentalGPUDriver = lib.mkOption {
     type = lib.types.bool;
@@ -30,7 +32,11 @@
 
   # hopefully no longer used, should be deprecated eventually
   options.hardware.asahi.experimentalGPUInstallMode = lib.mkOption {
-    type = lib.types.enum [ "driver" "replace" "overlay" ];
+    type = lib.types.enum [
+      "driver"
+      "replace"
+      "overlay"
+    ];
     default = "replace";
     description = ''
       Mode to use to install the experimental GPU driver into the system.

apple-silicon-support/modules/peripheral-firmware/default.nix

@@ -1,35 +1,49 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   config = lib.mkIf config.hardware.asahi.enable {
     assertions = lib.mkIf config.hardware.asahi.extractPeripheralFirmware [
-      { assertion = config.hardware.asahi.peripheralFirmwareDirectory != null;
+      {
+        assertion = config.hardware.asahi.peripheralFirmwareDirectory != null;
         message = ''
           Asahi peripheral firmware extraction is enabled but the firmware
           location appears incorrect.
         '';
       }
     ];
 
-    hardware.firmware = let
-      pkgs' = config.hardware.asahi.pkgs;
-    in
-      lib.mkIf ((config.hardware.asahi.peripheralFirmwareDirectory != null)
-          && config.hardware.asahi.extractPeripheralFirmware) [
-        (pkgs.stdenv.mkDerivation {
-          name = "asahi-peripheral-firmware";
+    hardware.firmware =
+      let
+        pkgs' = config.hardware.asahi.pkgs;
+      in
+      lib.mkIf
+        (
+          (config.hardware.asahi.peripheralFirmwareDirectory != null)
+          && config.hardware.asahi.extractPeripheralFirmware
+        )
+        [
+          (pkgs.stdenv.mkDerivation {
+            name = "asahi-peripheral-firmware";
 
-          nativeBuildInputs = [ pkgs'.asahi-fwextract pkgs.cpio ];
+            nativeBuildInputs = [
+              pkgs'.asahi-fwextract
+              pkgs.cpio
+            ];
 
-          buildCommand = ''
-            mkdir extracted
-            asahi-fwextract ${config.hardware.asahi.peripheralFirmwareDirectory} extracted
+            buildCommand = ''
+              mkdir extracted
+              asahi-fwextract ${config.hardware.asahi.peripheralFirmwareDirectory} extracted
 
-            mkdir -p $out/lib/firmware
-            cat extracted/firmware.cpio | cpio -id --quiet --no-absolute-filenames
-            mv vendorfw/* $out/lib/firmware
-          '';
-        })
-      ];
+              mkdir -p $out/lib/firmware
+              cat extracted/firmware.cpio | cpio -id --quiet --no-absolute-filenames
+              mv vendorfw/* $out/lib/firmware
+            '';
+          })
+        ];
   };
 
   options.hardware.asahi = {
@@ -45,13 +59,12 @@
     peripheralFirmwareDirectory = lib.mkOption {
       type = lib.types.nullOr lib.types.path;
 
-      default = lib.findFirst (path: builtins.pathExists (path + "/all_firmware.tar.gz")) null
-        [
-          # path when the system is operating normally
-          /boot/asahi
-          # path when the system is mounted in the installer
-          /mnt/boot/asahi
-        ];
+      default = lib.findFirst (path: builtins.pathExists (path + "/all_firmware.tar.gz")) null [
+        # path when the system is operating normally
+        /boot/asahi
+        # path when the system is mounted in the installer
+        /mnt/boot/asahi
+      ];
 
       description = ''
         Path to the directory containing the non-free non-redistributable

apple-silicon-support/modules/sound/default.nix

@@ -1,4 +1,10 @@
-{ config, options, pkgs, lib, ... }:
+{
+  config,
+  options,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   options.hardware.asahi = {
@@ -12,38 +18,44 @@
     };
   };
 
-  config = let
-    cfg = config.hardware.asahi;
-  in lib.mkIf (cfg.setupAsahiSound && cfg.enable) (lib.mkMerge [
-    {
-      # can't be used by Asahi sound infrastructure
-      services.pulseaudio.enable = false;
-      # enable pipewire to run real-time and avoid audible glitches
-      security.rtkit.enable = true;
-      # set up pipewire with the supported capabilities (instead of pulseaudio)
-      # and asahi-audio configs and plugins
-      services.pipewire = {
-        enable = true;
-        alsa.enable = true;
-        pulse.enable = true;
+  config =
+    let
+      cfg = config.hardware.asahi;
+    in
+    lib.mkIf (cfg.setupAsahiSound && cfg.enable) (
+      lib.mkMerge [
+        {
+          # can't be used by Asahi sound infrastructure
+          services.pulseaudio.enable = false;
+          # enable pipewire to run real-time and avoid audible glitches
+          security.rtkit.enable = true;
+          # set up pipewire with the supported capabilities (instead of pulseaudio)
+          # and asahi-audio configs and plugins
+          services.pipewire = {
+            enable = true;
+            alsa.enable = true;
+            pulse.enable = true;
 
-        configPackages = [ pkgs.asahi-audio ];
+            configPackages = [ pkgs.asahi-audio ];
 
-        wireplumber = {
-          enable = true;
+            wireplumber = {
+              enable = true;
 
-          configPackages = [ pkgs.asahi-audio ];
-        };
-      };
+              configPackages = [ pkgs.asahi-audio ];
+            };
+          };
 
-      # set up enivronment so that UCM configs are used as well
-      environment.variables.ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf-asahi}/share/alsa/ucm2";
-      systemd.user.services.pipewire.environment.ALSA_CONFIG_UCM2 = config.environment.variables.ALSA_CONFIG_UCM2;
-      systemd.user.services.wireplumber.environment.ALSA_CONFIG_UCM2 = config.environment.variables.ALSA_CONFIG_UCM2;
+          # set up enivronment so that UCM configs are used as well
+          environment.variables.ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf-asahi}/share/alsa/ucm2";
+          systemd.user.services.pipewire.environment.ALSA_CONFIG_UCM2 =
+            config.environment.variables.ALSA_CONFIG_UCM2;
+          systemd.user.services.wireplumber.environment.ALSA_CONFIG_UCM2 =
+            config.environment.variables.ALSA_CONFIG_UCM2;
 
-      # enable speakersafetyd to protect speakers
-      systemd.packages = [ pkgs.speakersafetyd ];
-      services.udev.packages = [ pkgs.speakersafetyd ];
-    }
-  ]);
+          # enable speakersafetyd to protect speakers
+          systemd.packages = [ pkgs.speakersafetyd ];
+          services.udev.packages = [ pkgs.speakersafetyd ];
+        }
+      ]
+    );
 }