Merge branch 'master' into master

Author: bubuntux

.git-blame-ignore-revs

@@ -0,0 +1,12 @@
+# This file contains commits that should be ignored by git blame
+# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-file
+# and https://github.com/NixOS/nixpkgs/blob/master/.git-blame-ignore-revs for more info
+
+# To enable this in your local repository, run:
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# For rebasing PRs, commits marked with !autorebase will be automatically
+# reapplied by the auto-rebase script
+
+# nixfmt-rfc-style formatting
+51e51e601448705c0d2f92ef90ec7b680123077c #!autorebase cd tests && nix fmt ..

.github/workflows/test.yml

@@ -4,10 +4,18 @@ on:
   push:
     branches:
       - master
+  merge_group:
 jobs:
+  nixfmt:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v31
+    - run: cd tests && nix fmt .. -- --fail-on-change
   tests:
+    needs: nixfmt
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v31
-    - run: nix run ./tests#run .
+    - run: nix run ./tests#run .

README.md

@@ -69,6 +69,17 @@ See [CONTRIBUTING.md](./CONTRIBUTING.md).
 
 For questions and discussions, come join us in the [nixos-anywhere matrix](https://matrix.to/#/#nixos-hardware:nixos.org) room.
 
+# Community Meetings
+
+The [NixOS hardware](https://github.com/orgs/NixOS/teams/nixos-hardware) team meets regularly to discuss hardware profiles and maintenance:
+
+- **When**: Every 3rd Friday of the month
+- **Time**: 04:00 pm (UTC) / 16:00 (UTC)
+- **Where**: https://jitsi.lassul.us/Hardware-team
+- **Contact**: hardware@nixos.org
+
+All contributors and users are welcome to join!
+
 ## List of Profiles
 
 See code for all available configurations.
@@ -396,6 +407,7 @@ See code for all available configurations.
 | [System76 Darter Pro 6](system76/darp6)                                           | `<nixos-hardware/system76/darp6>`                       | `system76-darp6`|
 | [System76 Gazelle 18](system76/gaze18)                                            | `<nixos-hardware/system76/gaze18>`                      | `system76-gaze18`|
 | [System76 Galago Pro 5](system76/galp5-1650)                                      | `<nixos-hardware/system76/galp5-1650>`                  | `system76-galp5-1650`|
+| [System76 Thelio Mega](system76/thelio-mega)                                      | `<nixos-hardware/system76/thelio-mega>`                 | `system76-thelio-mega`|
 | [Toshiba Chromebook 2 `swanky`](toshiba/swanky)                                   | `<nixos-hardware/toshiba/swanky>`                       | `toshiba-swanky`|
 | [Tuxedo InfinityBook v4](tuxedo/infinitybook/v4)                                  | `<nixos-hardware/tuxedo/infinitybook/v4>`               | `tuxedo-infinitybook-v4`|
 | [TUXEDO Aura 15 - Gen1](tuxedo/aura/15/gen1)                                      | `<nixos-hardware/tuxedo/aura/15/gen1>`                  | `tuxedo-aura-15-gen1`|

airis/n990/default.nix

@@ -9,10 +9,10 @@
     kernelParams = [
       "apm=on"
       "acpi=on"
-      "vga=0x317"  # 1024x768
+      "vga=0x317" # 1024x768
       "console=tty1"
-      "video=vesafb:ywrap"  # Faster scroll
-     ];
+      "video=vesafb:ywrap" # Faster scroll
+    ];
   };
 
   hardware.firmware = with pkgs; [ intel2200BGFirmware ];

apple/default.nix

@@ -5,8 +5,7 @@
     "hid_apple.iso_layout=0"
   ];
 
-  hardware.facetimehd.enable = lib.mkDefault
-    (config.nixpkgs.config.allowUnfree or false);
+  hardware.facetimehd.enable = lib.mkDefault (config.nixpkgs.config.allowUnfree or false);
 
   services.mbpfan.enable = lib.mkDefault true;
 }

apple/imac/18-2/default.nix

@@ -3,7 +3,8 @@
   lib,
   pkgs,
   ...
-}: {
+}:
+{
   imports = [
     ../.
     ../../../common/cpu/intel/kaby-lake
@@ -14,7 +15,12 @@
 
   # apple smc (TODO: check spi)
   boot = {
-    initrd.kernelModules = ["applespi" "spi_pxa2xx_platform" "intel_lpss_pci" "applesmc" ];
+    initrd.kernelModules = [
+      "applespi"
+      "spi_pxa2xx_platform"
+      "intel_lpss_pci"
+      "applesmc"
+    ];
     kernelParams = [ "intel_iommu=on" ];
     kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
   };

apple/macbook-air/3/default.nix

@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 {
-  imports = [ 
+  imports = [
     ../../.
     ../../../common/cpu/intel
     ../../../common/pc/laptop

apple/macbook-air/7/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   imports = [

apple/macbook-pro/11-5/default.nix

@@ -18,7 +18,6 @@ in
   services.udev.extraRules =
     # Disable XHC1 wakeup signal to avoid resume getting triggered some time
     # after suspend. Reboot required for this to take effect.
-    lib.optionalString
-      (lib.versionAtLeast kernelPackages.kernel.version "3.13")
+    lib.optionalString (lib.versionAtLeast kernelPackages.kernel.version "3.13")
       ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"'';
 }

apple/macbook-pro/12-1/default.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, modulesPath, ... }:
+{
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
   imports = [
@@ -19,7 +24,7 @@
     powerDownCommands = lib.mkBefore ''
       ${pkgs.kmod}/bin/rmmod -f -v brcmfmac_wcc 2>/dev/null || true
       ${pkgs.kmod}/bin/rmmod brcmfmac
-      '';
+    '';
   };
 
   # USB subsystem wakes up MBP right after suspend unless we disable it.