From a93d80bcec089abf80894c25ee3934b7e196bbd9 Mon Sep 17 00:00:00 2001 From: Benedikt Rips Date: Sun, 26 Oct 2025 22:29:55 +0100 Subject: [PATCH] treewide: remove unused attrs patterns --- modules/launchd/default.nix | 2 +- modules/lib/booleans.nix | 1 - modules/lib/default.nix | 2 +- .../misc/news/2025/11/2025-11-04_16-44-03.nix | 6 -- .../misc/news/2026/03/2026-03-15_13-42-27.nix | 1 - .../misc/news/2026/03/2026-03-25_14-18-02.nix | 1 - modules/misc/ssh-auth-sock.nix | 12 ++-- modules/programs/aerc/accounts.nix | 1 - modules/programs/docker-cli.nix | 2 +- modules/programs/firefoxpwa.nix | 2 +- modules/programs/obsidian.nix | 4 +- modules/programs/vicinae/default.nix | 2 +- modules/programs/vicinae/lib.nix | 1 - modules/services/activitywatch.nix | 2 - modules/services/mopidy.nix | 1 - modules/services/radicle.nix | 1 - modules/services/recoll.nix | 1 - modules/services/window-managers/hyprland.nix | 71 +++++++++---------- .../window-managers/i3-sway/lib/functions.nix | 2 +- modules/targets/darwin/default.nix | 2 - .../standalone/alice-home-init.nix | 2 - tests/integration/standalone/dconf-home.nix | 1 - .../standalone/home-with-symbols-init.nix | 2 - tests/modules/config/i18n/default.nix | 2 +- tests/modules/misc/gtk/gtk-colorscheme.nix | 1 - tests/modules/misc/xdg/user-dirs-null.nix | 1 - tests/modules/programs/algia/settings.nix | 7 -- tests/modules/programs/cargo/cargo-home.nix | 2 - tests/modules/programs/dbeaver/default.nix | 2 - .../programs/dbeaver/with-data-sources.nix | 2 +- .../programs/dbeaver/with-settings.nix | 2 +- .../programs/dbeaver/without-settings.nix | 2 +- tests/modules/programs/fish/abbrs.nix | 1 - .../modules/programs/fish/format-scripts.nix | 2 +- tests/modules/programs/go/old-options.nix | 1 - .../modules/programs/go/suboptions-unset.nix | 2 +- .../programs/i3status-rust/with-custom.nix | 1 - .../programs/i3status-rust/with-default.nix | 1 - .../i3status-rust/with-extra-settings.nix | 1 - .../i3status-rust/with-multiple-bars.nix | 1 - .../i3status-rust/with-version-02xx.nix | 1 - .../programs/kitty/auto-theme-files.nix | 1 - .../example-quickAccessTerminalConfig.nix | 1 - .../programs/mods/basic-configuration.nix | 2 +- .../old-default-partial-settings.nix | 1 - tests/modules/programs/retroarch/settings.nix | 1 - tests/modules/programs/retroarch/stubs.nix | 1 - tests/modules/programs/ssh/includes.nix | 5 -- .../programs/tex-fmt/custom-settings.nix | 2 +- .../programs/tex-fmt/default-settings.nix | 2 +- tests/modules/programs/ty/no-settings.nix | 2 - .../programs/vesktop/basic-configuration.nix | 2 - .../programs/vicinae/pre17-settings.nix | 1 - .../modules/programs/vscode/null-package.nix | 1 - .../w3m/example-config-xdg-enabled.nix | 1 - .../wezterm/settings-extra-config-direct.nix | 2 - .../wezterm/settings-with-extra-config.nix | 2 - .../services/caffeine/basic-service.nix | 2 - .../colima/darwin/colima-custom-settings.nix | 2 - .../colima/darwin/colima-default-config.nix | 2 - .../colima/darwin/colima-docker-cli.nix | 2 - .../colima/linux/colima-default-config.nix | 2 - .../colima/linux/colima-docker-cli.nix | 2 - .../services/darkman/unified-scripts.nix | 2 +- .../services/fnott/example-settings.nix | 1 - .../services/fnott/systemd-user-service.nix | 1 - .../services/gnome-keyring/basic-service.nix | 2 - .../gnome-keyring/custom-components.nix | 2 - .../herbstluftwm-alias-disabled.nix | 2 - .../basic-configuration.nix | 2 - .../services/hyprland/submaps-config.nix | 2 - .../services/hyprland/submaps-on-dispatch.nix | 2 - tests/modules/services/playerctld/basic.nix | 2 +- .../proton-pass-agent/basic-service.nix | 2 +- .../proton-pass-agent/full-service.nix | 2 +- tests/modules/systemd/packages.nix | 2 +- .../setup-package-contents.nix | 2 - treefmt.toml | 2 +- 78 files changed, 62 insertions(+), 159 deletions(-) diff --git a/modules/launchd/default.nix b/modules/launchd/default.nix index eb526091b..916f68c83 100644 --- a/modules/launchd/default.nix +++ b/modules/launchd/default.nix @@ -14,7 +14,7 @@ let dstDir = "${config.home.homeDirectory}/Library/LaunchAgents"; launchdConfig = - { config, name, ... }: + { name, ... }: { options = { enable = lib.mkEnableOption name; diff --git a/modules/lib/booleans.nix b/modules/lib/booleans.nix index fd3aa3a3e..e9c51bc43 100644 --- a/modules/lib/booleans.nix +++ b/modules/lib/booleans.nix @@ -1,4 +1,3 @@ -{ lib }: { # Converts a boolean to a yes/no string. This is used in lots of # configuration formats. diff --git a/modules/lib/default.nix b/modules/lib/default.nix index 7adc71987..ed829c756 100644 --- a/modules/lib/default.nix +++ b/modules/lib/default.nix @@ -5,7 +5,7 @@ rec { assertions = import ./assertions.nix { inherit lib; }; - booleans = import ./booleans.nix { inherit lib; }; + booleans = import ./booleans.nix; darwin = import ./darwin.nix { inherit lib; }; deprecations = import ./deprecations.nix { inherit lib; }; generators = import ./generators.nix { inherit lib; }; diff --git a/modules/misc/news/2025/11/2025-11-04_16-44-03.nix b/modules/misc/news/2025/11/2025-11-04_16-44-03.nix index fd169e993..57b1bace2 100644 --- a/modules/misc/news/2025/11/2025-11-04_16-44-03.nix +++ b/modules/misc/news/2025/11/2025-11-04_16-44-03.nix @@ -1,9 +1,3 @@ -{ - config, - lib, - pkgs, - ... -}: { time = "2025-11-04T15:44:03+00:00"; condition = true; diff --git a/modules/misc/news/2026/03/2026-03-15_13-42-27.nix b/modules/misc/news/2026/03/2026-03-15_13-42-27.nix index 79adbb808..719400e2a 100644 --- a/modules/misc/news/2026/03/2026-03-15_13-42-27.nix +++ b/modules/misc/news/2026/03/2026-03-15_13-42-27.nix @@ -1,4 +1,3 @@ -{ config, pkgs, ... }: { time = "2026-03-15T20:42:27+00:00"; condition = true; diff --git a/modules/misc/news/2026/03/2026-03-25_14-18-02.nix b/modules/misc/news/2026/03/2026-03-25_14-18-02.nix index e83ce9faf..f5b92efa9 100644 --- a/modules/misc/news/2026/03/2026-03-25_14-18-02.nix +++ b/modules/misc/news/2026/03/2026-03-25_14-18-02.nix @@ -1,4 +1,3 @@ -{ config, pkgs, ... }: { time = "2026-03-25T17:18:02+00:00"; condition = true; diff --git a/modules/misc/ssh-auth-sock.nix b/modules/misc/ssh-auth-sock.nix index 26d624cc1..dc54c255c 100644 --- a/modules/misc/ssh-auth-sock.nix +++ b/modules/misc/ssh-auth-sock.nix @@ -10,13 +10,11 @@ let type = lib.types.str; }; - initSubmodule = - { config, ... }: - { - options.bash = mkShellInitOption "bash"; - options.fish = mkShellInitOption "fish"; - options.nushell = mkShellInitOption "nushell"; - }; + initSubmodule = { + options.bash = mkShellInitOption "bash"; + options.fish = mkShellInitOption "fish"; + options.nushell = mkShellInitOption "nushell"; + }; # Preserve $SSH_AUTH_SOCK only if it stems from a forwarded agent which # is the case if both $SSH_AUTH_SOCK and $SSH_CONNECTION are set. diff --git a/modules/programs/aerc/accounts.nix b/modules/programs/aerc/accounts.nix index 9910fb3fb..1a27870ef 100644 --- a/modules/programs/aerc/accounts.nix +++ b/modules/programs/aerc/accounts.nix @@ -193,7 +193,6 @@ in userName, imap, passwordCommand, - aerc, ... }@cfg: let diff --git a/modules/programs/docker-cli.nix b/modules/programs/docker-cli.nix index 7d2c3c90b..11fd83150 100644 --- a/modules/programs/docker-cli.nix +++ b/modules/programs/docker-cli.nix @@ -45,7 +45,7 @@ in contexts = mkOption { type = lib.types.attrsOf ( lib.types.submodule ( - { name, config, ... }: + { name, ... }: { freeformType = jsonFormat.type; options = { diff --git a/modules/programs/firefoxpwa.nix b/modules/programs/firefoxpwa.nix index e56d9f544..e01db6cd2 100644 --- a/modules/programs/firefoxpwa.nix +++ b/modules/programs/firefoxpwa.nix @@ -16,7 +16,7 @@ let mkUlidAssertions = path: lib.concatMap ( - { name, value }: + { name, ... }: let length = 26; allowed = "0123456789ABCDEFGHJKMNPQRSTVWXYZ"; diff --git a/modules/programs/obsidian.nix b/modules/programs/obsidian.nix index 6330d262a..03949f0ec 100644 --- a/modules/programs/obsidian.nix +++ b/modules/programs/obsidian.nix @@ -178,7 +178,7 @@ let hotkeysSettingsType = with types; nullOr (attrsOf (listOf (submodule hotkeysOptions))); extraFilesOptions = - { name, config, ... }: + { name, ... }: { options = { source = mkOption { @@ -303,7 +303,7 @@ in description = "List of vaults to create."; type = types.attrsOf ( types.submodule ( - { name, config, ... }: + { name, ... }: { options = { enable = mkOption { diff --git a/modules/programs/vicinae/default.nix b/modules/programs/vicinae/default.nix index 9aab8a939..b0370cda2 100644 --- a/modules/programs/vicinae/default.nix +++ b/modules/programs/vicinae/default.nix @@ -6,7 +6,7 @@ }: let cfg = config.programs.vicinae; - vicinaeLib = import ./lib.nix { inherit lib pkgs; }; + vicinaeLib = import ./lib.nix { inherit pkgs; }; jsonFormat = pkgs.formats.json { }; tomlFormat = pkgs.formats.toml { }; diff --git a/modules/programs/vicinae/lib.nix b/modules/programs/vicinae/lib.nix index fa35d221e..3d51fa152 100644 --- a/modules/programs/vicinae/lib.nix +++ b/modules/programs/vicinae/lib.nix @@ -1,6 +1,5 @@ { pkgs, - lib, }: { mkExtension = diff --git a/modules/services/activitywatch.nix b/modules/services/activitywatch.nix index f60a17f79..dd276de02 100644 --- a/modules/services/activitywatch.nix +++ b/modules/services/activitywatch.nix @@ -1,6 +1,5 @@ { config, - options, lib, pkgs, ... @@ -46,7 +45,6 @@ let { name, config, - options, ... }: { diff --git a/modules/services/mopidy.nix b/modules/services/mopidy.nix index 0d7376a11..2263c5c81 100644 --- a/modules/services/mopidy.nix +++ b/modules/services/mopidy.nix @@ -1,6 +1,5 @@ { config, - options, lib, pkgs, ... diff --git a/modules/services/radicle.nix b/modules/services/radicle.nix index c8c69b5a2..4a93a23cc 100644 --- a/modules/services/radicle.nix +++ b/modules/services/radicle.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - options, ... }: let diff --git a/modules/services/recoll.nix b/modules/services/recoll.nix index 1b7d38e0e..7d86ac7cc 100644 --- a/modules/services/recoll.nix +++ b/modules/services/recoll.nix @@ -1,6 +1,5 @@ { config, - options, lib, pkgs, ... diff --git a/modules/services/window-managers/hyprland.nix b/modules/services/window-managers/hyprland.nix index 9de09a07d..4b6110fe6 100644 --- a/modules/services/window-managers/hyprland.nix +++ b/modules/services/window-managers/hyprland.nix @@ -234,44 +234,41 @@ in ''; default = { }; type = lib.types.attrsOf ( - lib.types.submodule ( - { name, config, ... }: - { - options = { - onDispatch = lib.mkOption { - type = lib.types.str; - default = ""; - description = '' - Submap to use after a dispatch. Can either be a name or `reset` to disable submap after any dispatch. - ''; - example = "reset"; - }; - settings = lib.mkOption { - type = (with lib.types; attrsOf (listOf str)) // { - description = "Hyprland binds"; - }; - default = { }; - description = '' - Hyprland binds to be put in the submap - ''; - example = lib.literalExpression '' - { - binde = [ - ", right, resizeactive, 10 0" - ", left, resizeactive, -10 0" - ", up, resizeactive, 0 -10" - ", down, resizeactive, 0 10" - ]; - - bind = [ - ", escape, submap, reset" - ]; - } - ''; - }; + lib.types.submodule { + options = { + onDispatch = lib.mkOption { + type = lib.types.str; + default = ""; + description = '' + Submap to use after a dispatch. Can either be a name or `reset` to disable submap after any dispatch. + ''; + example = "reset"; }; - } - ) + settings = lib.mkOption { + type = (with lib.types; attrsOf (listOf str)) // { + description = "Hyprland binds"; + }; + default = { }; + description = '' + Hyprland binds to be put in the submap + ''; + example = lib.literalExpression '' + { + binde = [ + ", right, resizeactive, 10 0" + ", left, resizeactive, -10 0" + ", up, resizeactive, 0 -10" + ", down, resizeactive, 0 10" + ]; + + bind = [ + ", escape, submap, reset" + ]; + } + ''; + }; + }; + } ); example = lib.literalExpression '' { diff --git a/modules/services/window-managers/i3-sway/lib/functions.nix b/modules/services/window-managers/i3-sway/lib/functions.nix index 2b58cd863..b557aedd8 100644 --- a/modules/services/window-managers/i3-sway/lib/functions.nix +++ b/modules/services/window-managers/i3-sway/lib/functions.nix @@ -1,8 +1,8 @@ { cfg, - config, lib, moduleName, + ... }: let inherit (lib) concatStringsSep mapAttrsToList optionalString; diff --git a/modules/targets/darwin/default.nix b/modules/targets/darwin/default.nix index 6f551e04b..f13dd9e91 100644 --- a/modules/targets/darwin/default.nix +++ b/modules/targets/darwin/default.nix @@ -1,7 +1,5 @@ { - config, lib, - pkgs, ... }: diff --git a/tests/integration/standalone/alice-home-init.nix b/tests/integration/standalone/alice-home-init.nix index 54d628f62..95102b3c9 100644 --- a/tests/integration/standalone/alice-home-init.nix +++ b/tests/integration/standalone/alice-home-init.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { # Home Manager needs a bit of information about you and the paths it should # manage. diff --git a/tests/integration/standalone/dconf-home.nix b/tests/integration/standalone/dconf-home.nix index dd15a55f4..8581886b4 100644 --- a/tests/integration/standalone/dconf-home.nix +++ b/tests/integration/standalone/dconf-home.nix @@ -1,4 +1,3 @@ -{ pkgs, ... }: { home.username = "alice"; home.homeDirectory = "/home/alice"; diff --git a/tests/integration/standalone/home-with-symbols-init.nix b/tests/integration/standalone/home-with-symbols-init.nix index f5b6004ad..8ec01c668 100644 --- a/tests/integration/standalone/home-with-symbols-init.nix +++ b/tests/integration/standalone/home-with-symbols-init.nix @@ -1,5 +1,3 @@ -{ config, pkgs, ... }: - { # Home Manager needs a bit of information about you and the paths it should # manage. diff --git a/tests/modules/config/i18n/default.nix b/tests/modules/config/i18n/default.nix index 69cf5b413..b52ff6c22 100644 --- a/tests/modules/config/i18n/default.nix +++ b/tests/modules/config/i18n/default.nix @@ -16,7 +16,7 @@ }; i18n-custom-locales = - { config, pkgs, ... }: + { pkgs, ... }: { config = let diff --git a/tests/modules/misc/gtk/gtk-colorscheme.nix b/tests/modules/misc/gtk/gtk-colorscheme.nix index c35c604d8..aca8fa86f 100644 --- a/tests/modules/misc/gtk/gtk-colorscheme.nix +++ b/tests/modules/misc/gtk/gtk-colorscheme.nix @@ -1,4 +1,3 @@ -{ pkgs, ... }: { gtk = { enable = true; diff --git a/tests/modules/misc/xdg/user-dirs-null.nix b/tests/modules/misc/xdg/user-dirs-null.nix index 9fd878d5c..5d36582f5 100644 --- a/tests/modules/misc/xdg/user-dirs-null.nix +++ b/tests/modules/misc/xdg/user-dirs-null.nix @@ -1,5 +1,4 @@ { - config, pkgs, ... }: diff --git a/tests/modules/programs/algia/settings.nix b/tests/modules/programs/algia/settings.nix index 93068c173..1b0c20d5c 100644 --- a/tests/modules/programs/algia/settings.nix +++ b/tests/modules/programs/algia/settings.nix @@ -1,10 +1,3 @@ -{ - lib, - pkgs, - config, - ... -}: - { programs.algia = { enable = true; diff --git a/tests/modules/programs/cargo/cargo-home.nix b/tests/modules/programs/cargo/cargo-home.nix index c81285c9d..39cd0d89e 100644 --- a/tests/modules/programs/cargo/cargo-home.nix +++ b/tests/modules/programs/cargo/cargo-home.nix @@ -1,7 +1,5 @@ { config, - lib, - pkgs, ... }: diff --git a/tests/modules/programs/dbeaver/default.nix b/tests/modules/programs/dbeaver/default.nix index 596ef722b..fbd7bfa9d 100644 --- a/tests/modules/programs/dbeaver/default.nix +++ b/tests/modules/programs/dbeaver/default.nix @@ -1,5 +1,3 @@ -{ lib, pkgs, ... }: - { dbeaver-without-settings = ./without-settings.nix; dbeaver-with-settings = ./with-settings.nix; diff --git a/tests/modules/programs/dbeaver/with-data-sources.nix b/tests/modules/programs/dbeaver/with-data-sources.nix index 4fbd2c876..9c12ed3a5 100644 --- a/tests/modules/programs/dbeaver/with-data-sources.nix +++ b/tests/modules/programs/dbeaver/with-data-sources.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: let workspaceDir = diff --git a/tests/modules/programs/dbeaver/with-settings.nix b/tests/modules/programs/dbeaver/with-settings.nix index 3ef6b832f..cde7daa48 100644 --- a/tests/modules/programs/dbeaver/with-settings.nix +++ b/tests/modules/programs/dbeaver/with-settings.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: let workspaceDir = diff --git a/tests/modules/programs/dbeaver/without-settings.nix b/tests/modules/programs/dbeaver/without-settings.nix index 2eef80c06..4ef6a46ef 100644 --- a/tests/modules/programs/dbeaver/without-settings.nix +++ b/tests/modules/programs/dbeaver/without-settings.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: let workspaceDir = diff --git a/tests/modules/programs/fish/abbrs.nix b/tests/modules/programs/fish/abbrs.nix index eca4dd1d6..adb0cd753 100644 --- a/tests/modules/programs/fish/abbrs.nix +++ b/tests/modules/programs/fish/abbrs.nix @@ -1,4 +1,3 @@ -{ config, ... }: { config = { programs.fish = { diff --git a/tests/modules/programs/fish/format-scripts.nix b/tests/modules/programs/fish/format-scripts.nix index 310987fb5..cbb0a9d29 100644 --- a/tests/modules/programs/fish/format-scripts.nix +++ b/tests/modules/programs/fish/format-scripts.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: let diff --git a/tests/modules/programs/go/old-options.nix b/tests/modules/programs/go/old-options.nix index fd2199488..8170346e2 100644 --- a/tests/modules/programs/go/old-options.nix +++ b/tests/modules/programs/go/old-options.nix @@ -2,7 +2,6 @@ lib, options, pkgs, - config, ... }: diff --git a/tests/modules/programs/go/suboptions-unset.nix b/tests/modules/programs/go/suboptions-unset.nix index 3e6e81e18..b1dd6c5ea 100644 --- a/tests/modules/programs/go/suboptions-unset.nix +++ b/tests/modules/programs/go/suboptions-unset.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { programs.go = { diff --git a/tests/modules/programs/i3status-rust/with-custom.nix b/tests/modules/programs/i3status-rust/with-custom.nix index 4c80014b8..e76ec77a6 100644 --- a/tests/modules/programs/i3status-rust/with-custom.nix +++ b/tests/modules/programs/i3status-rust/with-custom.nix @@ -1,5 +1,4 @@ { - config, pkgs, ... }: diff --git a/tests/modules/programs/i3status-rust/with-default.nix b/tests/modules/programs/i3status-rust/with-default.nix index ba9f26c81..64146f11c 100644 --- a/tests/modules/programs/i3status-rust/with-default.nix +++ b/tests/modules/programs/i3status-rust/with-default.nix @@ -1,5 +1,4 @@ { - config, pkgs, ... }: diff --git a/tests/modules/programs/i3status-rust/with-extra-settings.nix b/tests/modules/programs/i3status-rust/with-extra-settings.nix index d098aae62..5ac2ea555 100644 --- a/tests/modules/programs/i3status-rust/with-extra-settings.nix +++ b/tests/modules/programs/i3status-rust/with-extra-settings.nix @@ -1,5 +1,4 @@ { - config, pkgs, ... }: diff --git a/tests/modules/programs/i3status-rust/with-multiple-bars.nix b/tests/modules/programs/i3status-rust/with-multiple-bars.nix index 9198c1bdd..a24ce5f37 100644 --- a/tests/modules/programs/i3status-rust/with-multiple-bars.nix +++ b/tests/modules/programs/i3status-rust/with-multiple-bars.nix @@ -1,5 +1,4 @@ { - config, pkgs, ... }: diff --git a/tests/modules/programs/i3status-rust/with-version-02xx.nix b/tests/modules/programs/i3status-rust/with-version-02xx.nix index 8ca1cb554..1c0ec46ab 100644 --- a/tests/modules/programs/i3status-rust/with-version-02xx.nix +++ b/tests/modules/programs/i3status-rust/with-version-02xx.nix @@ -1,5 +1,4 @@ { - config, pkgs, ... }: diff --git a/tests/modules/programs/kitty/auto-theme-files.nix b/tests/modules/programs/kitty/auto-theme-files.nix index e0bf65108..027dfdf79 100644 --- a/tests/modules/programs/kitty/auto-theme-files.nix +++ b/tests/modules/programs/kitty/auto-theme-files.nix @@ -1,4 +1,3 @@ -{ config, pkgs, ... }: { programs.kitty = { enable = true; diff --git a/tests/modules/programs/kitty/example-quickAccessTerminalConfig.nix b/tests/modules/programs/kitty/example-quickAccessTerminalConfig.nix index ef47b8aa8..3069a396c 100644 --- a/tests/modules/programs/kitty/example-quickAccessTerminalConfig.nix +++ b/tests/modules/programs/kitty/example-quickAccessTerminalConfig.nix @@ -1,4 +1,3 @@ -{ lib, pkgs, ... }: { config = { programs.kitty = { diff --git a/tests/modules/programs/mods/basic-configuration.nix b/tests/modules/programs/mods/basic-configuration.nix index 5ed807b78..c84ac030c 100644 --- a/tests/modules/programs/mods/basic-configuration.nix +++ b/tests/modules/programs/mods/basic-configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { programs.mods = { diff --git a/tests/modules/programs/password-store/old-default-partial-settings.nix b/tests/modules/programs/password-store/old-default-partial-settings.nix index cbea78d01..0ce0c1213 100644 --- a/tests/modules/programs/password-store/old-default-partial-settings.nix +++ b/tests/modules/programs/password-store/old-default-partial-settings.nix @@ -1,4 +1,3 @@ -{ config, ... }: { home.stateVersion = "25.05"; # <= 25.11 programs.password-store = { diff --git a/tests/modules/programs/retroarch/settings.nix b/tests/modules/programs/retroarch/settings.nix index 03d1c9815..2be7136d0 100644 --- a/tests/modules/programs/retroarch/settings.nix +++ b/tests/modules/programs/retroarch/settings.nix @@ -1,4 +1,3 @@ -{ pkgs, ... }: { imports = [ ./stubs.nix ]; diff --git a/tests/modules/programs/retroarch/stubs.nix b/tests/modules/programs/retroarch/stubs.nix index 0e4cb307f..f51f193d3 100644 --- a/tests/modules/programs/retroarch/stubs.nix +++ b/tests/modules/programs/retroarch/stubs.nix @@ -1,6 +1,5 @@ { config, - pkgs, realPkgs, ... }: diff --git a/tests/modules/programs/ssh/includes.nix b/tests/modules/programs/ssh/includes.nix index ff1f983d0..b6a20f7eb 100644 --- a/tests/modules/programs/ssh/includes.nix +++ b/tests/modules/programs/ssh/includes.nix @@ -1,8 +1,3 @@ -{ - config, - ... -}: - { config = { programs.ssh = { diff --git a/tests/modules/programs/tex-fmt/custom-settings.nix b/tests/modules/programs/tex-fmt/custom-settings.nix index e7e1d9802..b5647761f 100644 --- a/tests/modules/programs/tex-fmt/custom-settings.nix +++ b/tests/modules/programs/tex-fmt/custom-settings.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { programs.tex-fmt = { diff --git a/tests/modules/programs/tex-fmt/default-settings.nix b/tests/modules/programs/tex-fmt/default-settings.nix index 971e6da2f..a17cd403f 100644 --- a/tests/modules/programs/tex-fmt/default-settings.nix +++ b/tests/modules/programs/tex-fmt/default-settings.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { programs.tex-fmt = { diff --git a/tests/modules/programs/ty/no-settings.nix b/tests/modules/programs/ty/no-settings.nix index 23bc04bf3..be420d082 100644 --- a/tests/modules/programs/ty/no-settings.nix +++ b/tests/modules/programs/ty/no-settings.nix @@ -1,5 +1,3 @@ -{ pkgs, ... }: - { programs.ty = { enable = true; diff --git a/tests/modules/programs/vesktop/basic-configuration.nix b/tests/modules/programs/vesktop/basic-configuration.nix index 3a01cac4a..6737678ca 100644 --- a/tests/modules/programs/vesktop/basic-configuration.nix +++ b/tests/modules/programs/vesktop/basic-configuration.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { config = { programs.vesktop = { diff --git a/tests/modules/programs/vicinae/pre17-settings.nix b/tests/modules/programs/vicinae/pre17-settings.nix index 95140e23e..3668909df 100644 --- a/tests/modules/programs/vicinae/pre17-settings.nix +++ b/tests/modules/programs/vicinae/pre17-settings.nix @@ -1,6 +1,5 @@ { pkgs, - config, ... }: diff --git a/tests/modules/programs/vscode/null-package.nix b/tests/modules/programs/vscode/null-package.nix index d9ababe6e..c14ab380d 100644 --- a/tests/modules/programs/vscode/null-package.nix +++ b/tests/modules/programs/vscode/null-package.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: diff --git a/tests/modules/programs/w3m/example-config-xdg-enabled.nix b/tests/modules/programs/w3m/example-config-xdg-enabled.nix index cb9c94ec7..13ffa52c0 100644 --- a/tests/modules/programs/w3m/example-config-xdg-enabled.nix +++ b/tests/modules/programs/w3m/example-config-xdg-enabled.nix @@ -1,4 +1,3 @@ -{ config, ... }: { xdg.enable = true; home.preferXdgDirectories = true; diff --git a/tests/modules/programs/wezterm/settings-extra-config-direct.nix b/tests/modules/programs/wezterm/settings-extra-config-direct.nix index 3b206970d..3133add92 100644 --- a/tests/modules/programs/wezterm/settings-extra-config-direct.nix +++ b/tests/modules/programs/wezterm/settings-extra-config-direct.nix @@ -1,5 +1,3 @@ -{ lib, ... }: - { programs.wezterm = { enable = true; diff --git a/tests/modules/programs/wezterm/settings-with-extra-config.nix b/tests/modules/programs/wezterm/settings-with-extra-config.nix index d5bc36681..795256216 100644 --- a/tests/modules/programs/wezterm/settings-with-extra-config.nix +++ b/tests/modules/programs/wezterm/settings-with-extra-config.nix @@ -1,5 +1,3 @@ -{ lib, ... }: - { programs.wezterm = { enable = true; diff --git a/tests/modules/services/caffeine/basic-service.nix b/tests/modules/services/caffeine/basic-service.nix index 06ae0a4b0..4b7e55a3b 100644 --- a/tests/modules/services/caffeine/basic-service.nix +++ b/tests/modules/services/caffeine/basic-service.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { config = { services.caffeine = { diff --git a/tests/modules/services/colima/darwin/colima-custom-settings.nix b/tests/modules/services/colima/darwin/colima-custom-settings.nix index 3c908c0a1..16470e6a6 100644 --- a/tests/modules/services/colima/darwin/colima-custom-settings.nix +++ b/tests/modules/services/colima/darwin/colima-custom-settings.nix @@ -1,7 +1,5 @@ { config, - lib, - pkgs, ... }: diff --git a/tests/modules/services/colima/darwin/colima-default-config.nix b/tests/modules/services/colima/darwin/colima-default-config.nix index df445f7ea..6960b6112 100644 --- a/tests/modules/services/colima/darwin/colima-default-config.nix +++ b/tests/modules/services/colima/darwin/colima-default-config.nix @@ -1,7 +1,5 @@ { config, - lib, - pkgs, ... }: diff --git a/tests/modules/services/colima/darwin/colima-docker-cli.nix b/tests/modules/services/colima/darwin/colima-docker-cli.nix index 1a45abc7f..50c662f59 100644 --- a/tests/modules/services/colima/darwin/colima-docker-cli.nix +++ b/tests/modules/services/colima/darwin/colima-docker-cli.nix @@ -1,7 +1,5 @@ { config, - lib, - pkgs, ... }: diff --git a/tests/modules/services/colima/linux/colima-default-config.nix b/tests/modules/services/colima/linux/colima-default-config.nix index 940f997fb..dcca842f3 100644 --- a/tests/modules/services/colima/linux/colima-default-config.nix +++ b/tests/modules/services/colima/linux/colima-default-config.nix @@ -1,7 +1,5 @@ { config, - lib, - pkgs, ... }: diff --git a/tests/modules/services/colima/linux/colima-docker-cli.nix b/tests/modules/services/colima/linux/colima-docker-cli.nix index f88cca3c5..f374ea94d 100644 --- a/tests/modules/services/colima/linux/colima-docker-cli.nix +++ b/tests/modules/services/colima/linux/colima-docker-cli.nix @@ -1,7 +1,5 @@ { config, - lib, - pkgs, ... }: diff --git a/tests/modules/services/darkman/unified-scripts.nix b/tests/modules/services/darkman/unified-scripts.nix index c4bb4a1e6..d27280d46 100644 --- a/tests/modules/services/darkman/unified-scripts.nix +++ b/tests/modules/services/darkman/unified-scripts.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, ... }: { services.darkman = { diff --git a/tests/modules/services/fnott/example-settings.nix b/tests/modules/services/fnott/example-settings.nix index dca76ae05..982764080 100644 --- a/tests/modules/services/fnott/example-settings.nix +++ b/tests/modules/services/fnott/example-settings.nix @@ -1,6 +1,5 @@ { config, - lib, ... }: diff --git a/tests/modules/services/fnott/systemd-user-service.nix b/tests/modules/services/fnott/systemd-user-service.nix index a2117d827..e36c50583 100644 --- a/tests/modules/services/fnott/systemd-user-service.nix +++ b/tests/modules/services/fnott/systemd-user-service.nix @@ -1,6 +1,5 @@ { config, - lib, ... }: diff --git a/tests/modules/services/gnome-keyring/basic-service.nix b/tests/modules/services/gnome-keyring/basic-service.nix index 805ea1e92..12a9374fb 100644 --- a/tests/modules/services/gnome-keyring/basic-service.nix +++ b/tests/modules/services/gnome-keyring/basic-service.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { config = { services.gnome-keyring = { diff --git a/tests/modules/services/gnome-keyring/custom-components.nix b/tests/modules/services/gnome-keyring/custom-components.nix index 1fd202d57..fbf76c0bf 100644 --- a/tests/modules/services/gnome-keyring/custom-components.nix +++ b/tests/modules/services/gnome-keyring/custom-components.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { config = { services.gnome-keyring = { diff --git a/tests/modules/services/herbstluftwm/herbstluftwm-alias-disabled.nix b/tests/modules/services/herbstluftwm/herbstluftwm-alias-disabled.nix index 0e9f8f96a..1cde24d63 100644 --- a/tests/modules/services/herbstluftwm/herbstluftwm-alias-disabled.nix +++ b/tests/modules/services/herbstluftwm/herbstluftwm-alias-disabled.nix @@ -1,5 +1,3 @@ -{ lib, pkgs, ... }: - { xsession.windowManager.herbstluftwm = { enable = true; diff --git a/tests/modules/services/home-manager-auto-upgrade/basic-configuration.nix b/tests/modules/services/home-manager-auto-upgrade/basic-configuration.nix index 444c88624..2f12bd64e 100644 --- a/tests/modules/services/home-manager-auto-upgrade/basic-configuration.nix +++ b/tests/modules/services/home-manager-auto-upgrade/basic-configuration.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { config = { services.home-manager.autoUpgrade = { diff --git a/tests/modules/services/hyprland/submaps-config.nix b/tests/modules/services/hyprland/submaps-config.nix index af54671c4..dacf85ce1 100644 --- a/tests/modules/services/hyprland/submaps-config.nix +++ b/tests/modules/services/hyprland/submaps-config.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { wayland.windowManager.hyprland = { enable = true; diff --git a/tests/modules/services/hyprland/submaps-on-dispatch.nix b/tests/modules/services/hyprland/submaps-on-dispatch.nix index 7d9ac1d09..caf43eaa2 100644 --- a/tests/modules/services/hyprland/submaps-on-dispatch.nix +++ b/tests/modules/services/hyprland/submaps-on-dispatch.nix @@ -1,5 +1,3 @@ -{ config, ... }: - { wayland.windowManager.hyprland = { enable = true; diff --git a/tests/modules/services/playerctld/basic.nix b/tests/modules/services/playerctld/basic.nix index ea492531a..c8cba4a98 100644 --- a/tests/modules/services/playerctld/basic.nix +++ b/tests/modules/services/playerctld/basic.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { diff --git a/tests/modules/services/proton-pass-agent/basic-service.nix b/tests/modules/services/proton-pass-agent/basic-service.nix index 79b3f0707..624e6bca4 100644 --- a/tests/modules/services/proton-pass-agent/basic-service.nix +++ b/tests/modules/services/proton-pass-agent/basic-service.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { services.proton-pass-agent = { enable = true; diff --git a/tests/modules/services/proton-pass-agent/full-service.nix b/tests/modules/services/proton-pass-agent/full-service.nix index 0316555f1..f343b31d6 100644 --- a/tests/modules/services/proton-pass-agent/full-service.nix +++ b/tests/modules/services/proton-pass-agent/full-service.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { services.proton-pass-agent = { enable = true; diff --git a/tests/modules/systemd/packages.nix b/tests/modules/systemd/packages.nix index 41875b99e..71d8e15ec 100644 --- a/tests/modules/systemd/packages.nix +++ b/tests/modules/systemd/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ config, ... }: let package = config.lib.test.mkStubPackage { buildScript = '' diff --git a/tests/modules/targets-linux/generic-linux-gpu/setup-package-contents.nix b/tests/modules/targets-linux/generic-linux-gpu/setup-package-contents.nix index b2e28b87f..b2274cbc1 100644 --- a/tests/modules/targets-linux/generic-linux-gpu/setup-package-contents.nix +++ b/tests/modules/targets-linux/generic-linux-gpu/setup-package-contents.nix @@ -1,5 +1,3 @@ -{ config, lib, ... }: - { targets.genericLinux.gpu = { enable = true; diff --git a/treefmt.toml b/treefmt.toml index d9f697098..5da3fa173 100644 --- a/treefmt.toml +++ b/treefmt.toml @@ -11,7 +11,7 @@ includes = [ "*.nix" ] [formatter.deadnix] command = "deadnix" -options = [ "--edit", "--no-lambda-pattern-names" ] +options = [ "--edit" ] includes = [ "*.nix" ] [formatter.nixf-diagnose]