From b7747f0f60bbdc50f840a49ab77d480d1d018cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Dec 2023 21:14:17 +0100 Subject: [PATCH] remove unused variables with deadnix --- apple/macbook-air/6/default.nix | 2 +- common/gpu/nvidia/prime.nix | 2 +- dell/precision/3541/intel/default.nix | 2 -- dell/xps/13-9333/default.nix | 2 +- friendlyarm/nanopi-r5s/default.nix | 1 - gpd/win-2/default.nix | 2 +- gpd/win-max-2/2023/default.nix | 5 +---- hardkernel/odroid-h3/default.nix | 2 -- hp/elitebook/845/g7/default.nix | 2 +- hp/elitebook/845/g9/default.nix | 2 +- lenovo/ideapad/s145-15api/default.nix | 2 -- lenovo/ideapad/slim-5/default.nix | 2 -- lenovo/legion/15ach6/default.nix | 4 +--- lenovo/legion/16achg6/hybrid/default.nix | 2 +- lenovo/legion/16irx8h/default.nix | 1 - lenovo/thinkpad/t440p/default.nix | 2 -- microchip/icicle-kit/default.nix | 2 -- morefine/m600/default.nix | 2 +- olimex/teres_i/default.nix | 2 +- onenetbook/4/default.nix | 2 +- pine64/rockpro64/default.nix | 2 +- pine64/star64/firmware.nix | 2 +- pine64/star64/sd-image.nix | 2 +- purism/librem/5r4/initrd.nix | 2 +- purism/librem/5r4/u-boot/default.nix | 2 +- purism/librem/5r4/wifi.nix | 2 +- starfive/visionfive/v2/firmware.nix | 2 +- starfive/visionfive/v2/sd-image.nix | 2 +- 28 files changed, 20 insertions(+), 39 deletions(-) diff --git a/apple/macbook-air/6/default.nix b/apple/macbook-air/6/default.nix index c892026a2..182511f32 100644 --- a/apple/macbook-air/6/default.nix +++ b/apple/macbook-air/6/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { imports = [ ../. ]; diff --git a/common/gpu/nvidia/prime.nix b/common/gpu/nvidia/prime.nix index 371e9eb52..e54f942ca 100644 --- a/common/gpu/nvidia/prime.nix +++ b/common/gpu/nvidia/prime.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: { imports = [ ./. ]; diff --git a/dell/precision/3541/intel/default.nix b/dell/precision/3541/intel/default.nix index 78a839d44..a650e5752 100644 --- a/dell/precision/3541/intel/default.nix +++ b/dell/precision/3541/intel/default.nix @@ -1,5 +1,3 @@ -{ lib, pkgs, ... }: - { imports = [ ../../../../common/cpu/intel diff --git a/dell/xps/13-9333/default.nix b/dell/xps/13-9333/default.nix index 3aa0bf6bd..a17c094d2 100644 --- a/dell/xps/13-9333/default.nix +++ b/dell/xps/13-9333/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: { +{ imports = [ ../../../common/cpu/intel ../../../common/pc/laptop diff --git a/friendlyarm/nanopi-r5s/default.nix b/friendlyarm/nanopi-r5s/default.nix index 019b5b86e..b7ecb9164 100644 --- a/friendlyarm/nanopi-r5s/default.nix +++ b/friendlyarm/nanopi-r5s/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , ... }: diff --git a/gpd/win-2/default.nix b/gpd/win-2/default.nix index 522b62f32..aaaba3745 100644 --- a/gpd/win-2/default.nix +++ b/gpd/win-2/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ...}: +{ config, lib, ...}: { imports = [ ../../common/cpu/intel diff --git a/gpd/win-max-2/2023/default.nix b/gpd/win-max-2/2023/default.nix index 689400441..1f1745ffb 100644 --- a/gpd/win-max-2/2023/default.nix +++ b/gpd/win-max-2/2023/default.nix @@ -1,8 +1,5 @@ -{ config, lib, pkgs, ...}: +{ config, lib, ...}: with lib; -let - cfg = config.hardware.gpd.ppt; -in { imports = [ ./.. diff --git a/hardkernel/odroid-h3/default.nix b/hardkernel/odroid-h3/default.nix index 435ef8940..e52d3a02b 100644 --- a/hardkernel/odroid-h3/default.nix +++ b/hardkernel/odroid-h3/default.nix @@ -1,5 +1,3 @@ -{ config, lib, ... }: - { imports = [ ../../common/cpu/intel/jasper-lake diff --git a/hp/elitebook/845/g7/default.nix b/hp/elitebook/845/g7/default.nix index 6c0cb49a9..60afe6a75 100644 --- a/hp/elitebook/845/g7/default.nix +++ b/hp/elitebook/845/g7/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { imports = diff --git a/hp/elitebook/845/g9/default.nix b/hp/elitebook/845/g9/default.nix index 6c0cb49a9..60afe6a75 100644 --- a/hp/elitebook/845/g9/default.nix +++ b/hp/elitebook/845/g9/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { imports = diff --git a/lenovo/ideapad/s145-15api/default.nix b/lenovo/ideapad/s145-15api/default.nix index 08b11c769..802e0be1e 100644 --- a/lenovo/ideapad/s145-15api/default.nix +++ b/lenovo/ideapad/s145-15api/default.nix @@ -1,5 +1,3 @@ -{ lib, ... }: - { imports = [ ../../../common/cpu/amd diff --git a/lenovo/ideapad/slim-5/default.nix b/lenovo/ideapad/slim-5/default.nix index a830c0bd3..c71052dfa 100644 --- a/lenovo/ideapad/slim-5/default.nix +++ b/lenovo/ideapad/slim-5/default.nix @@ -1,5 +1,3 @@ -{ lib, ... }: - { imports = [ ../../../common/cpu/amd diff --git a/lenovo/legion/15ach6/default.nix b/lenovo/legion/15ach6/default.nix index 4844f79f3..a3c00fd7b 100644 --- a/lenovo/legion/15ach6/default.nix +++ b/lenovo/legion/15ach6/default.nix @@ -1,7 +1,5 @@ { lib, config, ... }: -let - inherit (config.boot) kernelPackages; -in { +{ imports = [ ../../../common/cpu/amd ../../../common/gpu/amd diff --git a/lenovo/legion/16achg6/hybrid/default.nix b/lenovo/legion/16achg6/hybrid/default.nix index fce43f6e8..fa69491be 100644 --- a/lenovo/legion/16achg6/hybrid/default.nix +++ b/lenovo/legion/16achg6/hybrid/default.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, ... }: { imports = [ diff --git a/lenovo/legion/16irx8h/default.nix b/lenovo/legion/16irx8h/default.nix index 7249c1dd9..cfbcb8aa4 100644 --- a/lenovo/legion/16irx8h/default.nix +++ b/lenovo/legion/16irx8h/default.nix @@ -1,7 +1,6 @@ { lib, config, - pkgs, ... }: { imports = [ diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index 144b7d067..241fc09ef 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -1,5 +1,3 @@ -{ lib, ... }: - { imports = [ ../. diff --git a/microchip/icicle-kit/default.nix b/microchip/icicle-kit/default.nix index 19fb228a3..db5781675 100644 --- a/microchip/icicle-kit/default.nix +++ b/microchip/icicle-kit/default.nix @@ -1,5 +1,3 @@ -{ pkgs, lib, ... }: - { nixpkgs.overlays = [ (import ./overlay.nix) diff --git a/morefine/m600/default.nix b/morefine/m600/default.nix index db4ed2472..487907607 100644 --- a/morefine/m600/default.nix +++ b/morefine/m600/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ...}: { +{ lib, ...}: { imports = [ ../../common/cpu/amd ../../common/cpu/amd/pstate.nix diff --git a/olimex/teres_i/default.nix b/olimex/teres_i/default.nix index 34bec53c0..f72cb1d4e 100644 --- a/olimex/teres_i/default.nix +++ b/olimex/teres_i/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ...}: +{ lib, pkgs, ...}: { hardware.deviceTree = { diff --git a/onenetbook/4/default.nix b/onenetbook/4/default.nix index 9ac16b505..6b108b4c3 100644 --- a/onenetbook/4/default.nix +++ b/onenetbook/4/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ config, ... }: { imports = [ diff --git a/pine64/rockpro64/default.nix b/pine64/rockpro64/default.nix index a4d313691..9ac08e838 100644 --- a/pine64/rockpro64/default.nix +++ b/pine64/rockpro64/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { boot.initrd.kernelModules = [ # PCIe/NVMe diff --git a/pine64/star64/firmware.nix b/pine64/star64/firmware.nix index c300de490..e0173a6cf 100644 --- a/pine64/star64/firmware.nix +++ b/pine64/star64/firmware.nix @@ -1,4 +1,4 @@ -{ callPackage, pkgsBuildHost, runCommand, writeText, writeShellApplication +{ callPackage, pkgsBuildHost, writeText, writeShellApplication , stdenv, dtc, mtdutils, coreutils }: let uboot = callPackage ./uboot.nix { }; diff --git a/pine64/star64/sd-image.nix b/pine64/star64/sd-image.nix index 03d550848..07d00ae8f 100644 --- a/pine64/star64/sd-image.nix +++ b/pine64/star64/sd-image.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, modulesPath, ... }: +{ config, pkgs, modulesPath, ... }: let firmware = pkgs.callPackage ./firmware.nix { }; in { diff --git a/purism/librem/5r4/initrd.nix b/purism/librem/5r4/initrd.nix index 7ffe6099f..e82d5cff5 100644 --- a/purism/librem/5r4/initrd.nix +++ b/purism/librem/5r4/initrd.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: lib.mkIf config.hardware.librem5.customInitrdModules { boot.initrd = { kernelModules = [ diff --git a/purism/librem/5r4/u-boot/default.nix b/purism/librem/5r4/u-boot/default.nix index 78e60667b..26c217c56 100644 --- a/purism/librem/5r4/u-boot/default.nix +++ b/purism/librem/5r4/u-boot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc11Stdenv, buildUBoot, fetchurl, fetchFromGitLab, lib, flex, bison }: +{ stdenv, gcc11Stdenv, buildUBoot, fetchurl, fetchFromGitLab, lib, bison }: let firmware-imx = stdenv.mkDerivation (fa: { pname = "firmware-imx"; diff --git a/purism/librem/5r4/wifi.nix b/purism/librem/5r4/wifi.nix index f469a4f4d..5313aeeea 100644 --- a/purism/librem/5r4/wifi.nix +++ b/purism/librem/5r4/wifi.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: lib.mkIf (config.hardware.librem5.wifiCard == "redpine") { # Disable mainline rsi module boot.blacklistedKernelModules = [ diff --git a/starfive/visionfive/v2/firmware.nix b/starfive/visionfive/v2/firmware.nix index f2e686164..03c77076b 100644 --- a/starfive/visionfive/v2/firmware.nix +++ b/starfive/visionfive/v2/firmware.nix @@ -1,4 +1,4 @@ -{ callPackage, pkgsBuildHost, runCommand, writeText, writeShellApplication +{ callPackage, pkgsBuildHost, writeText, writeShellApplication , stdenv, dtc, mtdutils, coreutils }: let uboot = callPackage ./uboot.nix { }; diff --git a/starfive/visionfive/v2/sd-image.nix b/starfive/visionfive/v2/sd-image.nix index 6ee39e363..79bb6f356 100644 --- a/starfive/visionfive/v2/sd-image.nix +++ b/starfive/visionfive/v2/sd-image.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, modulesPath, ... }: +{ config, pkgs, modulesPath, ... }: let firmware = pkgs.callPackage ./firmware.nix { }; in {