formatting

2024-05-31 16:11:42 -05:00
parent 4aead74c7f
commit 29ec754b2f
82 changed files with 1521 additions and 974 deletions
--- a/hosts/mac-nixos/apple-silicon-support/packages/alsa-ucm-conf-asahi/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/alsa-ucm-conf-asahi/default.nix
@@ -1,6 +1,8 @@
-{ lib
-, fetchFromGitHub
-, alsa-ucm-conf }:
+{
+  lib,
+  fetchFromGitHub,
+  alsa-ucm-conf,
+}:

 (alsa-ucm-conf.overrideAttrs (oldAttrs: rec {
  version = "5";
@@ -12,8 +14,10 @@
    rev = "v${version}";
    hash = "sha256-daUNz5oUrPfSMO0Tqq/WbtiLHMOtPeQQlI+juGrhTxw=";
  };
-  
-  postInstall = oldAttrs.postInstall or "" + ''
-    cp -r ${src_asahi}/ucm2 $out/share/alsa
-  '';
+
+  postInstall =
+    oldAttrs.postInstall or ""
+    + ''
+      cp -r ${src_asahi}/ucm2 $out/share/alsa
+    '';
 }))
--- a/hosts/mac-nixos/apple-silicon-support/packages/asahi-audio/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/asahi-audio/default.nix
@@ -1,6 +1,7 @@
-{ stdenv
-, lib
-, fetchFromGitHub
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
 }:

 stdenv.mkDerivation rec {
--- a/hosts/mac-nixos/apple-silicon-support/packages/asahi-fwextract/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/asahi-fwextract/default.nix
@@ -1,9 +1,10 @@
-{ lib
-, python3
-, fetchFromGitHub
-, gzip
-, gnutar
-, lzfse
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+  gzip,
+  gnutar,
+  lzfse,
 }:

 python3.pkgs.buildPythonApplication rec {
--- a/hosts/mac-nixos/apple-silicon-support/packages/bankstown-lv2/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/bankstown-lv2/default.nix
@@ -1,9 +1,10 @@
-{ lib
-, lv2
-, pkg-config
-, rustPlatform
-, fetchFromGitHub
-, fetchpatch
+{
+  lib,
+  lv2,
+  pkg-config,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch,
 }:

 rustPlatform.buildRustPackage rec {
@@ -28,11 +29,7 @@ rustPlatform.buildRustPackage rec {
    make install
  '';

-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [
-    lv2
-  ];
+  buildInputs = [ lv2 ];
 }
--- a/hosts/mac-nixos/apple-silicon-support/packages/linux-asahi/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/linux-asahi/default.nix
@@ -1,12 +1,13 @@
-{ lib
-, pkgs
-, callPackage
-, writeShellScriptBin
-, writeText
-, removeReferencesTo
-, linuxPackagesFor
-, withRust ? false
-, _kernelPatches ? [ ]
+{
+  lib,
+  pkgs,
+  callPackage,
+  writeShellScriptBin,
+  writeText,
+  removeReferencesTo,
+  linuxPackagesFor,
+  withRust ? false,
+  _kernelPatches ? [ ],
 }:

 let
@@ -14,67 +15,107 @@ let

  # parse <OPT> [ymn]|foo style configuration as found in a patch's extraConfig
  # into a list of k, v tuples
-  parseExtraConfig = config:
+  parseExtraConfig =
+    config:
    let
-      lines =
-        builtins.filter (s: s != "") (lib.strings.splitString "\n" config);
-      parseLine = line: let
-        t = lib.strings.splitString " " line;
-        join = l: builtins.foldl' (a: b: "${a} ${b}")
-          (builtins.head l) (builtins.tail l);
-        v = if (builtins.length t) > 2 then join (builtins.tail t) else (i t 1);
-      in [ "CONFIG_${i t 0}" v ];
-    in map parseLine lines;
+      lines = builtins.filter (s: s != "") (lib.strings.splitString "\n" config);
+      parseLine =
+        line:
+        let
+          t = lib.strings.splitString " " line;
+          join = l: builtins.foldl' (a: b: "${a} ${b}") (builtins.head l) (builtins.tail l);
+          v = if (builtins.length t) > 2 then join (builtins.tail t) else (i t 1);
+        in
+        [
+          "CONFIG_${i t 0}"
+          v
+        ];
+    in
+    map parseLine lines;

  # parse <OPT>=lib.kernel.(yes|module|no)|lib.kernel.freeform "foo"
  # style configuration as found in a patch's extraStructuredConfig into
  # a list of k, v tuples
-  parseExtraStructuredConfig = config: lib.attrsets.mapAttrsToList
-    (k: v: [ "CONFIG_${k}" (v.tristate or v.freeform) ] ) config;
+  parseExtraStructuredConfig =
+    config:
+    lib.attrsets.mapAttrsToList (k: v: [
+      "CONFIG_${k}"
+      (v.tristate or v.freeform)
+    ]) config;

-  parsePatchConfig = { extraConfig ? "", extraStructuredConfig ? {}, ... }:
-    (parseExtraConfig extraConfig) ++
-    (parseExtraStructuredConfig extraStructuredConfig);
+  parsePatchConfig =
+    {
+      extraConfig ? "",
+      extraStructuredConfig ? { },
+      ...
+    }:
+    (parseExtraConfig extraConfig) ++ (parseExtraStructuredConfig extraStructuredConfig);

  # parse CONFIG_<OPT>=[ymn]|"foo" style configuration as found in a config file
  # into a list of k, v tuples
-  parseConfig = config:
+  parseConfig =
+    config:
    let
      parseLine = builtins.match ''(CONFIG_[[:upper:][:digit:]_]+)=(([ymn])|"([^"]*)")'';
      # get either the [ymn] option or the "foo" option; whichever matched
-      t = l: let v = (i l 2); in [ (i l 0) (if v != null then v else (i l 3)) ];
+      t =
+        l:
+        let
+          v = (i l 2);
+        in
+        [
+          (i l 0)
+          (if v != null then v else (i l 3))
+        ];
      lines = lib.strings.splitString "\n" config;
-    in map t (builtins.filter (l: l != null) (map parseLine lines));
+    in
+    map t (builtins.filter (l: l != null) (map parseLine lines));

  origConfigfile = ./config;

-  linux-asahi-pkg = { stdenv, lib, fetchFromGitHub, fetchpatch, linuxKernel,
-      rustPlatform, rustc, rustfmt, rust-bindgen, ... } @ args:
+  linux-asahi-pkg =
+    {
+      stdenv,
+      lib,
+      fetchFromGitHub,
+      fetchpatch,
+      linuxKernel,
+      rustPlatform,
+      rustc,
+      rustfmt,
+      rust-bindgen,
+      ...
+    }@args:
    let
      origConfigText = builtins.readFile origConfigfile;

      # extraConfig from all patches in order
-      extraConfig =
-        lib.fold (patch: ex: ex ++ (parsePatchConfig patch)) [] _kernelPatches;
+      extraConfig = lib.fold (patch: ex: ex ++ (parsePatchConfig patch)) [ ] _kernelPatches;
      # config file text for above
-      extraConfigText = let
-        text = k: v: if (v == "y") || (v == "m") || (v == "n")
-          then "${k}=${v}" else ''${k}="${v}"'';
-      in (map (t: text (i t 0) (i t 1)) extraConfig);
+      extraConfigText =
+        let
+          text = k: v: if (v == "y") || (v == "m") || (v == "n") then "${k}=${v}" else ''${k}="${v}"'';
+        in
+        (map (t: text (i t 0) (i t 1)) extraConfig);

      # final config as a text file path
-      configfile = if extraConfig == [] then origConfigfile else
-        writeText "config" ''
-          ${origConfigText}
+      configfile =
+        if extraConfig == [ ] then
+          origConfigfile
+        else
+          writeText "config" ''
+            ${origConfigText}

-          # Patches
-          ${lib.strings.concatStringsSep "\n" extraConfigText}
-        '';
+            # Patches
+            ${lib.strings.concatStringsSep "\n" extraConfigText}
+          '';
      # final config as an attrset
-      configAttrs = let
-        makePair = t: lib.nameValuePair (i t 0) (i t 1);
-        configList = (parseConfig origConfigText) ++ extraConfig;
-      in builtins.listToAttrs (map makePair (lib.lists.reverseList configList));
+      configAttrs =
+        let
+          makePair = t: lib.nameValuePair (i t 0) (i t 1);
+          configList = (parseConfig origConfigText) ++ extraConfig;
+        in
+        builtins.listToAttrs (map makePair (lib.lists.reverseList configList));

      # used to (ostensibly) keep compatibility for those running stable versions of nixos
      rustOlder = version: withRust && (lib.versionOlder rustc.version version);
@@ -84,71 +125,94 @@ let
      rustAtLeast = version: withRust && (lib.versionAtLeast rustc.version version);
      bindgenAtLeast = version: withRust && (lib.versionAtLeast rust-bindgen.unwrapped.version version);
    in
-    (linuxKernel.manualConfig rec {
-      inherit stdenv lib;
+    (
+      linuxKernel.manualConfig rec {
+        inherit stdenv lib;

-      version = "6.6.0-asahi";
-      modDirVersion = version;
-      extraMeta.branch = "6.6";
+        version = "6.6.0-asahi";
+        modDirVersion = version;
+        extraMeta.branch = "6.6";

-      src = fetchFromGitHub {
-        # tracking: https://github.com/AsahiLinux/linux/tree/asahi-wip (w/ fedora verification)
-        owner = "AsahiLinux";
-        repo = "linux";
-        rev = "asahi-6.6-15";
-        hash = "sha256-Jm7wTKWuwd/6ZN0g5F4CNNETiOyGQL31hfSyTDYH85k=";
-      };
+        src = fetchFromGitHub {
+          # tracking: https://github.com/AsahiLinux/linux/tree/asahi-wip (w/ fedora verification)
+          owner = "AsahiLinux";
+          repo = "linux";
+          rev = "asahi-6.6-15";
+          hash = "sha256-Jm7wTKWuwd/6ZN0g5F4CNNETiOyGQL31hfSyTDYH85k=";
+        };

-      kernelPatches = [
-        { name = "coreutils-fix";
-          patch = ./0001-fs-fcntl-accept-more-values-as-F_DUPFD_CLOEXEC-args.patch;
-        }
-        # speaker enablement; we assert on the relevant lsp-plugins patch
-        # before installing speakersafetyd to let the speakers work
-        { name = "speakers-1";
-          patch = fetchpatch {
-            url = "https://github.com/AsahiLinux/linux/commit/385ea7b5023486aba7919cec8b6b3f6a843a1013.patch";
-            hash = "sha256-u7IzhJbUgBPfhJXAcpHw1I6OPzPHc1UKYjH91Ep3QHQ=";
-          };
-        }
-        { name = "speakers-2";
-          patch = fetchpatch {
-            url = "https://github.com/AsahiLinux/linux/commit/6a24102c06c95951ab992e2d41336cc6d4bfdf23.patch";
-            hash = "sha256-wn5x2hN42/kCp/XHBvLWeNLfwlOBB+T6UeeMt2tSg3o=";
-          };
-        }
-      ] ++ lib.optionals (rustAtLeast "1.75.0") [
-        { name = "rustc-1.75.0";
-          patch = ./0001-check-in-new-alloc-for-1.75.0.patch;
-        }
-      ] ++ lib.optionals (rustAtLeast "1.76.0") [
-        { name = "rustc-1.76.0";
-          patch = ./rust_1_76_0.patch;
-        }
-      ] ++ _kernelPatches;
+        kernelPatches =
+          [
+            {
+              name = "coreutils-fix";
+              patch = ./0001-fs-fcntl-accept-more-values-as-F_DUPFD_CLOEXEC-args.patch;
+            }
+            # speaker enablement; we assert on the relevant lsp-plugins patch
+            # before installing speakersafetyd to let the speakers work
+            {
+              name = "speakers-1";
+              patch = fetchpatch {
+                url = "https://github.com/AsahiLinux/linux/commit/385ea7b5023486aba7919cec8b6b3f6a843a1013.patch";
+                hash = "sha256-u7IzhJbUgBPfhJXAcpHw1I6OPzPHc1UKYjH91Ep3QHQ=";
+              };
+            }
+            {
+              name = "speakers-2";
+              patch = fetchpatch {
+                url = "https://github.com/AsahiLinux/linux/commit/6a24102c06c95951ab992e2d41336cc6d4bfdf23.patch";
+                hash = "sha256-wn5x2hN42/kCp/XHBvLWeNLfwlOBB+T6UeeMt2tSg3o=";
+              };
+            }
+          ]
+          ++ lib.optionals (rustAtLeast "1.75.0") [
+            {
+              name = "rustc-1.75.0";
+              patch = ./0001-check-in-new-alloc-for-1.75.0.patch;
+            }
+          ]
+          ++ lib.optionals (rustAtLeast "1.76.0") [
+            {
+              name = "rustc-1.76.0";
+              patch = ./rust_1_76_0.patch;
+            }
+          ]
+          ++ _kernelPatches;

-      inherit configfile;
-      # hide Rust support from the nixpkgs infra to avoid it re-adding the rust packages.
-      # we can't use it until it's in stable and until we've evaluated the cross-compilation impact.
-      config = configAttrs // { "CONFIG_RUST" = "n"; };
-    } // (args.argsOverride or {})).overrideAttrs (old: if withRust then {
-      nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
-        rust-bindgen
-        rustfmt
-        rustc
-        removeReferencesTo
-      ];
-      # HACK: references shouldn't have been there in the first place
-      # TODO: remove once 23.05 is obsolete
-      postFixup = (old.postFixup or "") + ''
-        if [ -f $dev/lib/modules/${old.version}/build/vmlinux ]; then
-          remove-references-to -t $out $dev/lib/modules/${old.version}/build/vmlinux
-        fi
-        remove-references-to -t $dev $out/Image
-      '';
-      RUST_LIB_SRC = rustPlatform.rustLibSrc;
-    } else {});
+        inherit configfile;
+        # hide Rust support from the nixpkgs infra to avoid it re-adding the rust packages.
+        # we can't use it until it's in stable and until we've evaluated the cross-compilation impact.
+        config = configAttrs // {
+          "CONFIG_RUST" = "n";
+        };
+      }
+      // (args.argsOverride or { })
+    ).overrideAttrs
+      (
+        old:
+        if withRust then
+          {
+            nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+              rust-bindgen
+              rustfmt
+              rustc
+              removeReferencesTo
+            ];
+            # HACK: references shouldn't have been there in the first place
+            # TODO: remove once 23.05 is obsolete
+            postFixup =
+              (old.postFixup or "")
+              + ''
+                if [ -f $dev/lib/modules/${old.version}/build/vmlinux ]; then
+                  remove-references-to -t $out $dev/lib/modules/${old.version}/build/vmlinux
+                fi
+                remove-references-to -t $dev $out/Image
+              '';
+            RUST_LIB_SRC = rustPlatform.rustLibSrc;
+          }
+        else
+          { }
+      );

  linux-asahi = (callPackage linux-asahi-pkg { });
