treewide: apply deadnix and statix

This commit is contained in:
Jörg Thalheim 2022-12-31 11:52:38 +01:00
parent d7dfd13d25
commit 03c6d15152
117 changed files with 93 additions and 162 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

Some files were not shown because too many files have changed in this diff Show more