nixos/*: remove unused let bindings (#515686)

2026-06-05 21:03:40 +00:00 · 2026-05-04 13:12:07 +00:00
parent 931b8756e7 2e87c2f8f4
commit 04b6aa5544
66 changed files with 17 additions and 103 deletions
--- a/nixos/lib/testing/call-test.nix
+++ b/nixos/lib/testing/call-test.nix
@@ -5,7 +5,7 @@
  ...
 }:
 let
-  inherit (lib) mkOption types;
+  inherit (lib) mkOption;

  unsafeGetAttrPosStringOr =
    default: name: value:
--- a/nixos/lib/testing/interactive.nix
+++ b/nixos/lib/testing/interactive.nix
@@ -6,7 +6,7 @@
  ...
 }:
 let
-  inherit (lib) mkOption types;
+  inherit (lib) mkOption;
 in
 {
  options = {
--- a/nixos/modules/config/nix-channel.nix
+++ b/nixos/modules/config/nix-channel.nix
@@ -9,7 +9,6 @@
 { config, lib, ... }:
 let
  inherit (lib)
-    mkDefault
    mkIf
    mkOption
    stringAfter
--- a/nixos/modules/config/nix-remote-build.nix
+++ b/nixos/modules/config/nix-remote-build.nix
@@ -15,7 +15,6 @@ let
    filter
    getVersion
    mkIf
-    mkMerge
    mkOption
    optional
    optionalString
--- a/nixos/modules/config/stub-ld.nix
+++ b/nixos/modules/config/stub-ld.nix
@@ -7,7 +7,6 @@

 let
  inherit (lib)
-    optionalString
    mkOption
    types
    mkIf
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -11,10 +11,8 @@ let
    any
    attrNames
    attrValues
-    boolToString
    concatMap
    concatMapStringsSep
-    concatStrings
    elem
    filter
    filterAttrs
@@ -39,12 +37,10 @@ let
    mkRenamedOptionModule
    optional
    optionals
-    sort
    stringAfter
    stringLength
    trace
    types
-    versionOlder
    xor
    ;

--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -17,7 +17,6 @@ let
    cleanSourceFilter
    concatMapStringsSep
    evalModules
-    filter
    functionArgs
    hasSuffix
    isAttrs
--- a/nixos/modules/programs/bat.nix
+++ b/nixos/modules/programs/bat.nix
@@ -16,7 +16,6 @@ let
    mkOption
    mkPackageOption
    nameValuePair
-    optionalString
    types
    isBool
    boolToString
--- a/nixos/modules/security/apparmor/includes.nix
+++ b/nixos/modules/security/apparmor/includes.nix
@@ -5,7 +5,7 @@
  ...
 }:
 let
-  inherit (builtins) attrNames hasAttr isAttrs;
+  inherit (builtins) hasAttr isAttrs;
  inherit (lib) getLib;
  inherit (config.environment) etc;
  # Utility to generate an AppArmor rule
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -7,8 +7,6 @@
 let
  cfg = config.services.rabbitmq;

-  inherit (builtins) concatStringsSep;
-
  config_file_content = lib.generators.toKeyValue { } cfg.configItems;
  config_file = pkgs.writeText "rabbitmq.conf" config_file_content;

--- a/nixos/modules/services/audio/tts.nix
+++ b/nixos/modules/services/audio/tts.nix
@@ -99,7 +99,6 @@ in
        mapAttrs'
        nameValuePair
        optionalString
-        concatMapStringsSep
        escapeShellArgs
        ;
    in
--- a/nixos/modules/services/backup/btrbk.nix
+++ b/nixos/modules/services/backup/btrbk.nix
@@ -11,7 +11,6 @@ let
    concatMapStringsSep
    concatStringsSep
    filterAttrs
-    flatten
    getAttr
    isAttrs
    literalExpression
--- a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix
+++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix
@@ -13,8 +13,6 @@
 }:
 let
  inherit (lib)
-    filterAttrs
-    literalExpression
    mkIf
    mkOption
    mkRemovedOptionModule
--- a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix
+++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix
@@ -11,7 +11,7 @@
  ...
 }:
 let
-  inherit (lib) mkIf mkDefault;
+  inherit (lib) mkIf;

  cfg = config.services.hercules-ci-agent;

--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -9,7 +9,6 @@ let
  inherit (lib)
    concatStringsSep
    flip
-    literalMD
    literalExpression
    optionalAttrs
    optionals
@@ -19,7 +18,6 @@ let
    mkIf
    mkOption
    types
-    versionAtLeast
    ;

  cfg = config.services.cassandra;
--- a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
@@ -9,7 +9,6 @@ let
  inherit (lib)
    mkEnableOption
    mkIf
-    mkRenamedOptionModule
    teams
    ;
 in
--- a/nixos/modules/services/games/armagetronad.nix
+++ b/nixos/modules/services/games/armagetronad.nix
@@ -16,7 +16,6 @@ let
    mapAttrsToList
    filterAttrs
    unique
-    recursiveUpdate
    types
    ;

--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -7,10 +7,8 @@

 let
  inherit (lib)
-    literalExpression
    mkIf
    mkOption
-    singleton
    types
    mkPackageOption
    ;
--- a/nixos/modules/services/misc/packagekit.nix
+++ b/nixos/modules/services/misc/packagekit.nix
@@ -13,7 +13,6 @@ let
    mkOption
    mkIf
    mkRemovedOptionModule
-    types
    listToAttrs
    recursiveUpdate
    ;
--- a/nixos/modules/services/monitoring/metricbeat.nix
+++ b/nixos/modules/services/monitoring/metricbeat.nix
@@ -8,7 +8,6 @@
 let
  inherit (lib)
    attrValues
-    literalExpression
    mkEnableOption
    mkPackageOption
    mkIf
--- a/nixos/modules/services/monitoring/parsedmarc.nix
+++ b/nixos/modules/services/monitoring/parsedmarc.nix
@@ -33,7 +33,6 @@ let
    isAttrs
    isString
    isInt
-    isList
    typeOf
    hashString
    ;
--- a/nixos/modules/services/monitoring/prometheus/exporters/bird.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/bird.nix
@@ -12,7 +12,6 @@ let
    mkOption
    types
    concatStringsSep
-    singleton
    ;
 in
 {
--- a/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix
@@ -7,7 +7,7 @@

 let
  cfg = config.services.prometheus.exporters.deluge;
-  inherit (lib) mkOption types concatStringsSep;
+  inherit (lib) mkOption types;
 in
 {
  port = 9354;
--- a/nixos/modules/services/monitoring/prometheus/exporters/kafka.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/kafka.nix
@@ -12,7 +12,6 @@ let
    mkOption
    mkMerge
    types
-    concatStringsSep
    ;
 in
 {
--- a/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix
@@ -13,7 +13,6 @@ let
    mkIf
    types
    concatStringsSep
-    any
    optionalString
    ;
  moonraker = config.services.moonraker;
--- a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix
@@ -12,7 +12,6 @@ let
    mkOption
    mkIf
    mkForce
-    cli
    concatStringsSep
    optionalString
    escapeShellArgs
--- a/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix
@@ -8,7 +8,6 @@
 let
  cfg = config.services.prometheus.exporters.nvidia-gpu;
  inherit (lib)
-    types
    concatStringsSep
    ;
 in
--- a/nixos/modules/services/monitoring/prometheus/exporters/script.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/script.nix
@@ -10,7 +10,6 @@ let
  cfg = config.services.prometheus.exporters.script;
  inherit (lib)
    mkOption
-    types
    literalExpression
    concatStringsSep
    ;
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -9,7 +9,6 @@ let
  cfg = config.services.zabbixAgent;

  inherit (lib)
-    mkDefault
    mkEnableOption
    mkPackageOption
    mkIf
@@ -18,9 +17,7 @@ let
    ;
  inherit (lib)
    attrValues
-    concatMapStringsSep
    literalExpression
-    optionalString
    types
    ;
  inherit (lib.generators) toKeyValue;
--- a/nixos/modules/services/monitoring/zabbix-proxy.nix
+++ b/nixos/modules/services/monitoring/zabbix-proxy.nix
@@ -22,7 +22,6 @@ let
    ;
  inherit (lib)
    attrValues
-    concatMapStringsSep
    getName
    literalExpression
    optional
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -22,7 +22,6 @@ let
    ;
  inherit (lib)
    attrValues
-    concatMapStringsSep
    getName
    literalExpression
    optional
--- a/nixos/modules/services/network-filesystems/davfs2.nix
+++ b/nixos/modules/services/network-filesystems/davfs2.nix
@@ -8,7 +8,6 @@
 let
  inherit (lib.attrsets) optionalAttrs;
  inherit (lib.generators) toINIWithGlobalSection;
-  inherit (lib.lists) optional;
  inherit (lib.modules) mkIf mkRemovedOptionModule;
  inherit (lib.options) literalExpression mkEnableOption mkOption;
  inherit (lib.strings) escape;
@@ -16,7 +15,6 @@ let
    attrsOf
    bool
    int
-    lines
    oneOf
    str
    submodule
--- a/nixos/modules/services/networking/cloudflare-ddns.nix
+++ b/nixos/modules/services/networking/cloudflare-ddns.nix
@@ -9,7 +9,6 @@ let

  boolToString = b: if b then "true" else "false";
  formatList = l: lib.concatStringsSep "," l;
-  formatDuration = d: d.String;
 in
 {
  options.services.cloudflare-ddns = {
@@ -266,7 +265,6 @@ in
          let
            toEnv = name: value: "${name}=\"${toString value}\"";
            toEnvList = name: value: "${name}=\"${formatList value}\"";
-            toEnvDuration = name: value: "${name}=\"${formatDuration value}\"";
            toEnvBool = name: value: "${name}=\"${boolToString value}\"";
            toEnvMaybe =
              pred: name: value:
--- a/nixos/modules/services/networking/ghostunnel.nix
+++ b/nixos/modules/services/networking/ghostunnel.nix
@@ -7,17 +7,13 @@
 let
  inherit (lib)
    attrValues
-    concatMap
    concatStringsSep
    escapeShellArg
-    literalExpression
-    mapAttrs'
    mkDefault
    mkEnableOption
    mkPackageOption
    mkIf
    mkOption
-    nameValuePair
    optional
    types
    ;
--- a/nixos/modules/services/networking/go-camo.nix
+++ b/nixos/modules/services/networking/go-camo.nix
@@ -11,7 +11,6 @@ let
    mkOption
    mkEnableOption
    mkIf
-    mkMerge
    types
    optionalString
    ;
--- a/nixos/modules/services/networking/https-dns-proxy.nix
+++ b/nixos/modules/services/networking/https-dns-proxy.nix
@@ -9,7 +9,6 @@ let
  inherit (lib)
    concatStringsSep
    mkEnableOption
-    mkIf
    mkOption
    types
    ;
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -11,7 +11,6 @@ let
    mkPackageOption
    mkIf
    mkOption
-    types
    recursiveUpdate
    optionalAttrs
    ;
--- a/nixos/modules/services/networking/mtr-exporter.nix
+++ b/nixos/modules/services/networking/mtr-exporter.nix
@@ -9,7 +9,6 @@ let
  inherit (lib)
    maintainers
    types
-    literalExpression
    escapeShellArg
    escapeShellArgs
    mkEnableOption
@@ -17,7 +16,6 @@ let
    mkRemovedOptionModule
    mkIf
    mkPackageOption
-    optionalString
    concatMapStrings
    concatStringsSep
    ;
--- a/nixos/modules/services/networking/wireguard-networkd.nix
+++ b/nixos/modules/services/networking/wireguard-networkd.nix
@@ -9,7 +9,6 @@ let
  inherit (lib) types;
  inherit (lib.attrsets)
    filterAttrs
-    mapAttrs
    mapAttrs'
    mapAttrsToList
    nameValuePair
--- a/nixos/modules/services/search/typesense.nix
+++ b/nixos/modules/services/search/typesense.nix
@@ -12,7 +12,6 @@ let
    mkIf
    mkOption
    mkPackageOption
-    optionalString
    types
    ;

--- a/nixos/modules/services/system/kerberos/default.nix
+++ b/nixos/modules/services/system/kerberos/default.nix
@@ -6,7 +6,7 @@
 }:

 let
-  inherit (lib) mkOption types;
+  inherit (lib) mkOption;
  inherit (lib.types) listOf str;
  cfg = config.services.kerberos_server;
  inherit (config.security.krb5) package;
--- a/nixos/modules/services/torrent/bitmagnet.nix
+++ b/nixos/modules/services/torrent/bitmagnet.nix
@@ -15,7 +15,6 @@ let
    ;
  inherit (lib.types)
    bool
-    int
    port
    str
    submodule
--- a/nixos/modules/services/web-apps/actual.nix
+++ b/nixos/modules/services/web-apps/actual.nix
@@ -8,7 +8,6 @@
 let
  inherit (lib)
    getExe
-    mkDefault
    mkEnableOption
    mkIf
    mkOption
--- a/nixos/modules/services/web-apps/cook-cli.nix
+++ b/nixos/modules/services/web-apps/cook-cli.nix
@@ -9,11 +9,7 @@ let
  cfg = config.services.cook-cli;
  inherit (lib)
    mkIf
-    mkEnableOption
-    mkPackageOption
-    mkOption
    getExe
-    types
    ;
 in
 {
--- a/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/nixos/modules/services/web-apps/dokuwiki.nix
@@ -8,7 +8,7 @@
 with lib;

 let
-  inherit (lib.options) showOption showFiles;
+  inherit (lib.options) showFiles;

  cfg = config.services.dokuwiki;
  eachSite = cfg.sites;
--- a/nixos/modules/services/web-apps/drupal.nix
+++ b/nixos/modules/services/web-apps/drupal.nix
@@ -33,7 +33,6 @@ let
  inherit (pkgs)
    mariadb
    stdenv
-    writeShellScript
    ;
  cfg = config.services.drupal;
  eachSite = cfg.sites;
--- a/nixos/modules/services/web-apps/gancio.nix
+++ b/nixos/modules/services/web-apps/gancio.nix
@@ -20,7 +20,6 @@ let
    concatMapStringsSep
    getExe
    mkMerge
-    mkDefault
    ;
 in
 {
--- a/nixos/modules/services/web-apps/meme-bingo-web.nix
+++ b/nixos/modules/services/web-apps/meme-bingo-web.nix
@@ -12,7 +12,6 @@ let
    mkIf
    mkOption
    types
-    literalExpression
    ;

  cfg = config.services.meme-bingo-web;
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -13,7 +13,6 @@ let
    types
    literalExpression
    mkIf
-    mkDefault
    ;
  cfg = config.services.miniflux;

--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -17,9 +17,7 @@ let
    types
    ;
  inherit (lib)
-    concatStringsSep
    literalExpression
-    mapAttrsToList
    optional
    optionalString
    ;
--- a/nixos/modules/services/web-apps/open-web-calendar.nix
+++ b/nixos/modules/services/web-apps/open-web-calendar.nix
@@ -13,8 +13,6 @@ let
    mkPackageOption
    mkDefault
    types
-    concatMapStringsSep
-    generators
    ;
  cfg = config.services.open-web-calendar;

--- a/nixos/modules/services/web-apps/plantuml-server.nix
+++ b/nixos/modules/services/web-apps/plantuml-server.nix
@@ -7,7 +7,6 @@

 let
  inherit (lib)
-    literalExpression
    mkEnableOption
    mkIf
    mkOption
--- a/nixos/modules/services/web-apps/porn-vault/default.nix
+++ b/nixos/modules/services/web-apps/porn-vault/default.nix
@@ -11,12 +11,8 @@ let
  defaultConfig = import ./default-config.nix;
  inherit (lib)
    mkIf
-    mkEnableOption
-    mkPackageOption
    mkOption
    getExe
-    literalExpression
-    types
    ;
 in
 {
--- a/nixos/modules/services/web-apps/rimgo.nix
+++ b/nixos/modules/services/web-apps/rimgo.nix
@@ -10,7 +10,6 @@ let
    mkOption
    mkEnableOption
    mkPackageOption
-    mkDefault
    mkIf
    types
    literalExpression
--- a/nixos/modules/services/web-apps/writefreely.nix
+++ b/nixos/modules/services/web-apps/writefreely.nix
@@ -15,7 +15,6 @@ let
    ;
  inherit (lib)
    optional
-    optionals
    optionalAttrs
    optionalString
    ;
--- a/nixos/modules/services/web-servers/nginx/tailscale-auth.nix
+++ b/nixos/modules/services/web-servers/nginx/tailscale-auth.nix
@@ -3,7 +3,6 @@
 let
  inherit (lib)
    genAttrs
-    maintainers
    mkAliasOptionModule
    mkEnableOption
    mkIf
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:

 let
-  inherit (lib) mkOption types;
+  inherit (lib) mkOption;
  cfg = config.services.xserver.windowManager;
 in

--- a/nixos/modules/system/activation/lib-test.nix
+++ b/nixos/modules/system/activation/lib-test.nix
@@ -6,7 +6,6 @@
  testers,
 }:
 let
-  inherit (lib) fileset;

  runTests = stdenv.mkDerivation {
    name = "tests-activation-lib";
--- a/nixos/modules/system/boot/systemd/user.nix
+++ b/nixos/modules/system/boot/systemd/user.nix
@@ -15,7 +15,6 @@ let
  systemd = config.systemd.package;

  inherit (systemdUtils.lib)
-    makeUnit
    generateUnits
    targetToUnit
    serviceToUnit
--- a/nixos/tests/chromadb.nix
+++ b/nixos/tests/chromadb.nix
@@ -1,21 +1,13 @@
-{ lib, pkgs, ... }:
-
-let
-  lib = pkgs.lib;
-
-in
 {
  name = "chromadb";
  meta.maintainers = [ ];

  nodes = {
-    machine =
-      { pkgs, ... }:
-      {
-        services.chromadb = {
-          enable = true;
-        };
+    machine = {
+      services.chromadb = {
+        enable = true;
      };
+    };
  };

  testScript = ''
--- a/nixos/tests/grafana/basic.nix
+++ b/nixos/tests/grafana/basic.nix
@@ -2,7 +2,7 @@ import ../make-test-python.nix (
  { lib, pkgs, ... }:

  let
-    inherit (lib) mkMerge nameValuePair maintainers;
+    inherit (lib) mkMerge;

    baseGrafanaConf = {
      services.grafana = {
--- a/nixos/tests/grafana/provision/default.nix
+++ b/nixos/tests/grafana/provision/default.nix
@@ -2,7 +2,7 @@ import ../../make-test-python.nix (
  { lib, pkgs, ... }:

  let
-    inherit (lib) mkMerge maintainers;
+    inherit (lib) mkMerge;

    baseGrafanaConf = {
      services.grafana = {
--- a/nixos/tests/pam/pam-file-contents.nix
+++ b/nixos/tests/pam/pam-file-contents.nix
@@ -1,6 +1,3 @@
-let
-  name = "pam";
-in
 { pkgs, ... }:
 {
  name = "pam-file-contents";
--- a/nixos/tests/vscode-remote-ssh.nix
+++ b/nixos/tests/vscode-remote-ssh.nix
@@ -1,5 +1,5 @@
 import ./make-test-python.nix (
-  { lib, pkgs, ... }@args:
+  { lib, pkgs, ... }:
  let
    inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;

--- a/nixos/tests/web-apps/immich-public-proxy.nix
+++ b/nixos/tests/web-apps/immich-public-proxy.nix
@@ -1,9 +1,8 @@
-{ pkgs, lib, ... }:
 {
  name = "immich-public-proxy";

  nodes.machine =
-    { pkgs, ... }@args:
+    { pkgs, ... }:
    {
      virtualisation.memorySize = 2048; # test hits OOM with default 1024
      environment.systemPackages = [
--- a/nixos/tests/windmill/default.nix
+++ b/nixos/tests/windmill/default.nix
@@ -1,4 +1,4 @@
-{ runTest, ... }@testArgs:
+{ runTest, ... }:
 {
  apiIntegration = runTest ./api-integration.nix;
 }