treewide: deadnix

2025-10-06 00:22:54 +02:00 · 2024-02-03 12:16:47 +03:00
parent 1855703b7f
commit a27adbec40
21 changed files with 20 additions and 39 deletions
--- a/modules/decky-loader.nix
+++ b/modules/decky-loader.nix
@@ -2,9 +2,7 @@

 let
  inherit (lib)
-    mkDefault
    mkIf
-    mkMerge
    mkOption
    types
  ;
@@ -43,8 +41,8 @@ in
        extraPythonPackages = mkOption {
          type = types.functionTo (types.listOf types.package);
          example = lib.literalExpression "pythonPackages: with pythonPackages; [ hid ]";
-          default = pythonPackages: with pythonPackages; [];
-          defaultText = lib.literalExpression "pythonPackages: with pythonPackages; []";
+          default = [];
+          defaultText = lib.literalExpression "[]";
          description = lib.mdDoc ''
            Extra Python packages to add to the PYTHONPATH of the loader.
          '';
--- a/modules/devices/steamdeck/controller.nix
+++ b/modules/devices/steamdeck/controller.nix
@@ -1,8 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:

 let
  inherit (lib)
-    mkDefault
    mkIf
    mkMerge
    mkOption
--- a/modules/devices/steamdeck/fan-control.nix
+++ b/modules/devices/steamdeck/fan-control.nix
@@ -4,9 +4,7 @@

 let
  inherit (lib)
-    mkDefault
    mkIf
-    mkMerge
    mkOption
    types
  ;
--- a/modules/devices/steamdeck/graphical.nix
+++ b/modules/devices/steamdeck/graphical.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:

 let
  inherit (lib)
--- a/modules/devices/steamdeck/hw-support.nix
+++ b/modules/devices/steamdeck/hw-support.nix
@@ -4,7 +4,6 @@

 let
  inherit (lib)
-    mkDefault
    mkIf
    mkMerge
    mkOption
--- a/modules/devices/steamdeck/perf-control.nix
+++ b/modules/devices/steamdeck/perf-control.nix
@@ -2,9 +2,7 @@

 let
  inherit (lib)
-    mkDefault
    mkIf
-    mkMerge
    mkOption
    types
  ;
--- a/modules/hardware/amd/default.nix
+++ b/modules/hardware/amd/default.nix
@@ -4,7 +4,6 @@ let
  inherit (lib)
    mkIf
    mkMerge
-    mkEnableOption
    mkOption
    types
  ;
@@ -12,7 +11,7 @@ let
  hardware = config.jovian.hardware;
  mkHasOption = description: mkOption {
    default = false;
-    type = lib.types.bool;
+    type = types.bool;
    description = ''
      Whether the device has ${description}.
    '';
--- a/modules/jovian/workarounds.nix
+++ b/modules/jovian/workarounds.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 let
  cfg = config.jovian.workarounds;
 in
@@ -19,10 +19,10 @@ in

  config = {
    nixpkgs.overlays = lib.mkIf (cfg.ignoreMissingKernelModules) [
-      (final: super: {
+      (_: prev: {
        # Workaround for modules expected by NixOS not being built
        # (vmw_balloon, among most likely other)
-        makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
+        makeModulesClosure = x: prev.makeModulesClosure (x // { allowMissing = true; });
      })
    ];
  };
--- a/modules/steam/default.nix
+++ b/modules/steam/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:

 let
  inherit (lib)
--- a/modules/steamos/boot.nix
+++ b/modules/steamos/boot.nix
@@ -2,7 +2,6 @@

 let
  inherit (lib)
-    mkDefault
    mkIf
    mkMerge
    mkOption
--- a/modules/steamos/default.nix
+++ b/modules/steamos/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:

 let
  inherit (lib)
--- a/overlay.nix
+++ b/overlay.nix
@@ -84,7 +84,7 @@ rec {

  jovian-hardware-survey = final.callPackage ./pkgs/jovian-hardware-survey { };

-  steamPackages = super.steamPackages.overrideScope (scopeFinal: scopeSuper: {
+  steamPackages = super.steamPackages.overrideScope (_: scopeSuper: {
    steam = final.callPackage ./pkgs/steam-jupiter/unwrapped.nix {
      steam-original = scopeSuper.steam;
    };
--- a/pkgs/decky-loader/default.nix
+++ b/pkgs/decky-loader/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nodePackages
 , nodejs
 , cacert
--- a/pkgs/gamescope/default.nix
+++ b/pkgs/gamescope/default.nix
@@ -5,7 +5,7 @@
 # NOTE: vendoring gamescope for the time being since we want to match the
 #       version shipped by the vendor, ensuring feature level is equivalent.

-gamescope'.overrideAttrs(old: rec {
+gamescope'.overrideAttrs(_: rec {
  version = "3.13.19";

  src = fetchFromGitHub {
--- a/pkgs/jupiter-dock-updater-bin/default.nix
+++ b/pkgs/jupiter-dock-updater-bin/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, stdenv
+{ stdenv
 , fetchFromGitHub
 , autoPatchelfHook
 , makeWrapper
--- a/pkgs/steam-jupiter/fhsenv.nix
+++ b/pkgs/steam-jupiter/fhsenv.nix
@@ -1,13 +1,11 @@
 # A wrapped version of Steam with shims to satisfy the SteamOS-only
 # dependencies of the Steam Deck UI

-{ lib
-, runCommand
-, writeShellScriptBin
+{ writeShellScriptBin
 , dmidecode
 , jovian-stubs
 , steam-fhsenv
-, steamos-polkit-helpers
+# , steamos-polkit-helpers
 , ...
 } @ args:

--- a/support/docs/default.nix
+++ b/support/docs/default.nix
@@ -1,8 +1,5 @@
 # This package provides the documentation
-{ stdenv
-, callPackage
-, runCommand
-, writeText
+{ callPackage
 , documentationPath ? ../../docs
 , pagefind
 , pkgs
--- a/support/docs/lib/eval-options.nix
+++ b/support/docs/lib/eval-options.nix
@@ -1,6 +1,4 @@
-{ lib
-, nixos
-}:
+{ nixos }:

 # Given a directory path, evaluates the options in combination with NixOS options.
 { path }:
--- a/support/docs/lib/overlay-doc.nix
+++ b/support/docs/lib/overlay-doc.nix
@@ -69,7 +69,7 @@ let
  ;
  overlayData =
    mapAttrs (
-      name: entry:
+      _: entry:
      if isDerivation entry
      then
        documentDerivation entry
--- a/support/test-iso/tty.nix
+++ b/support/test-iso/tty.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:

 {
  services.getty.autologinUser = config.jovian.steam.user;
--- a/support/test-iso/user.nix
+++ b/support/test-iso/user.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:

 {
  users.users = {