treewide: apply deadnix and statix

NireBryce · Dec 31, 2022 · 03c6d15 · 03c6d15
1 parent d7dfd13
commit 03c6d15
Show file tree

Hide file tree

Showing 117 changed files with 93 additions and 162 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1 @@
-{ lib, ... }:
-
 {}
diff --git 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
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -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
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

diff --git 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
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 {
   imports = [

diff --git 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
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [

diff --git 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
@@ -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
@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   imports = [
     ../.

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [

diff --git 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
@@ -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
@@ -1,5 +1,5 @@
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   imports = [