Skip to content

Commit c26dd9b

Browse files
Mic92Mic92
authored
Merge pull request #1496 from 8bitbuddhist/nixfmt
chore: format repo using treefmt-nix and nixfmt-rfc-style
2 parents 8b1f894 + c3f13f2 commit c26dd9b

File tree

268 files changed

+3724
-2748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+3724
-2748
lines changed

‎airis/n990/default.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
kernelParams = [
1010
"apm=on"
1111
"acpi=on"
12-
"vga=0x317" # 1024x768
12+
"vga=0x317" # 1024x768
1313
"console=tty1"
14-
"video=vesafb:ywrap" # Faster scroll
15-
];
14+
"video=vesafb:ywrap" # Faster scroll
15+
];
1616
};
1717

1818
hardware.firmware = with pkgs; [ intel2200BGFirmware ];

‎apple/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"hid_apple.iso_layout=0"
66
];
77

8-
hardware.facetimehd.enable = lib.mkDefault
9-
(config.nixpkgs.config.allowUnfree or false);
8+
hardware.facetimehd.enable = lib.mkDefault (config.nixpkgs.config.allowUnfree or false);
109

1110
services.mbpfan.enable = lib.mkDefault true;
1211
}

‎apple/imac/18-2/default.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
lib,
44
pkgs,
55
...
6-
}: {
6+
}:
7+
{
78
imports = [
89
../.
910
../../../common/cpu/intel/kaby-lake
@@ -14,7 +15,12 @@
1415

1516
# apple smc (TODO: check spi)
1617
boot = {
17-
initrd.kernelModules = ["applespi" "spi_pxa2xx_platform" "intel_lpss_pci" "applesmc" ];
18+
initrd.kernelModules = [
19+
"applespi"
20+
"spi_pxa2xx_platform"
21+
"intel_lpss_pci"
22+
"applesmc"
23+
];
1824
kernelParams = [ "intel_iommu=on" ];
1925
kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
2026
};

‎apple/macbook-air/3/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ config, lib, ... }:
22

33
{
4-
imports = [
4+
imports = [
55
../../.
66
../../../common/cpu/intel
77
../../../common/pc/laptop

‎apple/macbook-air/7/default.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
{ config, lib, pkgs, ... }:
1+
{
2+
config,
3+
lib,
4+
pkgs,
5+
...
6+
}:
27

38
{
49
imports = [

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ in
1818
services.udev.extraRules =
1919
# Disable XHC1 wakeup signal to avoid resume getting triggered some time
2020
# after suspend. Reboot required for this to take effect.
21-
lib.optionalString
22-
(lib.versionAtLeast kernelPackages.kernel.version "3.13")
21+
lib.optionalString (lib.versionAtLeast kernelPackages.kernel.version "3.13")
2322
''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"'';
2423
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
{ lib, pkgs, modulesPath, ... }:
1+
{
2+
lib,
3+
pkgs,
4+
modulesPath,
5+
...
6+
}:
27

38
{
49
imports = [
@@ -19,7 +24,7 @@
1924
powerDownCommands = lib.mkBefore ''
2025
${pkgs.kmod}/bin/rmmod -f -v brcmfmac_wcc 2>/dev/null || true
2126
${pkgs.kmod}/bin/rmmod brcmfmac
22-
'';
27+
'';
2328
};
2429

2530
# USB subsystem wakes up MBP right after suspend unless we disable it.

‎apple/macbook-pro/14-1/default.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
lib,
44
pkgs,
55
...
6-
}: {
6+
}:
7+
{
78
imports = [
89
../.
910
../../../common/cpu/intel/kaby-lake
@@ -15,7 +16,12 @@
1516
# https://www.kernelconfig.io/config_keyboard_applespi
1617

1718
boot = {
18-
initrd.kernelModules = ["applespi" "spi_pxa2xx_platform" "intel_lpss_pci" "applesmc" ];
19+
initrd.kernelModules = [
20+
"applespi"
21+
"spi_pxa2xx_platform"
22+
"intel_lpss_pci"
23+
"applesmc"
24+
];
1925
kernelParams = [ "intel_iommu=on" ];
2026
kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.0") pkgs.linuxPackages_latest;
2127
};

‎apple/macbook-pro/8-1/default.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
{ config, lib, pkgs, ... }:
1+
{
2+
config,
3+
lib,
4+
pkgs,
5+
...
6+
}:
27

38
{
49
imports = [

‎apple/t2/default.nix

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let
2525
overrideAudioFiles =
2626
package: pluginsPath:
2727
package.overrideAttrs (
28-
new: old: {
28+
_new: old: {
2929
preConfigurePhases = old.preConfigurePhases or [ ] ++ [ "postPatchPhase" ];
3030
postPatchPhase = ''
3131
cp -r ${audioFiles}/files/{profile-sets,paths} ${pluginsPath}/alsa/mixer/
@@ -106,11 +106,16 @@ in
106106
powerManagement.enable = true;
107107
}
108108

109-
(if lib.versionAtLeast nixosVersion "25.05" then {
110-
services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
111-
} else {
112-
hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
113-
})
109+
(
110+
if lib.versionAtLeast nixosVersion "25.05" then
111+
{
112+
services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
113+
}
114+
else
115+
{
116+
hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
117+
}
118+
)
114119

115120
(lib.mkIf t2Cfg.enableIGPU {
116121
# Enable the iGPU by default if present

0 commit comments

Comments
 (0)