From 03c6d1515228ff524d63f532a2a6709dfd561a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 31 Dec 2022 11:52:38 +0100
Subject: [PATCH] treewide: apply deadnix and statix

---
 airis/n990/default.nix                                    | 2 +-
 apple/macbook-pro/10-1/default.nix                        | 2 --
 apple/macbook-pro/11-5/default.nix                        | 4 ++--
 apple/macbook-pro/14-1/default.nix                        | 2 +-
 asus/rog-strix/g733qs/default.nix                         | 2 +-
 common/cpu/intel/cpu-only.nix                             | 2 +-
 common/cpu/intel/default.nix                              | 2 --
 common/gpu/nvidia/disable.nix                             | 2 +-
 common/pc/hdd/default.nix                                 | 2 --
 dell/e7240/default.nix                                    | 2 --
 dell/g3/3779/default.nix                                  | 2 +-
 dell/latitude/3340/default.nix                            | 2 +-
 dell/latitude/3480/default.nix                            | 2 +-
 dell/latitude/5520/default.nix                            | 2 +-
 dell/latitude/7430/default.nix                            | 2 +-
 dell/latitude/7490/default.nix                            | 2 +-
 dell/precision/5530/default.nix                           | 2 --
 dell/xps/13-9300/default.nix                              | 2 +-
 dell/xps/13-9360/default.nix                              | 2 --
 dell/xps/13-9370/default.nix                              | 2 +-
 dell/xps/13-9380/default.nix                              | 2 --
 dell/xps/15-7590/default.nix                              | 5 ++---
 dell/xps/15-9500/nvidia/default.nix                       | 2 +-
 dell/xps/15-9550/nvidia/default.nix                       | 2 +-
 dell/xps/15-9560/intel/default.nix                        | 2 --
 dell/xps/15-9560/nvidia/default.nix                       | 2 +-
 dell/xps/17-9700/intel/default.nix                        | 2 --
 dell/xps/17-9700/nvidia/default.nix                       | 2 +-
 flake.nix                                                 | 2 +-
 hp/elitebook/2560p/default.nix                            | 5 +----
 hp/elitebook/2560p/network.nix                            | 2 +-
 intel/nuc/8i7beh/default.nix                              | 2 +-
 kobol/helios4/overlay.nix                                 | 2 +-
 lenovo/ideapad/15arh05/default.nix                        | 2 +-
 lenovo/ideapad/z510/default.nix                           | 2 --
 lenovo/legion/15ach6/default.nix                          | 3 ++-
 lenovo/legion/15arh05h/default.nix                        | 2 +-
 lenovo/legion/16ach6h/edid/default.nix                    | 2 +-
 lenovo/legion/16ach6h/hybrid/default.nix                  | 2 +-
 lenovo/legion/16ithg6/default.nix                         | 2 +-
 lenovo/thinkpad/default.nix                               | 2 +-
 lenovo/thinkpad/e14/amd/default.nix                       | 2 --
 lenovo/thinkpad/e14/default.nix                           | 2 +-
 lenovo/thinkpad/e14/intel/default.nix                     | 2 +-
 lenovo/thinkpad/e470/default.nix                          | 2 +-
 lenovo/thinkpad/e495/default.nix                          | 2 +-
 lenovo/thinkpad/l13/default.nix                           | 2 +-
 lenovo/thinkpad/l13/yoga/default.nix                      | 2 +-
 lenovo/thinkpad/l14/amd/default.nix                       | 2 --
 lenovo/thinkpad/l14/default.nix                           | 2 --
 lenovo/thinkpad/l14/intel/default.nix                     | 2 +-
 lenovo/thinkpad/p1/3th-gen/nvidia.nix                     | 2 +-
 lenovo/thinkpad/p14s/amd/gen2/default.nix                 | 2 +-
 lenovo/thinkpad/p16s/amd/gen1/default.nix                 | 2 +-
 lenovo/thinkpad/p53/default.nix                           | 2 +-
 lenovo/thinkpad/t14/amd/default.nix                       | 2 +-
 lenovo/thinkpad/t14/amd/gen1/default.nix                  | 3 ---
 lenovo/thinkpad/t14/amd/gen2/default.nix                  | 2 +-
 lenovo/thinkpad/t14/amd/gen3/default.nix                  | 2 +-
 lenovo/thinkpad/t14/default.nix                           | 2 +-
 lenovo/thinkpad/t14s/amd/default.nix                      | 2 +-
 lenovo/thinkpad/t14s/amd/gen1/default.nix                 | 2 +-
 lenovo/thinkpad/t14s/default.nix                          | 2 +-
 lenovo/thinkpad/t410/default.nix                          | 2 --
 lenovo/thinkpad/t420/default.nix                          | 2 --
 lenovo/thinkpad/t430/default.nix                          | 2 --
 lenovo/thinkpad/t440p/default.nix                         | 2 +-
 lenovo/thinkpad/t440s/default.nix                         | 2 --
 lenovo/thinkpad/t450s/default.nix                         | 2 --
 lenovo/thinkpad/t460/default.nix                          | 2 --
 lenovo/thinkpad/t460p/default.nix                         | 2 --
 lenovo/thinkpad/t460s/default.nix                         | 2 --
 lenovo/thinkpad/t470s/default.nix                         | 2 --
 lenovo/thinkpad/t480/default.nix                          | 2 +-
 lenovo/thinkpad/t480s/default.nix                         | 2 +-
 lenovo/thinkpad/t490/default.nix                          | 2 +-
 lenovo/thinkpad/t495/default.nix                          | 2 +-
 lenovo/thinkpad/t550/default.nix                          | 2 --
 lenovo/thinkpad/t590/default.nix                          | 2 +-
 lenovo/thinkpad/x1-extreme/gen2/default.nix               | 2 +-
 lenovo/thinkpad/x1-extreme/gen4/default.nix               | 2 +-
 lenovo/thinkpad/x1/10th-gen/default.nix                   | 1 -
 lenovo/thinkpad/x1/6th-gen/QHD/default.nix                | 2 --
 lenovo/thinkpad/x1/6th-gen/default.nix                    | 2 +-
 lenovo/thinkpad/x13/default.nix                           | 2 +-
 lenovo/thinkpad/x140e/default.nix                         | 2 +-
 lenovo/thinkpad/x200s/default.nix                         | 2 --
 lenovo/thinkpad/x220/default.nix                          | 2 --
 lenovo/thinkpad/x230/default.nix                          | 2 +-
 lenovo/thinkpad/x280/default.nix                          | 2 +-
 lenovo/thinkpad/yoga.nix                                  | 2 --
 lenovo/thinkpad/z/default.nix                             | 2 +-
 lenovo/thinkpad/z/z13/default.nix                         | 2 +-
 microsoft/surface-pro/3/default.nix                       | 1 -
 microsoft/surface/default.nix                             | 2 +-
 .../surface/firmware/surface-go/ath10k/ath10k-replace.nix | 2 +-
 microsoft/surface/kernel/default.nix                      | 2 +-
 microsoft/surface/kernel/linux-package.nix                | 3 +--
 microsoft/surface/repos.nix                               | 2 +-
 msi/gl62/default.nix                                      | 2 +-
 msi/gs60/default.nix                                      | 2 +-
 onenetbook/4/goodix-stylus-mastykin/default.nix           | 2 +-
 pine64/pinebook-pro/default.nix                           | 2 +-
 pine64/pinebook-pro/overlay.nix                           | 2 +-
 raspberry-pi/4/apply-overlays-dtmerge.nix                 | 2 +-
 raspberry-pi/4/cpu-revision.nix                           | 1 -
 raspberry-pi/4/dwc2.nix                                   | 2 +-
 raspberry-pi/4/i2c.nix                                    | 6 +++---
 raspberry-pi/4/modesetting.nix                            | 2 +-
 raspberry-pi/4/pkgs-overlays.nix                          | 8 ++++----
 raspberry-pi/4/poe-hat.nix                                | 2 +-
 raspberry-pi/4/poe-plus-hat.nix                           | 2 +-
 raspberry-pi/4/pwm0.nix                                   | 2 +-
 supermicro/a1sri-2758f/default.nix                        | 3 ---
 supermicro/x10sll-f/default.nix                           | 2 --
 system76/default.nix                                      | 2 +-
 toshiba/swanky/default.nix                                | 4 ++--
 117 files changed, 93 insertions(+), 162 deletions(-)