-in lib.recurseIntoAttrs (linuxPackagesFor linux-asahi)
-
+in
+lib.recurseIntoAttrs (linuxPackagesFor linux-asahi)
--- a/hosts/mac-nixos/apple-silicon-support/packages/m1n1/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/m1n1/default.nix
@@ -1,29 +1,33 @@
-{ stdenv
-, buildPackages
-, lib
-, fetchFromGitHub
-, python3
-, dtc
-, imagemagick
-, isRelease ? false
-, withTools ? true
-, withChainloading ? false
-, rust-bin ? null
-, customLogo ? null
+{
+  stdenv,
+  buildPackages,
+  lib,
+  fetchFromGitHub,
+  python3,
+  dtc,
+  imagemagick,
+  isRelease ? false,
+  withTools ? true,
+  withChainloading ? false,
+  rust-bin ? null,
+  customLogo ? null,
 }:

 assert withChainloading -> rust-bin != null;

 let
-  pyenv = python3.withPackages (p: with p; [
-    construct
-    pyserial
-  ]);
+  pyenv = python3.withPackages (
+    p: with p; [
+      construct
+      pyserial
+    ]
+  );

-  rustenv = rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal.override {
-    targets = [ "aarch64-unknown-none-softfloat" ];
-  });
-in stdenv.mkDerivation rec {
+  rustenv = rust-bin.selectLatestNightlyWith (
+    toolchain: toolchain.minimal.override { targets = [ "aarch64-unknown-none-softfloat" ]; }
+  );
+in
+stdenv.mkDerivation rec {
  pname = "m1n1";
  version = "1.4.11";

@@ -36,15 +40,14 @@ in stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

-  makeFlags = [ "ARCH=${stdenv.cc.targetPrefix}" ]
-    ++ lib.optional isRelease "RELEASE=1"
-    ++ lib.optional withChainloading "CHAINLOADING=1";
+  makeFlags = [
+    "ARCH=${stdenv.cc.targetPrefix}"
+  ] ++ lib.optional isRelease "RELEASE=1" ++ lib.optional withChainloading "CHAINLOADING=1";

  nativeBuildInputs = [
    dtc
    buildPackages.gcc
-  ] ++ lib.optional withChainloading rustenv
-    ++ lib.optional (customLogo != null) imagemagick;
+  ] ++ lib.optional withChainloading rustenv ++ lib.optional (customLogo != null) imagemagick;

  postPatch = ''
    substituteInPlace proxyclient/m1n1/asm.py \
@@ -67,35 +70,38 @@ in stdenv.mkDerivation rec {
    popd &>/dev/null
  '';

-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    ''
+      runHook preInstall

-    mkdir -p $out/build
-    cp build/m1n1.bin $out/build
-  '' + (lib.optionalString withTools ''
-    mkdir -p $out/{bin,script,toolchain-bin}
-    cp -r proxyclient $out/script
-    cp -r tools $out/script
+      mkdir -p $out/build
+      cp build/m1n1.bin $out/build
+    ''
+    + (lib.optionalString withTools ''
+          mkdir -p $out/{bin,script,toolchain-bin}
+          cp -r proxyclient $out/script
+          cp -r tools $out/script

-    for toolpath in $out/script/proxyclient/tools/*.py; do
-      tool=$(basename $toolpath .py)
-      script=$out/bin/m1n1-$tool
-      cat > $script <<EOF
-#!/bin/sh
-${pyenv}/bin/python $toolpath "\$@"
-EOF
-      chmod +x $script
-    done
+          for toolpath in $out/script/proxyclient/tools/*.py; do
+            tool=$(basename $toolpath .py)
+            script=$out/bin/m1n1-$tool
+            cat > $script <<EOF
+      #!/bin/sh
+      ${pyenv}/bin/python $toolpath "\$@"
+      EOF
+            chmod +x $script
+          done

-    GCC=${buildPackages.gcc}
-    BINUTILS=${buildPackages.binutils-unwrapped}
+          GCC=${buildPackages.gcc}
+          BINUTILS=${buildPackages.binutils-unwrapped}

-    ln -s $GCC/bin/${stdenv.cc.targetPrefix}gcc $out/toolchain-bin/
-    ln -s $GCC/bin/${stdenv.cc.targetPrefix}ld $out/toolchain-bin/
-    ln -s $BINUTILS/bin/${stdenv.cc.targetPrefix}objcopy $out/toolchain-bin/
-    ln -s $BINUTILS/bin/${stdenv.cc.targetPrefix}objdump $out/toolchain-bin/
-    ln -s $GCC/bin/${stdenv.cc.targetPrefix}nm $out/toolchain-bin/
-  '') + ''
-    runHook postInstall
-  '';
+          ln -s $GCC/bin/${stdenv.cc.targetPrefix}gcc $out/toolchain-bin/
+          ln -s $GCC/bin/${stdenv.cc.targetPrefix}ld $out/toolchain-bin/
+          ln -s $BINUTILS/bin/${stdenv.cc.targetPrefix}objcopy $out/toolchain-bin/
+          ln -s $BINUTILS/bin/${stdenv.cc.targetPrefix}objdump $out/toolchain-bin/
+          ln -s $GCC/bin/${stdenv.cc.targetPrefix}nm $out/toolchain-bin/
+    '')
+    + ''
+      runHook postInstall
+    '';
 }
--- a/hosts/mac-nixos/apple-silicon-support/packages/mesa-asahi-edge/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/mesa-asahi-edge/default.nix
@@ -1,49 +1,56 @@
-{ lib
-, fetchFromGitLab
-, mesa
-, meson
-, llvmPackages
+{
+  lib,
+  fetchFromGitLab,
+  mesa,
+  meson,
+  llvmPackages,
 }:

 (mesa.override {
-  galliumDrivers = [ "swrast" "asahi" ];
+  galliumDrivers = [
+    "swrast"
+    "asahi"
+  ];
  vulkanDrivers = [ "swrast" ];
  enableGalliumNine = false;
  # libclc and other OpenCL components are needed for geometry shader support on Apple Silicon
  enableOpenCL = true;
-}).overrideAttrs (oldAttrs: {
-  # version must be the same length (i.e. no unstable or date)
-  # so that system.replaceRuntimeDependencies can work
-  version = "24.1.0";
-  src = fetchFromGitLab {
-    # tracking: https://pagure.io/fedora-asahi/mesa/commits/asahi
-    domain = "gitlab.freedesktop.org";
-    owner = "asahi";
-    repo = "mesa";
-    rev = "asahi-20240228";
-    hash = "sha256-wOFJyYfoN6yxE9HaHXLP/0MhjyRvmlb+jPPUke0sbbE=";
-  };
+}).overrideAttrs
+  (oldAttrs: {
+    # version must be the same length (i.e. no unstable or date)
+    # so that system.replaceRuntimeDependencies can work
+    version = "24.1.0";
+    src = fetchFromGitLab {
+      # tracking: https://pagure.io/fedora-asahi/mesa/commits/asahi
+      domain = "gitlab.freedesktop.org";
+      owner = "asahi";
+      repo = "mesa";
+      rev = "asahi-20240228";
+      hash = "sha256-wOFJyYfoN6yxE9HaHXLP/0MhjyRvmlb+jPPUke0sbbE=";
+    };

-  mesonFlags =
-    # remove flag to configure xvmc functionality as having it
-    # breaks the build because that no longer exists in Mesa 23
-    (lib.filter (x: !(lib.hasPrefix "-Dxvmc-libs-path=" x)) oldAttrs.mesonFlags) ++ [
-      # we do not build any graphics drivers these features can be enabled for
-      "-Dgallium-va=disabled"
-      "-Dgallium-vdpau=disabled"
-      "-Dgallium-xa=disabled"
-      # does not make any sense
-      "-Dandroid-libbacktrace=disabled"
-      # do not want to add the dependencies
-      "-Dlibunwind=disabled"
-      "-Dlmsensors=disabled"
-    ] ++ ( # does not compile on nixpkgs stable, doesn't seem mandatory
-      lib.optional (lib.versionOlder meson.version "1.3.1")
-        "-Dgallium-rusticl=false");
+    mesonFlags =
+      # remove flag to configure xvmc functionality as having it
+      # breaks the build because that no longer exists in Mesa 23
+      (lib.filter (x: !(lib.hasPrefix "-Dxvmc-libs-path=" x)) oldAttrs.mesonFlags)
+      ++ [
+        # we do not build any graphics drivers these features can be enabled for
+        "-Dgallium-va=disabled"
+        "-Dgallium-vdpau=disabled"
+        "-Dgallium-xa=disabled"
+        # does not make any sense
+        "-Dandroid-libbacktrace=disabled"
+        # do not want to add the dependencies
+        "-Dlibunwind=disabled"
+        "-Dlmsensors=disabled"
+      ]
+      ++
+        # does not compile on nixpkgs stable, doesn't seem mandatory
+        (lib.optional (lib.versionOlder meson.version "1.3.1") "-Dgallium-rusticl=false");

-  # replace patches with ones tweaked slightly to apply to this version
-  patches = [
-    ./disk_cache-include-dri-driver-path-in-cache-key.patch
-    ./opencl.patch
-  ];
-})
+    # replace patches with ones tweaked slightly to apply to this version
+    patches = [
+      ./disk_cache-include-dri-driver-path-in-cache-key.patch
+      ./opencl.patch
+    ];
+  })
--- a/hosts/mac-nixos/apple-silicon-support/packages/speakersafetyd/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/speakersafetyd/default.nix
@@ -1,9 +1,10 @@
-{ rustPlatform
-, stdenv
-, rust
-, fetchCrate
-, pkg-config
-, alsa-lib
+{
+  rustPlatform,
+  stdenv,
+  rust,
+  fetchCrate,
+  pkg-config,
+  alsa-lib,
 }:

 rustPlatform.buildRustPackage rec {
--- a/hosts/mac-nixos/apple-silicon-support/packages/uboot-asahi/default.nix
+++ b/hosts/mac-nixos/apple-silicon-support/packages/uboot-asahi/default.nix
@@ -1,7 +1,8 @@
-{ lib
-, fetchFromGitHub
-, buildUBoot
-, m1n1
+{
+  lib,
+  fetchFromGitHub,
+  buildUBoot,
+  m1n1,
 }:

 (buildUBoot rec {
@@ -27,17 +28,17 @@
    CONFIG_VIDEO_FONT_SUN12X22=n
    CONFIG_VIDEO_FONT_16X32=y
  '';
-}).overrideAttrs (o: {
-  # nixos's downstream patches are not applicable
-  patches = [ 
-  ];
+}).overrideAttrs
+  (o: {
+    # nixos's downstream patches are not applicable
+    patches = [ ];

-  # DTC= flag somehow breaks DTC compilation so we remove it
-  makeFlags = builtins.filter (s: (!(lib.strings.hasPrefix "DTC=" s))) o.makeFlags;
+    # DTC= flag somehow breaks DTC compilation so we remove it
+    makeFlags = builtins.filter (s: (!(lib.strings.hasPrefix "DTC=" s))) o.makeFlags;

-  preInstall = ''
-    # compress so that m1n1 knows U-Boot's size and can find things after it
-    gzip -n u-boot-nodtb.bin
-    cat ${m1n1}/build/m1n1.bin arch/arm/dts/t[68]*.dtb u-boot-nodtb.bin.gz > m1n1-u-boot.bin
-  '';
-})
+    preInstall = ''
+      # compress so that m1n1 knows U-Boot's size and can find things after it
+      gzip -n u-boot-nodtb.bin
+      cat ${m1n1}/build/m1n1.bin arch/arm/dts/t[68]*.dtb u-boot-nodtb.bin.gz > m1n1-u-boot.bin
+    '';
+  })