format nix code after nixfmt update

This commit is contained in:
Jörg Thalheim 2025-08-17 11:21:04 +02:00
parent 4bafcc2454
commit 6ec1e82182
13 changed files with 105 additions and 109 deletions

View file

@ -6,8 +6,7 @@
../../../common/gpu/amd ../../../common/gpu/amd
]; ];
boot.kernelParams = boot.kernelParams = [
[
# There seems to be an issue with panel self-refresh (PSR) that # There seems to be an issue with panel self-refresh (PSR) that
# causes hangs for users. # causes hangs for users.
# #

View file

@ -9,8 +9,7 @@
../../../common/cpu/intel ../../../common/cpu/intel
]; ];
boot.kernelParams = boot.kernelParams = [
[
# For Power consumption # For Power consumption
# https://community.frame.work/t/linux-battery-life-tuning/6665/156 # https://community.frame.work/t/linux-battery-life-tuning/6665/156
"nvme.noacpi=1" "nvme.noacpi=1"

View file

@ -6,8 +6,7 @@
../../../common/gpu/amd ../../../common/gpu/amd
]; ];
boot.kernelParams = boot.kernelParams = [
[
# There seems to be an issue with panel self-refresh (PSR) that # There seems to be an issue with panel self-refresh (PSR) that
# causes hangs for users. # causes hangs for users.
# #

View file

@ -10,8 +10,7 @@
# remove all packages for amd igpu. I only removed amdgpu from # remove all packages for amd igpu. I only removed amdgpu from
# services.xserver.videoDrivers by overriding. This is because the specialization # services.xserver.videoDrivers by overriding. This is because the specialization
# of nix cannot implement such an operation as canceling an import. # of nix cannot implement such an operation as canceling an import.
hardware = hardware = {
{
nvidia.prime.offload.enable = false; nvidia.prime.offload.enable = false;
} }
// lib.optionalAttrs (options ? amdgpu.opencl.enable) { // lib.optionalAttrs (options ? amdgpu.opencl.enable) {

View file

@ -10,8 +10,7 @@
# remove all packages for amd igpu. I only removed amdgpu from # remove all packages for amd igpu. I only removed amdgpu from
# services.xserver.videoDrivers by overriding. This is because the specialization # services.xserver.videoDrivers by overriding. This is because the specialization
# of nix cannot implement such an operation as canceling an import. # of nix cannot implement such an operation as canceling an import.
hardware = hardware = {
{
nvidia.prime.offload.enable = false; nvidia.prime.offload.enable = false;
} }
// lib.optionalAttrs (options ? amdgpu.opencl.enable) { // lib.optionalAttrs (options ? amdgpu.opencl.enable) {

View file

@ -3,8 +3,7 @@
{ {
imports = [ ../hybrid ]; imports = [ ../hybrid ];
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
hardware = hardware = {
{
nvidia.prime.offload.enable = false; nvidia.prime.offload.enable = false;
} }
// lib.optionalAttrs (options ? amdgpu.opencl.enable) { // lib.optionalAttrs (options ? amdgpu.opencl.enable) {

View file

@ -14,8 +14,9 @@
# amdgpu.backlight=0 makes the backlight work # amdgpu.backlight=0 makes the backlight work
# acpi_backlight=none allows the backlight save/load systemd service to work on older kernel versions # acpi_backlight=none allows the backlight save/load systemd service to work on older kernel versions
boot.kernelParams = boot.kernelParams = [
[ "amdgpu.backlight=0" ] "amdgpu.backlight=0"
]
++ lib.optional (lib.versionOlder config.boot.kernelPackages.kernel.version "6.1.6") "acpi_backlight=none"; ++ lib.optional (lib.versionOlder config.boot.kernelPackages.kernel.version "6.1.6") "acpi_backlight=none";
# For mainline support of rtw89 wireless networking # For mainline support of rtw89 wireless networking

View file

@ -24,8 +24,7 @@ let
let let
inherit (builtins) removeAttrs; inherit (builtins) removeAttrs;
args' = args' = {
{
inherit inherit
src src
version version

View file

@ -139,7 +139,8 @@
device = "/iso/nix-store.squashfs"; device = "/iso/nix-store.squashfs";
options = [ options = [
"loop" "loop"
] ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi"; ]
++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "threads=multi";
neededForBoot = true; neededForBoot = true;
}; };

View file

@ -47,8 +47,7 @@ pkgs.stdenv.mkDerivation rec {
${firmwareSeco} --auto-accept --force ${firmwareSeco} --auto-accept --force
''; '';
filesToInstall = filesToInstall = [
[
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/dpfw.bin" "firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/dpfw.bin"
"firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/hdmi?xfw.bin" "firmware-imx-${fwHdmiVersion}/firmware/hdmi/cadence/hdmi?xfw.bin"
] ]

View file

@ -61,8 +61,7 @@ pkgs.stdenv.mkDerivation {
--replace "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/cpp --replace "\$(CROSS_COMPILE_\$(sm))cpp" ${cpp}/bin/cpp
''; '';
makeFlags = makeFlags = [
[
"PLATFORM=${platform}" "PLATFORM=${platform}"
] ]
++ lib.optionals (!hasFullPlatform) [ ++ lib.optionals (!hasFullPlatform) [
@ -85,5 +84,6 @@ pkgs.stdenv.mkDerivation {
homepage = "https://github.com/nxp-imx/imx-optee-os"; homepage = "https://github.com/nxp-imx/imx-optee-os";
license = [ lib.licenses.bsd2 ]; license = [ lib.licenses.bsd2 ];
platforms = [ "aarch64-linux" ]; platforms = [ "aarch64-linux" ];
} // meta; }
// meta;
} }

View file

@ -57,7 +57,8 @@ stdenv.mkDerivation {
gnutls gnutls
perl perl
efitools efitools
] ++ extraNativeBuildInputs; ]
++ extraNativeBuildInputs;
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];

View file

@ -45,7 +45,8 @@ let
}; };
} }
{ patch = ./irq-desc-to-data.patch; } { patch = ./irq-desc-to-data.patch; }
] ++ kernelPatches; ]
++ kernelPatches;
structuredExtraConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
# A ton of stuff just does not build. We disable it all. # A ton of stuff just does not build. We disable it all.