diff --git a/airis/n990/default.nix b/airis/n990/default.nix
index ae068131..e4711419 100644
--- a/airis/n990/default.nix
+++ b/airis/n990/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [ ../../common/pc/laptop ];
diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix
index 4d31b1ca..37030966 100644
--- a/apple/macbook-pro/10-1/default.nix
+++ b/apple/macbook-pro/10-1/default.nix
@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/apple/macbook-pro/11-5/default.nix b/apple/macbook-pro/11-5/default.nix
index 434e8e75..81eda9b2 100644
--- a/apple/macbook-pro/11-5/default.nix
+++ b/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
 
diff --git a/apple/macbook-pro/14-1/default.nix b/apple/macbook-pro/14-1/default.nix
index 45616841..6b1fd74c 100644
--- a/apple/macbook-pro/14-1/default.nix
+++ b/apple/macbook-pro/14-1/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/asus/rog-strix/g733qs/default.nix b/asus/rog-strix/g733qs/default.nix
index b49a44c0..b981aeff 100644
--- a/asus/rog-strix/g733qs/default.nix
+++ b/asus/rog-strix/g733qs/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 {
   imports = [
     ../../../common/cpu/amd/pstate.nix
diff --git a/common/cpu/intel/cpu-only.nix b/common/cpu/intel/cpu-only.nix
index f48b0361..c30f0c57 100644
--- a/common/cpu/intel/cpu-only.nix
+++ b/common/cpu/intel/cpu-only.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   hardware.cpu.intel.updateMicrocode =
diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix
index 966505f1..5c1663f2 100644
--- a/common/cpu/intel/default.nix
+++ b/common/cpu/intel/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ./cpu-only.nix
diff --git a/common/gpu/nvidia/disable.nix b/common/gpu/nvidia/disable.nix
index c6516af9..72e89c20 100644
--- a/common/gpu/nvidia/disable.nix
+++ b/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.
diff --git a/common/pc/hdd/default.nix b/common/pc/hdd/default.nix
index 869badb2..0967ef42 100644
--- a/common/pc/hdd/default.nix
+++ b/common/pc/hdd/default.nix
@@ -1,3 +1 @@
-{ lib, ... }:
-
 {}
diff --git a/dell/e7240/default.nix b/dell/e7240/default.nix
index 3334a745..102da6bb 100644
--- a/dell/e7240/default.nix
+++ b/dell/e7240/default.nix
@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../common/cpu/intel
diff --git a/dell/g3/3779/default.nix b/dell/g3/3779/default.nix
index 80deb299..83216ebf 100644
--- a/dell/g3/3779/default.nix
+++ b/dell/g3/3779/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/dell/latitude/3340/default.nix b/dell/latitude/3340/default.nix
index c7cf888d..d50b024c 100644
--- a/dell/latitude/3340/default.nix
+++ b/dell/latitude/3340/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ ... }:
 
 {
   imports = [
diff --git a/dell/latitude/3480/default.nix b/dell/latitude/3480/default.nix
index 86be458a..7f6116a6 100644
--- a/dell/latitude/3480/default.nix
+++ b/dell/latitude/3480/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/dell/latitude/5520/default.nix b/dell/latitude/5520/default.nix
index f53ba080..6ad43309 100644
--- a/dell/latitude/5520/default.nix
+++ b/dell/latitude/5520/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/dell/latitude/7430/default.nix b/dell/latitude/7430/default.nix
index a7d737b1..b69fd5c4 100644
--- a/dell/latitude/7430/default.nix
+++ b/dell/latitude/7430/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/dell/latitude/7490/default.nix b/dell/latitude/7490/default.nix
index a368f441..9bed2433 100644
--- a/dell/latitude/7490/default.nix
+++ b/dell/latitude/7490/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/dell/precision/5530/default.nix b/dell/precision/5530/default.nix
index 05e1d4af..24071f0a 100644
--- a/dell/precision/5530/default.nix
+++ b/dell/precision/5530/default.nix
@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/dell/xps/13-9300/default.nix b/dell/xps/13-9300/default.nix
index 9c379aed..148b6f91 100644
--- a/dell/xps/13-9300/default.nix
+++ b/dell/xps/13-9300/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 let
   inherit (lib) mkDefault;
diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix
index f40f6e0c..f1ea3787 100644
--- a/dell/xps/13-9360/default.nix
+++ b/dell/xps/13-9360/default.nix
@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel/kaby-lake
diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix
index dbe852f0..10362b3b 100644
--- a/dell/xps/13-9370/default.nix
+++ b/dell/xps/13-9370/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/dell/xps/13-9380/default.nix b/dell/xps/13-9380/default.nix
index 162cc261..5d74103b 100644
--- a/dell/xps/13-9380/default.nix
+++ b/dell/xps/13-9380/default.nix
@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix
index e42cec30..98b08764 100644
--- a/dell/xps/15-7590/default.nix
+++ b/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: {
-      firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: {
+    (_self: super: {
+      firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (_old: {
         src = super.fetchgit {
           url =
             "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
diff --git a/dell/xps/15-9500/nvidia/default.nix b/dell/xps/15-9500/nvidia/default.nix
index f2fa3ae7..257462a4 100644
--- a/dell/xps/15-9500/nvidia/default.nix
+++ b/dell/xps/15-9500/nvidia/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   imports = [
     ../default.nix
diff --git a/dell/xps/15-9550/nvidia/default.nix b/dell/xps/15-9550/nvidia/default.nix
index f2fa3ae7..257462a4 100644
--- a/dell/xps/15-9550/nvidia/default.nix
+++ b/dell/xps/15-9550/nvidia/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   imports = [
     ../default.nix
diff --git a/dell/xps/15-9560/intel/default.nix b/dell/xps/15-9560/intel/default.nix
index a4531497..c4d51ea6 100644
--- a/dell/xps/15-9560/intel/default.nix
+++ b/dell/xps/15-9560/intel/default.nix
@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../../common/cpu/intel
diff --git a/dell/xps/15-9560/nvidia/default.nix b/dell/xps/15-9560/nvidia/default.nix
index 3e78ebac..229a6efb 100644
--- a/dell/xps/15-9560/nvidia/default.nix
+++ b/dell/xps/15-9560/nvidia/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/dell/xps/17-9700/intel/default.nix b/dell/xps/17-9700/intel/default.nix
index 0176bfde..2adca86f 100644
--- a/dell/xps/17-9700/intel/default.nix
+++ b/dell/xps/17-9700/intel/default.nix
@@ -1,5 +1,3 @@
-{ lib, pkgs, ... }:
-
 {
   imports = [
     ../../../../common/cpu/intel
diff --git a/dell/xps/17-9700/nvidia/default.nix b/dell/xps/17-9700/nvidia/default.nix
index 7e1e3e10..446a0b76 100644
--- a/dell/xps/17-9700/nvidia/default.nix
+++ b/dell/xps/17-9700/nvidia/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/flake.nix b/flake.nix
index 0a006c98..4c8f8543 100644
--- a/flake.nix
+++ b/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;
diff --git a/hp/elitebook/2560p/default.nix b/hp/elitebook/2560p/default.nix
index de34e157..38e5d600 100644
--- a/hp/elitebook/2560p/default.nix
+++ b/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
diff --git a/hp/elitebook/2560p/network.nix b/hp/elitebook/2560p/network.nix
index 23c52844..2fa94e96 100644
--- a/hp/elitebook/2560p/network.nix
+++ b/hp/elitebook/2560p/network.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 with lib;
 {
   config = {
diff --git a/intel/nuc/8i7beh/default.nix b/intel/nuc/8i7beh/default.nix
index 9cd9d4f6..5dfed4ef 100644
--- a/intel/nuc/8i7beh/default.nix
+++ b/intel/nuc/8i7beh/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/kobol/helios4/overlay.nix b/kobol/helios4/overlay.nix
index 8453bb3c..41aa9d98 100644
--- a/kobol/helios4/overlay.nix
+++ b/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
diff --git a/lenovo/ideapad/15arh05/default.nix b/lenovo/ideapad/15arh05/default.nix
index fda5cd02..46dfd24f 100644
--- a/lenovo/ideapad/15arh05/default.nix
+++ b/lenovo/ideapad/15arh05/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/ideapad/z510/default.nix b/lenovo/ideapad/z510/default.nix
index 83f65680..d26ed0b0 100644
--- a/lenovo/ideapad/z510/default.nix
+++ b/lenovo/ideapad/z510/default.nix
@@ -1,5 +1,3 @@
-{ lib, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/legion/15ach6/default.nix b/lenovo/legion/15ach6/default.nix
index 0cbc0f43..3a03d6f1 100644
--- a/lenovo/legion/15ach6/default.nix
+++ b/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
diff --git a/lenovo/legion/15arh05h/default.nix b/lenovo/legion/15arh05h/default.nix
index 603fd9e3..6ab02dc7 100644
--- a/lenovo/legion/15arh05h/default.nix
+++ b/lenovo/legion/15arh05h/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/legion/16ach6h/edid/default.nix b/lenovo/legion/16ach6h/edid/default.nix
index d9d8b521..ec77c244 100644
--- a/lenovo/legion/16ach6h/edid/default.nix
+++ b/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.
diff --git a/lenovo/legion/16ach6h/hybrid/default.nix b/lenovo/legion/16ach6h/hybrid/default.nix
index 8a56a48d..0deee0e6 100644
--- a/lenovo/legion/16ach6h/hybrid/default.nix
+++ b/lenovo/legion/16ach6h/hybrid/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/legion/16ithg6/default.nix b/lenovo/legion/16ithg6/default.nix
index cf0244ea..e0dca1eb 100644
--- a/lenovo/legion/16ithg6/default.nix
+++ b/lenovo/legion/16ithg6/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix
index 99d4937e..989f6a41 100644
--- a/lenovo/thinkpad/default.nix
+++ b/lenovo/thinkpad/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 {
   imports = [ ../../common/pc/laptop ];
diff --git a/lenovo/thinkpad/e14/amd/default.nix b/lenovo/thinkpad/e14/amd/default.nix
index d39c7d91..ff362d95 100644
--- a/lenovo/thinkpad/e14/amd/default.nix
+++ b/lenovo/thinkpad/e14/amd/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/e14/default.nix b/lenovo/thinkpad/e14/default.nix
index 42bf0147..a073b58d 100644
--- a/lenovo/thinkpad/e14/default.nix
+++ b/lenovo/thinkpad/e14/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/e14/intel/default.nix b/lenovo/thinkpad/e14/intel/default.nix
index 088289f3..64d2f177 100644
--- a/lenovo/thinkpad/e14/intel/default.nix
+++ b/lenovo/thinkpad/e14/intel/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/e470/default.nix b/lenovo/thinkpad/e470/default.nix
index e9c52141..32007321 100644
--- a/lenovo/thinkpad/e470/default.nix
+++ b/lenovo/thinkpad/e470/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/e495/default.nix b/lenovo/thinkpad/e495/default.nix
index 60f8efb3..41c6b31d 100644
--- a/lenovo/thinkpad/e495/default.nix
+++ b/lenovo/thinkpad/e495/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/l13/default.nix b/lenovo/thinkpad/l13/default.nix
index 95308ab9..449756ba 100644
--- a/lenovo/thinkpad/l13/default.nix
+++ b/lenovo/thinkpad/l13/default.nix
@@ -1,4 +1,4 @@
-{ nixos, lib, pkgs, config, stdenv, ... }:
+{ lib, ... }:
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/l13/yoga/default.nix b/lenovo/thinkpad/l13/yoga/default.nix
index 3fb6f162..8c41a412 100644
--- a/lenovo/thinkpad/l13/yoga/default.nix
+++ b/lenovo/thinkpad/l13/yoga/default.nix
@@ -1,4 +1,4 @@
-{ nixos, lib, pkgs, config, stdenv, ... }:
+{ lib, config, ... }:
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/l14/amd/default.nix b/lenovo/thinkpad/l14/amd/default.nix
index bb216211..c21cbce9 100644
--- a/lenovo/thinkpad/l14/amd/default.nix
+++ b/lenovo/thinkpad/l14/amd/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/l14/default.nix b/lenovo/thinkpad/l14/default.nix
index 42bf0147..b3d031d4 100644
--- a/lenovo/thinkpad/l14/default.nix
+++ b/lenovo/thinkpad/l14/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/l14/intel/default.nix b/lenovo/thinkpad/l14/intel/default.nix
index 088289f3..64d2f177 100644
--- a/lenovo/thinkpad/l14/intel/default.nix
+++ b/lenovo/thinkpad/l14/intel/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/p1/3th-gen/nvidia.nix b/lenovo/thinkpad/p1/3th-gen/nvidia.nix
index 62d9ebc5..08081071 100644
--- a/lenovo/thinkpad/p1/3th-gen/nvidia.nix
+++ b/lenovo/thinkpad/p1/3th-gen/nvidia.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 {
   hardware.nvidia.modesetting.enable = true;
   hardware.opengl.driSupport32Bit = true;
diff --git a/lenovo/thinkpad/p14s/amd/gen2/default.nix b/lenovo/thinkpad/p14s/amd/gen2/default.nix
index 8f0e257b..c80a7030 100644
--- a/lenovo/thinkpad/p14s/amd/gen2/default.nix
+++ b/lenovo/thinkpad/p14s/amd/gen2/default.nix
@@ -1,5 +1,5 @@
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/p16s/amd/gen1/default.nix b/lenovo/thinkpad/p16s/amd/gen1/default.nix
index 5b7bfe4e..1cf17485 100644
--- a/lenovo/thinkpad/p16s/amd/gen1/default.nix
+++ b/lenovo/thinkpad/p16s/amd/gen1/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   # For mainline support of rtw89 wireless networking
diff --git a/lenovo/thinkpad/p53/default.nix b/lenovo/thinkpad/p53/default.nix
index a499d5c2..84e60fab 100644
--- a/lenovo/thinkpad/p53/default.nix
+++ b/lenovo/thinkpad/p53/default.nix
@@ -1,4 +1,4 @@
-{ nixos, pkgs, lib, config, stdenv, ... }:
+{ lib, ... }:
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/t14/amd/default.nix b/lenovo/thinkpad/t14/amd/default.nix
index fbd9f204..cbef7c0b 100644
--- a/lenovo/thinkpad/t14/amd/default.nix
+++ b/lenovo/thinkpad/t14/amd/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t14/amd/gen1/default.nix b/lenovo/thinkpad/t14/amd/gen1/default.nix
index cb1ec7d8..665d3d41 100644
--- a/lenovo/thinkpad/t14/amd/gen1/default.nix
+++ b/lenovo/thinkpad/t14/amd/gen1/default.nix
@@ -1,6 +1,3 @@
-
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/t14/amd/gen2/default.nix b/lenovo/thinkpad/t14/amd/gen2/default.nix
index 367e3988..795b9a81 100644
--- a/lenovo/thinkpad/t14/amd/gen2/default.nix
+++ b/lenovo/thinkpad/t14/amd/gen2/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t14/amd/gen3/default.nix b/lenovo/thinkpad/t14/amd/gen3/default.nix
index 56578984..617a3a43 100644
--- a/lenovo/thinkpad/t14/amd/gen3/default.nix
+++ b/lenovo/thinkpad/t14/amd/gen3/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t14/default.nix b/lenovo/thinkpad/t14/default.nix
index 18802e6e..3466e95d 100644
--- a/lenovo/thinkpad/t14/default.nix
+++ b/lenovo/thinkpad/t14/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t14s/amd/default.nix b/lenovo/thinkpad/t14s/amd/default.nix
index fbd9f204..cbef7c0b 100644
--- a/lenovo/thinkpad/t14s/amd/default.nix
+++ b/lenovo/thinkpad/t14s/amd/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t14s/amd/gen1/default.nix b/lenovo/thinkpad/t14s/amd/gen1/default.nix
index 13dc790d..9dd565d9 100644
--- a/lenovo/thinkpad/t14s/amd/gen1/default.nix
+++ b/lenovo/thinkpad/t14s/amd/gen1/default.nix
@@ -1,5 +1,5 @@
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t14s/default.nix b/lenovo/thinkpad/t14s/default.nix
index d783b21a..182071a7 100644
--- a/lenovo/thinkpad/t14s/default.nix
+++ b/lenovo/thinkpad/t14s/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix
index c40801ff..9cb15b3d 100644
--- a/lenovo/thinkpad/t410/default.nix
+++ b/lenovo/thinkpad/t410/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/t420/default.nix b/lenovo/thinkpad/t420/default.nix
index be05d1ec..a3c7db40 100644
--- a/lenovo/thinkpad/t420/default.nix
+++ b/lenovo/thinkpad/t420/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/t430/default.nix b/lenovo/thinkpad/t430/default.nix
index 9c5580ef..47f2d6b9 100644
--- a/lenovo/thinkpad/t430/default.nix
+++ b/lenovo/thinkpad/t430/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix
index 4dd40857..53a93c21 100644
--- a/lenovo/thinkpad/t440p/default.nix
+++ b/lenovo/thinkpad/t440p/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t440s/default.nix b/lenovo/thinkpad/t440s/default.nix
index c40ad90f..ccfa9e55 100644
--- a/lenovo/thinkpad/t440s/default.nix
+++ b/lenovo/thinkpad/t440s/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/t450s/default.nix b/lenovo/thinkpad/t450s/default.nix
index e6233717..548f6881 100644
--- a/lenovo/thinkpad/t450s/default.nix
+++ b/lenovo/thinkpad/t450s/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/t460/default.nix b/lenovo/thinkpad/t460/default.nix
index e6233717..548f6881 100644
--- a/lenovo/thinkpad/t460/default.nix
+++ b/lenovo/thinkpad/t460/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/t460p/default.nix b/lenovo/thinkpad/t460p/default.nix
index e6233717..548f6881 100644
--- a/lenovo/thinkpad/t460p/default.nix
+++ b/lenovo/thinkpad/t460p/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix
index e6233717..548f6881 100644
--- a/lenovo/thinkpad/t460s/default.nix
+++ b/lenovo/thinkpad/t460s/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/t470s/default.nix b/lenovo/thinkpad/t470s/default.nix
index e6233717..548f6881 100644
--- a/lenovo/thinkpad/t470s/default.nix
+++ b/lenovo/thinkpad/t470s/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/t480/default.nix b/lenovo/thinkpad/t480/default.nix
index 6cefeaab..bfca9122 100644
--- a/lenovo/thinkpad/t480/default.nix
+++ b/lenovo/thinkpad/t480/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix
index 6cefeaab..bfca9122 100644
--- a/lenovo/thinkpad/t480s/default.nix
+++ b/lenovo/thinkpad/t480s/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t490/default.nix b/lenovo/thinkpad/t490/default.nix
index 3578da66..c20d2136 100644
--- a/lenovo/thinkpad/t490/default.nix
+++ b/lenovo/thinkpad/t490/default.nix
@@ -1,4 +1,4 @@
-{ nixos, lib, pkgs, config, stdenv, ... }:
+{ lib, ... }:
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/t495/default.nix b/lenovo/thinkpad/t495/default.nix
index 64957e6e..ef508134 100644
--- a/lenovo/thinkpad/t495/default.nix
+++ b/lenovo/thinkpad/t495/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/t550/default.nix b/lenovo/thinkpad/t550/default.nix
index e6233717..548f6881 100644
--- a/lenovo/thinkpad/t550/default.nix
+++ b/lenovo/thinkpad/t550/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../../../common/cpu/intel
diff --git a/lenovo/thinkpad/t590/default.nix b/lenovo/thinkpad/t590/default.nix
index 6a4cc7b8..3beea72e 100644
--- a/lenovo/thinkpad/t590/default.nix
+++ b/lenovo/thinkpad/t590/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/x1-extreme/gen2/default.nix b/lenovo/thinkpad/x1-extreme/gen2/default.nix
index 6b0ebbd5..17147b53 100644
--- a/lenovo/thinkpad/x1-extreme/gen2/default.nix
+++ b/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"
diff --git a/lenovo/thinkpad/x1-extreme/gen4/default.nix b/lenovo/thinkpad/x1-extreme/gen4/default.nix
index f52fe1ec..0c8cf191 100644
--- a/lenovo/thinkpad/x1-extreme/gen4/default.nix
+++ b/lenovo/thinkpad/x1-extreme/gen4/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/x1/10th-gen/default.nix b/lenovo/thinkpad/x1/10th-gen/default.nix
index c06e8395..75a23d85 100644
--- a/lenovo/thinkpad/x1/10th-gen/default.nix
+++ b/lenovo/thinkpad/x1/10th-gen/default.nix
@@ -1,4 +1,3 @@
-{ lib, pkgs, ... }:
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
index b6495ea1..84d7f715 100644
--- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
+++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix
@@ -1,6 +1,4 @@
 # X1 6th generation with a QHD (2560x1440px) display
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix
index b244e970..24fe6761 100644
--- a/lenovo/thinkpad/x1/6th-gen/default.nix
+++ b/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 = [
     ../.
diff --git a/lenovo/thinkpad/x13/default.nix b/lenovo/thinkpad/x13/default.nix
index 88c94185..911dc5b0 100644
--- a/lenovo/thinkpad/x13/default.nix
+++ b/lenovo/thinkpad/x13/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }: {
+{ ... }: {
   # Reference to hardware: https://certification.ubuntu.com/hardware/202004-27844
   imports = [
     ../.
diff --git a/lenovo/thinkpad/x140e/default.nix b/lenovo/thinkpad/x140e/default.nix
index c03410e9..fbc6df92 100644
--- a/lenovo/thinkpad/x140e/default.nix
+++ b/lenovo/thinkpad/x140e/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/x200s/default.nix b/lenovo/thinkpad/x200s/default.nix
index 5a637d63..1a6d40eb 100644
--- a/lenovo/thinkpad/x200s/default.nix
+++ b/lenovo/thinkpad/x200s/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix
index b28e2784..ec8b45c9 100644
--- a/lenovo/thinkpad/x220/default.nix
+++ b/lenovo/thinkpad/x220/default.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix
index 418b68c8..995bb449 100644
--- a/lenovo/thinkpad/x230/default.nix
+++ b/lenovo/thinkpad/x230/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/x280/default.nix b/lenovo/thinkpad/x280/default.nix
index a9423e54..880458e7 100644
--- a/lenovo/thinkpad/x280/default.nix
+++ b/lenovo/thinkpad/x280/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/lenovo/thinkpad/yoga.nix b/lenovo/thinkpad/yoga.nix
index c624e1b6..559d3272 100644
--- a/lenovo/thinkpad/yoga.nix
+++ b/lenovo/thinkpad/yoga.nix
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   # automatic screen orientation
   hardware.sensor.iio.enable = true;
diff --git a/lenovo/thinkpad/z/default.nix b/lenovo/thinkpad/z/default.nix
index e1cf6b20..b3c8be1b 100644
--- a/lenovo/thinkpad/z/default.nix
+++ b/lenovo/thinkpad/z/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ lib, pkgs, ... }: {
   imports = [
     ../../../lenovo/thinkpad
     ../../../common/cpu/amd
diff --git a/lenovo/thinkpad/z/z13/default.nix b/lenovo/thinkpad/z/z13/default.nix
index b351777f..cf1a5b48 100644
--- a/lenovo/thinkpad/z/z13/default.nix
+++ b/lenovo/thinkpad/z/z13/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{
   imports = [
     ../../../../lenovo/thinkpad/z
   ];
diff --git a/microsoft/surface-pro/3/default.nix b/microsoft/surface-pro/3/default.nix
index 4fa8f79a..7e80d1d9 100644
--- a/microsoft/surface-pro/3/default.nix
+++ b/microsoft/surface-pro/3/default.nix
@@ -1,4 +1,3 @@
-{ lib, ... }:
 {
   imports = [ ../../surface ];
 }
diff --git a/microsoft/surface/default.nix b/microsoft/surface/default.nix
index 9a59e9ff..2952daed 100644
--- a/microsoft/surface/default.nix
+++ b/microsoft/surface/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   inherit (lib) mkDefault;
diff --git a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix b/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix
index e62307d0..e6b84e1f 100644
--- a/microsoft/surface/firmware/surface-go/ath10k/ath10k-replace.nix
+++ b/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 {
diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix
index 4fc495f0..6eba2ca8 100644
--- a/microsoft/surface/kernel/default.nix
+++ b/microsoft/surface/kernel/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 let
   inherit (lib) mkOption types;
diff --git a/microsoft/surface/kernel/linux-package.nix b/microsoft/surface/kernel/linux-package.nix
index 4858e4f5..c115df10 100644
--- a/microsoft/surface/kernel/linux-package.nix
+++ b/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 {};
diff --git a/microsoft/surface/repos.nix b/microsoft/surface/repos.nix
index 0e58c0c1..b15dd7ec 100644
--- a/microsoft/surface/repos.nix
+++ b/microsoft/surface/repos.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, fetchurl }:
+{ fetchFromGitHub }:
 
 {
   linux-surface = fetchFromGitHub {
diff --git a/msi/gl62/default.nix b/msi/gl62/default.nix
index 6f3f91cb..049ffcfb 100644
--- a/msi/gl62/default.nix
+++ b/msi/gl62/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   imports = [
diff --git a/msi/gs60/default.nix b/msi/gs60/default.nix
index 4bc34ef1..70d608b7 100644
--- a/msi/gs60/default.nix
+++ b/msi/gs60/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ../../common/cpu/intel
diff --git a/onenetbook/4/goodix-stylus-mastykin/default.nix b/onenetbook/4/goodix-stylus-mastykin/default.nix
index 2c12ca67..2329073b 100644
--- a/onenetbook/4/goodix-stylus-mastykin/default.nix
+++ b/onenetbook/4/goodix-stylus-mastykin/default.nix
@@ -22,7 +22,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "hid-multitouch-onenetbook4-${version}";
-  version = kernel.version;
+  inherit (kernel) version;
 
   hardeningDisable = [ "pic" "format" ];
   nativeBuildInputs = kernel.moduleBuildDependencies;
diff --git a/pine64/pinebook-pro/default.nix b/pine64/pinebook-pro/default.nix
index ca83f097..ea77ad33 100644
--- a/pine64/pinebook-pro/default.nix
+++ b/pine64/pinebook-pro/default.nix
@@ -1,5 +1,5 @@
 # This configuration file can be safely imported in your system configuration.
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
 {
   nixpkgs.overlays = [
diff --git a/pine64/pinebook-pro/overlay.nix b/pine64/pinebook-pro/overlay.nix
index 8d140f02..be45573e 100644
--- a/pine64/pinebook-pro/overlay.nix
+++ b/pine64/pinebook-pro/overlay.nix
@@ -1,4 +1,4 @@
-final: super:
+final: _super:
 
 let
   inherit (final) callPackage;
diff --git a/raspberry-pi/4/apply-overlays-dtmerge.nix b/raspberry-pi/4/apply-overlays-dtmerge.nix
index 72830295..84995032 100644
--- a/raspberry-pi/4/apply-overlays-dtmerge.nix
+++ b/raspberry-pi/4/apply-overlays-dtmerge.nix
@@ -1,6 +1,6 @@
 # modification of nixpkgs deviceTree.applyOverlays to resolve https://github.com/NixOS/nixpkgs/issues/125354
 # derived from https://github.com/NixOS/nixpkgs/blob/916ca8f2b0c208def051f8ea9760c534a40309db/pkgs/os-specific/linux/device-tree/default.nix
-{ lib, pkgs, stdenvNoCC, dtc, libraspberrypi }:
+{ lib, stdenvNoCC, dtc, libraspberrypi }:
 
 with lib; (base: overlays': stdenvNoCC.mkDerivation {
   name = "device-tree-overlays";
diff --git a/raspberry-pi/4/cpu-revision.nix b/raspberry-pi/4/cpu-revision.nix
index 8ac2c551..54db83af 100644
--- a/raspberry-pi/4/cpu-revision.nix
+++ b/raspberry-pi/4/cpu-revision.nix
@@ -1,4 +1,3 @@
-{ ... }:
 {
   hardware.deviceTree.overlays = [
     {
diff --git a/raspberry-pi/4/dwc2.nix b/raspberry-pi/4/dwc2.nix
index 4ee30911..bdb63b18 100644
--- a/raspberry-pi/4/dwc2.nix
+++ b/raspberry-pi/4/dwc2.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.hardware.raspberry-pi."4".dwc2;
diff --git a/raspberry-pi/4/i2c.nix b/raspberry-pi/4/i2c.nix
index 786581ee..0355397e 100644
--- a/raspberry-pi/4/i2c.nix
+++ b/raspberry-pi/4/i2c.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.hardware.raspberry-pi."4";
@@ -57,7 +57,7 @@ in
         overlays = [ (simple-overlay {
           target = "i2c0if";
           status = "okay";
-          frequency = cfg.i2c0.frequency;
+          inherit (cfg.i2c0) frequency;
         }) ];
       };
     })
@@ -67,7 +67,7 @@ in
         overlays = [ (simple-overlay {
           target = "i2c1";
           status = "okay";
-          frequency = cfg.i2c1.frequency;
+          inherit (cfg.i2c1) frequency;
         }) ];
       };
     })
diff --git a/raspberry-pi/4/modesetting.nix b/raspberry-pi/4/modesetting.nix
index 8151f931..b1f734b3 100644
--- a/raspberry-pi/4/modesetting.nix
+++ b/raspberry-pi/4/modesetting.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.hardware.raspberry-pi."4".fkms-3d;
diff --git a/raspberry-pi/4/pkgs-overlays.nix b/raspberry-pi/4/pkgs-overlays.nix
index 71db89f6..cc639d46 100644
--- a/raspberry-pi/4/pkgs-overlays.nix
+++ b/raspberry-pi/4/pkgs-overlays.nix
@@ -1,9 +1,9 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, ... }:
 let
   cfg = config.hardware.raspberry-pi."4".apply-overlays-dtmerge;
-  dt_ao_overlay = (final: prev: {
-    deviceTree.applyOverlays = (prev.callPackage ./apply-overlays-dtmerge.nix { });
-  });
+  dt_ao_overlay = _final: prev: {
+    deviceTree.applyOverlays = prev.callPackage ./apply-overlays-dtmerge.nix { };
+  };
 in {
   options.hardware = {
     raspberry-pi."4".apply-overlays-dtmerge = {
diff --git a/raspberry-pi/4/poe-hat.nix b/raspberry-pi/4/poe-hat.nix
index bda99252..6759f42f 100644
--- a/raspberry-pi/4/poe-hat.nix
+++ b/raspberry-pi/4/poe-hat.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.hardware.raspberry-pi."4".poe-hat;
diff --git a/raspberry-pi/4/poe-plus-hat.nix b/raspberry-pi/4/poe-plus-hat.nix
index 79177fed..e0627b69 100644
--- a/raspberry-pi/4/poe-plus-hat.nix
+++ b/raspberry-pi/4/poe-plus-hat.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 let 
   cfg = config.hardware.raspberry-pi."4".poe-plus-hat;
diff --git a/raspberry-pi/4/pwm0.nix b/raspberry-pi/4/pwm0.nix
index 37ae3a1f..5470eaf4 100644
--- a/raspberry-pi/4/pwm0.nix
+++ b/raspberry-pi/4/pwm0.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.hardware.raspberry-pi."4".pwm0;
diff --git a/supermicro/a1sri-2758f/default.nix b/supermicro/a1sri-2758f/default.nix
index 10ea2af4..3dfc3a7c 100644
--- a/supermicro/a1sri-2758f/default.nix
+++ b/supermicro/a1sri-2758f/default.nix
@@ -1,8 +1,5 @@
 # http://www.supermicro.com/products/motherboard/Atom/X10/A1SRi-2758F.cfm
 # This board contains a TPM header, but you must supply your own module.
-
-{ pkgs, ... }:
-
 {
   imports = [ ../. ];
 }
diff --git a/supermicro/x10sll-f/default.nix b/supermicro/x10sll-f/default.nix
index 86bc1be3..c0200510 100644
--- a/supermicro/x10sll-f/default.nix
+++ b/supermicro/x10sll-f/default.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   imports = [
     ../.
diff --git a/system76/default.nix b/system76/default.nix
index 8a881c04..b2605cc8 100644
--- a/system76/default.nix
+++ b/system76/default.nix
@@ -2,7 +2,7 @@
 #
 # https://system76.com/
 
-{ config, lib, ... }:
+{ lib, ... }:
 {
   imports = [ ../common/pc ];
 
diff --git a/toshiba/swanky/default.nix b/toshiba/swanky/default.nix
index 2f552802..32e3b126 100644
--- a/toshiba/swanky/default.nix
+++ b/toshiba/swanky/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 
 let
   ucm = pkgs.fetchzip {
@@ -20,7 +20,7 @@ in
   system.replaceRuntimeDependencies = [{
     original = pkgs.alsa-lib;
 
-    replacement = pkgs.alsa-lib.overrideAttrs (super: {
+    replacement = pkgs.alsa-lib.overrideAttrs (_super: {
       postFixup = "cp -r ${ucm}/chtmax98090 $out/share/alsa/ucm";
     });
   }];