From 2e87c2f8f45e4680b8ec408c5dfbe43e36702776 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Fri, 1 May 2026 20:38:44 -0400 Subject: [PATCH] nixos/*: remove unused let bindings Generated using deadnix (with some manual work); split from #514611. --- nixos/lib/testing/call-test.nix | 2 +- nixos/lib/testing/interactive.nix | 2 +- nixos/modules/config/nix-channel.nix | 1 - nixos/modules/config/nix-remote-build.nix | 1 - nixos/modules/config/stub-ld.nix | 1 - nixos/modules/config/users-groups.nix | 4 ---- nixos/modules/misc/documentation.nix | 1 - nixos/modules/programs/bat.nix | 1 - nixos/modules/security/apparmor/includes.nix | 2 +- nixos/modules/services/amqp/rabbitmq.nix | 2 -- nixos/modules/services/audio/tts.nix | 1 - nixos/modules/services/backup/btrbk.nix | 1 - .../hercules-ci-agent/common.nix | 2 -- .../hercules-ci-agent/default.nix | 2 +- nixos/modules/services/databases/cassandra.nix | 2 -- .../desktops/gnome/gnome-browser-connector.nix | 1 - nixos/modules/services/games/armagetronad.nix | 1 - nixos/modules/services/mail/exim.nix | 2 -- nixos/modules/services/misc/packagekit.nix | 1 - nixos/modules/services/monitoring/metricbeat.nix | 1 - nixos/modules/services/monitoring/parsedmarc.nix | 1 - .../monitoring/prometheus/exporters/bird.nix | 1 - .../monitoring/prometheus/exporters/deluge.nix | 2 +- .../monitoring/prometheus/exporters/kafka.nix | 1 - .../monitoring/prometheus/exporters/klipper.nix | 1 - .../monitoring/prometheus/exporters/mysqld.nix | 1 - .../prometheus/exporters/nvidia-gpu.nix | 1 - .../monitoring/prometheus/exporters/script.nix | 1 - .../modules/services/monitoring/zabbix-agent.nix | 3 --- .../modules/services/monitoring/zabbix-proxy.nix | 1 - .../services/monitoring/zabbix-server.nix | 1 - .../services/network-filesystems/davfs2.nix | 2 -- .../services/networking/cloudflare-ddns.nix | 2 -- nixos/modules/services/networking/ghostunnel.nix | 4 ---- nixos/modules/services/networking/go-camo.nix | 1 - .../services/networking/https-dns-proxy.nix | 1 - nixos/modules/services/networking/iwd.nix | 1 - .../modules/services/networking/mtr-exporter.nix | 2 -- .../services/networking/wireguard-networkd.nix | 1 - nixos/modules/services/search/typesense.nix | 1 - .../modules/services/system/kerberos/default.nix | 2 +- nixos/modules/services/torrent/bitmagnet.nix | 1 - nixos/modules/services/web-apps/actual.nix | 1 - nixos/modules/services/web-apps/cook-cli.nix | 4 ---- nixos/modules/services/web-apps/dokuwiki.nix | 2 +- nixos/modules/services/web-apps/drupal.nix | 1 - nixos/modules/services/web-apps/gancio.nix | 1 - .../modules/services/web-apps/meme-bingo-web.nix | 1 - nixos/modules/services/web-apps/miniflux.nix | 1 - nixos/modules/services/web-apps/moodle.nix | 2 -- .../services/web-apps/open-web-calendar.nix | 2 -- .../services/web-apps/plantuml-server.nix | 1 - .../services/web-apps/porn-vault/default.nix | 4 ---- nixos/modules/services/web-apps/rimgo.nix | 1 - nixos/modules/services/web-apps/writefreely.nix | 1 - .../web-servers/nginx/tailscale-auth.nix | 1 - .../services/x11/window-managers/default.nix | 2 +- nixos/modules/system/activation/lib-test.nix | 1 - nixos/modules/system/boot/systemd/user.nix | 1 - nixos/tests/chromadb.nix | 16 ++++------------ nixos/tests/grafana/basic.nix | 2 +- nixos/tests/grafana/provision/default.nix | 2 +- nixos/tests/pam/pam-file-contents.nix | 3 --- nixos/tests/vscode-remote-ssh.nix | 2 +- nixos/tests/web-apps/immich-public-proxy.nix | 3 +-- nixos/tests/windmill/default.nix | 2 +- 66 files changed, 17 insertions(+), 103 deletions(-) diff --git a/nixos/lib/testing/call-test.nix b/nixos/lib/testing/call-test.nix index b85cdaf49244..ee8d7d487f0d 100644 --- 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: diff --git a/nixos/lib/testing/interactive.nix b/nixos/lib/testing/interactive.nix index 959cf463160c..4088cc2abfc1 100644 --- 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 = { diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index b05505687193..515c3795a9fe 100644 --- 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 diff --git a/nixos/modules/config/nix-remote-build.nix b/nixos/modules/config/nix-remote-build.nix index 928ed0c2c9b6..630c0f096ec1 100644 --- 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 diff --git a/nixos/modules/config/stub-ld.nix b/nixos/modules/config/stub-ld.nix index 277ed7594566..2e61ad50a18c 100644 --- 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 diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 56ff03aefec1..8291f55f37cb 100644 --- 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 ; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index cefe69707a17..3fd6e126cc1c 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -17,7 +17,6 @@ let cleanSourceFilter concatMapStringsSep evalModules - filter functionArgs hasSuffix isAttrs diff --git a/nixos/modules/programs/bat.nix b/nixos/modules/programs/bat.nix index d3fe0096c13d..cbe6ac48e909 100644 --- a/nixos/modules/programs/bat.nix +++ b/nixos/modules/programs/bat.nix @@ -16,7 +16,6 @@ let mkOption mkPackageOption nameValuePair - optionalString types isBool boolToString diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix index 92f5aa8d66b2..4929681b56b7 100644 --- 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 diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 254e6f500ede..b4913eab102e 100644 --- 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; diff --git a/nixos/modules/services/audio/tts.nix b/nixos/modules/services/audio/tts.nix index 554256e6d246..85457fc05839 100644 --- 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 diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix index 4b705b3fb88b..c44fc48836ce 100644 --- 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 diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 414483a85fe7..43f522c2aa82 100644 --- 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 diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix index 20c5deb02e8e..2cbf44f9f3dc 100644 --- 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; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 2161fc13ea59..7ddb083f6a10 100644 --- 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; diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix index 17c1dd9045e8..30bb7375cb20 100644 --- 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 diff --git a/nixos/modules/services/games/armagetronad.nix b/nixos/modules/services/games/armagetronad.nix index 17e449beb547..0066e7fc41f6 100644 --- a/nixos/modules/services/games/armagetronad.nix +++ b/nixos/modules/services/games/armagetronad.nix @@ -16,7 +16,6 @@ let mapAttrsToList filterAttrs unique - recursiveUpdate types ; diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index 56b29a311497..572c5a4bb324 100644 --- 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 ; diff --git a/nixos/modules/services/misc/packagekit.nix b/nixos/modules/services/misc/packagekit.nix index d55f736b3bed..8e4b5ce1de2d 100644 --- 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 ; diff --git a/nixos/modules/services/monitoring/metricbeat.nix b/nixos/modules/services/monitoring/metricbeat.nix index c8e2f4c7773c..b3ff2ce85910 100644 --- 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 diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 4e52894b6425..ea3bb4ea2b52 100644 --- 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 ; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bird.nix b/nixos/modules/services/monitoring/prometheus/exporters/bird.nix index 78174385d0d0..8f4c34ceaaee 100644 --- 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 { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix b/nixos/modules/services/monitoring/prometheus/exporters/deluge.nix index 939d2bcf3b7b..57985b699c7b 100644 --- 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; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/kafka.nix b/nixos/modules/services/monitoring/prometheus/exporters/kafka.nix index ebe17e08aeac..0792b8c84dde 100644 --- 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 { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix b/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix index 2d38a5023a0f..398a0729c70d 100644 --- 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; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix index e1015b3ce764..baa5f7a4890d 100644 --- 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 diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix b/nixos/modules/services/monitoring/prometheus/exporters/nvidia-gpu.nix index bf3d6ffa8ec9..ad70f3e90ccd 100644 --- 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 diff --git a/nixos/modules/services/monitoring/prometheus/exporters/script.nix b/nixos/modules/services/monitoring/prometheus/exporters/script.nix index 2658c27c720d..561ecf38573a 100644 --- 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 ; diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix index c93d0d8c37bb..ebfb12867e35 100644 --- 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; diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 29578cfb14ee..6f1c8f87dbbf 100644 --- 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 diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 50a33d26d827..e4f4e3b82930 100644 --- 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 diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 2a1460a8eef0..8f6e0b47ffcc 100644 --- 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 diff --git a/nixos/modules/services/networking/cloudflare-ddns.nix b/nixos/modules/services/networking/cloudflare-ddns.nix index 438794dc5dd7..183ead4a0f0c 100644 --- 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: diff --git a/nixos/modules/services/networking/ghostunnel.nix b/nixos/modules/services/networking/ghostunnel.nix index ea087d699e70..72d1494632ea 100644 --- 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 ; diff --git a/nixos/modules/services/networking/go-camo.nix b/nixos/modules/services/networking/go-camo.nix index 3bf4687895f2..d360b0cc6eed 100644 --- 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 ; diff --git a/nixos/modules/services/networking/https-dns-proxy.nix b/nixos/modules/services/networking/https-dns-proxy.nix index 4e8f81888cc2..1d735c906d10 100644 --- 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 ; diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index cf8ff650eea0..6da0c2ae424c 100644 --- 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 ; diff --git a/nixos/modules/services/networking/mtr-exporter.nix b/nixos/modules/services/networking/mtr-exporter.nix index e7c8bea4499b..f82a982fd7c7 100644 --- 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 ; diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix index c91454f1e605..7afcba232989 100644 --- 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 diff --git a/nixos/modules/services/search/typesense.nix b/nixos/modules/services/search/typesense.nix index 8556bacd0a7a..bd53f6a9fb3f 100644 --- a/nixos/modules/services/search/typesense.nix +++ b/nixos/modules/services/search/typesense.nix @@ -12,7 +12,6 @@ let mkIf mkOption mkPackageOption - optionalString types ; diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index 5dfc3bed844f..f65163978299 100644 --- 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; diff --git a/nixos/modules/services/torrent/bitmagnet.nix b/nixos/modules/services/torrent/bitmagnet.nix index 13369dab1f79..2d8ce218d427 100644 --- 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 diff --git a/nixos/modules/services/web-apps/actual.nix b/nixos/modules/services/web-apps/actual.nix index f51b0c9a0dba..5e9bbbd1d8c4 100644 --- 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 diff --git a/nixos/modules/services/web-apps/cook-cli.nix b/nixos/modules/services/web-apps/cook-cli.nix index e1addb21318e..e775037fbaf3 100644 --- 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 { diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 00daaaa74c94..7df3a71cd4e9 100644 --- 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; diff --git a/nixos/modules/services/web-apps/drupal.nix b/nixos/modules/services/web-apps/drupal.nix index 3b307327a6d7..b071e465145a 100644 --- 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; diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 6dc6c26bc089..ec54b98cdf0e 100644 --- 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 { diff --git a/nixos/modules/services/web-apps/meme-bingo-web.nix b/nixos/modules/services/web-apps/meme-bingo-web.nix index 5bda9afcf88d..83d9bbdc04e9 100644 --- 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; diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index bad9c0d95337..2fd1332d5f9b 100644 --- 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; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 037792be9c82..4967587aa5b4 100644 --- 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 ; diff --git a/nixos/modules/services/web-apps/open-web-calendar.nix b/nixos/modules/services/web-apps/open-web-calendar.nix index f136ef8b75f5..98976d81b960 100644 --- 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; diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index 5045da9a89d5..184787d94c0e 100644 --- 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 diff --git a/nixos/modules/services/web-apps/porn-vault/default.nix b/nixos/modules/services/web-apps/porn-vault/default.nix index e493e5de7b84..a676daeb4904 100644 --- 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 { diff --git a/nixos/modules/services/web-apps/rimgo.nix b/nixos/modules/services/web-apps/rimgo.nix index 47aaf5317b2d..21c5b9ec5b5a 100644 --- 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 diff --git a/nixos/modules/services/web-apps/writefreely.nix b/nixos/modules/services/web-apps/writefreely.nix index b2969ed1bcfa..3a0f66185ea1 100644 --- 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 ; diff --git a/nixos/modules/services/web-servers/nginx/tailscale-auth.nix b/nixos/modules/services/web-servers/nginx/tailscale-auth.nix index 09ddc3fffc56..ffa5dede1194 100644 --- 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 diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 57a91fe09159..7cf6dfaebaf9 100644 --- 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 diff --git a/nixos/modules/system/activation/lib-test.nix b/nixos/modules/system/activation/lib-test.nix index 72039a6921a0..bb2628156774 100644 --- 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"; diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix index d9a9631fba92..5161a5a2c2ff 100644 --- 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 diff --git a/nixos/tests/chromadb.nix b/nixos/tests/chromadb.nix index de8454d5d131..a1500b0718ee 100644 --- 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 = '' diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index 27887bdb339c..eb024be44fa9 100644 --- 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 = { diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 550b2c4189e0..8fed76d5b282 100644 --- 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 = { diff --git a/nixos/tests/pam/pam-file-contents.nix b/nixos/tests/pam/pam-file-contents.nix index c0342ebaaf7b..3f027a9ff2b3 100644 --- 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"; diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix index 852011735e27..2e99430c49a6 100644 --- 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; diff --git a/nixos/tests/web-apps/immich-public-proxy.nix b/nixos/tests/web-apps/immich-public-proxy.nix index 7f627e14404c..bd3cf7c5bc9c 100644 --- 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 = [ diff --git a/nixos/tests/windmill/default.nix b/nixos/tests/windmill/default.nix index 5f4ffa66467f..3d432f19dd4b 100644 --- a/nixos/tests/windmill/default.nix +++ b/nixos/tests/windmill/default.nix @@ -1,4 +1,4 @@ -{ runTest, ... }@testArgs: +{ runTest, ... }: { apiIntegration = runTest ./api-integration.nix; }