Merge #529

529: treewide: apply deadnix and statix r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>

airis/n990/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [ ../../common/pc/laptop ];

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

@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../.

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

@@ -1,8 +1,8 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, ... }:
 
 let
 
-  kernelPackages = config.boot.kernelPackages;
+  inherit (config.boot) kernelPackages;
 
 in
 

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

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

asus/rog-strix/g733qs/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 {
   imports = [
     ../../../common/cpu/amd/pstate.nix

common/cpu/intel/cpu-only.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   hardware.cpu.intel.updateMicrocode =

common/cpu/intel/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ./cpu-only.nix

common/gpu/nvidia/disable.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   # This runs only intel/amdgpu igpus and nvidia dgpus do not drain power.

common/pc/hdd/default.nix

@@ -1,3 +1 @@
-{ lib, ... }:
-
 {}

dell/e7240/default.nix

@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../common/cpu/intel

dell/g3/3779/default.nix

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

dell/latitude/3340/default.nix

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

dell/latitude/3480/default.nix

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

dell/latitude/5520/default.nix

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

dell/latitude/7430/default.nix

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

dell/latitude/7490/default.nix

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

dell/precision/5530/default.nix

@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel

dell/xps/13-9300/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 let
   inherit (lib) mkDefault;

dell/xps/13-9360/default.nix

@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel/kaby-lake

dell/xps/13-9370/default.nix

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

dell/xps/13-9380/default.nix

@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel

dell/xps/15-7590/default.nix

@@ -1,4 +1,3 @@
-{ lib, ... }:
 {
   imports = [
     ../../../common/cpu/intel
@@ -25,8 +24,8 @@
   # The 48.ucode causes the Killer wifi card to crash.
   # The iwlfwifi-cc-a0-46.ucode works perfectly
   nixpkgs.overlays = [
-    (self: super: {
+    (_self: super: {
-      firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: {
+      firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (_old: {
         src = super.fetchgit {
           url =
             "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";

dell/xps/15-9500/nvidia/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   imports = [
     ../default.nix

dell/xps/15-9550/nvidia/default.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   imports = [
     ../default.nix

dell/xps/15-9560/intel/default.nix

@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../../common/cpu/intel

dell/xps/15-9560/nvidia/default.nix

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

dell/xps/17-9700/intel/default.nix

@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../../common/cpu/intel

dell/xps/17-9700/nvidia/default.nix

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

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "nixos-hardware";
 
-  outputs = { self }: {
+  outputs = _: {
     nixosModules = {
       acer-aspire-4810t = import ./acer/aspire/4810t;
       airis-n990 = import ./airis/n990;

hp/elitebook/2560p/default.nix

@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 with lib;
-let
-  xcfg = config.services.xserver;
-in
 {
   imports = [
     ../../../common/cpu/intel

hp/elitebook/2560p/network.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 with lib;
 {
   config = {

intel/nuc/8i7beh/default.nix

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

kobol/helios4/overlay.nix

@@ -1,4 +1,4 @@
-final: prev: {
+final: _prev: {
   linux_5_15_helios4 = final.linux_5_15.override {
     kernelPatches = [
       # A patch to get both PWM fans working

lenovo/ideapad/15arh05/default.nix

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

lenovo/ideapad/z510/default.nix

@@ -1,5 +1,3 @@
-{ lib, ... }:
-
 {
   imports = [
     ../.

lenovo/legion/15ach6/default.nix

@@ -1,5 +1,6 @@
 { lib, config, ... }:
-let kernelPackages = config.boot.kernelPackages;
+let
+  inherit (config.boot) kernelPackages;
 in {
   imports = [
     ../../../common/cpu/amd

lenovo/legion/15arh05h/default.nix

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

lenovo/legion/16ach6h/edid/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ...}:
+{ pkgs, ...}:
 
 let
   # This file was obtained from the display while "DDG" mode was enabled.

lenovo/legion/16ach6h/hybrid/default.nix

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

lenovo/legion/16ithg6/default.nix

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

lenovo/thinkpad/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   imports = [ ../../common/pc/laptop ];

lenovo/thinkpad/e14/amd/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/e14/default.nix

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

lenovo/thinkpad/e14/intel/default.nix

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

lenovo/thinkpad/e470/default.nix

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

lenovo/thinkpad/e495/default.nix

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

lenovo/thinkpad/l13/default.nix

@@ -1,4 +1,4 @@
-{ nixos, lib, pkgs, config, stdenv, ... }:
+{ lib, ... }:
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/l13/yoga/default.nix

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

lenovo/thinkpad/l14/amd/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/l14/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/l14/intel/default.nix

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

lenovo/thinkpad/p1/3th-gen/nvidia.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   hardware.nvidia.modesetting.enable = true;
   hardware.opengl.driSupport32Bit = true;

lenovo/thinkpad/p14s/amd/gen2/default.nix

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

lenovo/thinkpad/p16s/amd/gen1/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   # For mainline support of rtw89 wireless networking

lenovo/thinkpad/p53/default.nix

@@ -1,4 +1,4 @@
-{ nixos, pkgs, lib, config, stdenv, ... }:
+{ lib, ... }:
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/t14/amd/default.nix

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

lenovo/thinkpad/t14/amd/gen1/default.nix

@@ -1,6 +1,3 @@
-
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/t14/amd/gen2/default.nix

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

lenovo/thinkpad/t14/amd/gen3/default.nix

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

lenovo/thinkpad/t14/default.nix

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

lenovo/thinkpad/t14s/amd/default.nix

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

lenovo/thinkpad/t14s/amd/gen1/default.nix

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

lenovo/thinkpad/t14s/default.nix

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

lenovo/thinkpad/t410/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/t420/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/t430/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/t440p/default.nix

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

lenovo/thinkpad/t440s/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/t450s/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/t460/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/t460p/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/t460s/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/t470s/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/t480/default.nix

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

lenovo/thinkpad/t480s/default.nix

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

lenovo/thinkpad/t490/default.nix

@@ -1,4 +1,4 @@
-{ nixos, lib, pkgs, config, stdenv, ... }:
+{ lib, ... }:
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/t495/default.nix

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

lenovo/thinkpad/t550/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel

lenovo/thinkpad/t590/default.nix

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

lenovo/thinkpad/x1-extreme/gen2/default.nix

@@ -19,7 +19,7 @@ with lib;
   hardware.bumblebee.connectDisplay = true;
 
   nixpkgs.overlays = [
-    (self: super: {
+    (_self: super: {
       bumblebee = super.bumblebee.override {
         extraNvidiaDeviceOptions = ''
           Option "AllowEmptyInitialConfiguration"

lenovo/thinkpad/x1-extreme/gen4/default.nix

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

lenovo/thinkpad/x1/10th-gen/default.nix

@@ -1,4 +1,3 @@
-{ lib, pkgs, ... }:
 {
   imports = [
     ../.

lenovo/thinkpad/x1/6th-gen/QHD/default.nix

@@ -1,6 +1,4 @@
 # X1 6th generation with a QHD (2560x1440px) display
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/x1/6th-gen/default.nix

@@ -5,7 +5,7 @@
 #
 # Enable the lower-power S3 suspend state by upgrading the BIOS to version >= 1.30,
 # then manually selecting Linux in the power management section.
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 {
   imports = [
     ../.

lenovo/thinkpad/x13/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }: {
+{ ... }: {
   # Reference to hardware: https://certification.ubuntu.com/hardware/202004-27844
   imports = [
     ../.

lenovo/thinkpad/x140e/default.nix

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

lenovo/thinkpad/x200s/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/x220/default.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

lenovo/thinkpad/x230/default.nix

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

lenovo/thinkpad/x280/default.nix

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

lenovo/thinkpad/yoga.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   # automatic screen orientation
   hardware.sensor.iio.enable = true;

lenovo/thinkpad/z/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ lib, pkgs, ... }: {
   imports = [
     ../../../lenovo/thinkpad
     ../../../common/cpu/amd

lenovo/thinkpad/z/z13/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{
   imports = [
     ../../../../lenovo/thinkpad/z
   ];

microsoft/surface-pro/3/default.nix

@@ -1,4 +1,3 @@
-{ lib, ... }:
 {
   imports = [ ../../surface ];
 }

microsoft/surface/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   inherit (lib) mkDefault;

microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix

@@ -1,7 +1,7 @@
 { stdenv, lib, pkgs, firmwareLinuxNonfree, ... }:
 
 let
-  repos = (pkgs.callPackage ../../../repos.nix {});
+  repos = pkgs.callPackage ../../../repos.nix {};
   killernetworking_firmware = repos.surface-go-ath10k-firmware_backup + "/K1535_Debian";
 
 in stdenv.mkDerivation {

microsoft/surface/kernel/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 let
   inherit (lib) mkOption types;

microsoft/surface/kernel/linux-package.nix

@@ -1,12 +1,11 @@
 { lib,
   buildLinux,
   callPackage,
-  fetchurl,
   linuxPackagesFor,
 }:
 
 let
-  inherit (lib) kernel recurseIntoAttrs;
+  inherit (lib) recurseIntoAttrs;
 
 in {
   repos = callPackage ../repos.nix {};

microsoft/surface/repos.nix

@@ -1,4 +1,4 @@
-{ fetchFromGitHub, fetchurl }:
+{ fetchFromGitHub }:
 
 {
   linux-surface = fetchFromGitHub {

msi/gl62/default.nix

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