tests: remove with lib (#6511)

tests/asserts.nix

@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }:
+let inherit (lib) concatStringsSep mkOption types;
+in {
   options.test.asserts = {
     warnings = {
       enable = mkOption {
@@ -37,8 +35,8 @@ with lib;
     };
   };
 
-  config = mkMerge [
-    (mkIf config.test.asserts.warnings.enable {
+  config = lib.mkMerge [
+    (lib.mkIf config.test.asserts.warnings.enable {
       home.file = {
         "asserts/warnings.actual".text = concatStringsSep ''
 
@@ -57,12 +55,13 @@ with lib;
       '';
     })
 
-    (mkIf config.test.asserts.assertions.enable {
+    (lib.mkIf config.test.asserts.assertions.enable {
       home.file = {
         "asserts/assertions.actual".text = concatStringsSep ''
 
           --
-        '' (map (x: x.message) (filter (x: !x.assertion) config.assertions));
+        ''
+          (map (x: x.message) (lib.filter (x: !x.assertion) config.assertions));
         "asserts/assertions.expected".text = concatStringsSep ''
 
           --

tests/integration/standalone/kitty-theme-bad-home.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{
   home.username = "alice";
   home.homeDirectory = "/home/alice";
   home.stateVersion = "24.11";

tests/integration/standalone/kitty-theme-good-home.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{
   home.username = "alice";
   home.homeDirectory = "/home/alice";
 

tests/modules/accounts/email-test-accounts.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   accounts.email = {
     maildirBasePath = "Mail";

tests/modules/files/disabled.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."disabled" = {
     enable = false;

tests/modules/files/executable.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."executable" = {
     text = "";

tests/modules/files/hidden-source.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file.".hidden".source = ./.hidden;
 

tests/modules/files/source-with-spaces.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."source with spaces!".source = ./. + "/source with spaces!";
 

tests/modules/files/target-conflict.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file = {
     conflict1 = {

tests/modules/files/target-with-shellvar.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."$HOME/$FOO/bar baz".text = "blah";
 

tests/modules/files/text.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.file."using-text".text = ''
     This is the

tests/modules/launchd/agents.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     launchd.agents."test-service" = {

tests/modules/misc/editorconfig/editorconfig-simple-config.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   editorconfig = {
     enable = true;

tests/modules/misc/fontconfig/multiple-font-packages.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ pkgs, ... }: {
   config = {
     home.packages = [ pkgs.comic-relief pkgs.unifont ];
 

tests/modules/misc/nix/example-registry.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   nix = {
     registry = {

tests/modules/misc/pam/session-variables.nix

@@ -1,8 +1,4 @@
-{ config, lib, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     pam.sessionVariables = {
       V1 = "v1";

tests/modules/misc/specialisation/specialisation.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   home.file.testfile.text = "not special";
   specialisation.test.configuration = {

tests/modules/misc/xdg/default-locations.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     # Test fallback behavior for stateVersion >= 20.09, which is pure.
     xdg.enable = lib.mkForce false;

tests/modules/misc/xdg/desktop-entries.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ pkgs, ... }: {
   config = {
     xdg.desktopEntries = {
       full = { # full definition

tests/modules/misc/xdg/file-gen.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     xdg.configHome = /. + "${config.home.homeDirectory}/.dummy-config";
     xdg.dataHome = /. + "${config.home.homeDirectory}/.dummy-data";

tests/modules/misc/xdg/mime-apps-basics.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     xdg.mimeApps = {

tests/modules/misc/xdg/mime-disabled.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{
   config = {
     xdg.mime.enable = false;
     nmt.script = ''

tests/modules/misc/xsession/basic.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     xsession = {

tests/modules/misc/xsession/keyboard-without-layout.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     home.stateVersion = "19.09";

tests/modules/programs/abook/no-settings.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.abook.enable = true;

tests/modules/programs/abook/with-settings.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.abook = {

tests/modules/programs/aerc/assertion.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     test.asserts.assertions.expected = [''

tests/modules/programs/aerc/noSettings.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     nmt.script = let dir = "home-files/.config/aerc";

tests/modules/programs/aerc/settings.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, pkgs, ... }: {
   config = {
     nmt.script = let
       dir = if (pkgs.stdenv.isDarwin && !config.xdg.enable) then

tests/modules/programs/atuin/example-settings.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs.atuin = {
     enable = true;

tests/modules/programs/bash/bash-history-control-with-file.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.bash = {

tests/modules/programs/bottom/empty-settings.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.bottom = {
       enable = true;

tests/modules/programs/bottom/example-settings.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.bottom = {
       enable = true;

tests/modules/programs/boxxy/empty-settings.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.boxxy.enable = true;

tests/modules/programs/boxxy/example-settings.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.boxxy.enable = true;

tests/modules/programs/dircolors/settings.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.dircolors = {

tests/modules/programs/eww/basic-config.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{
   config = {
     programs.eww = {
       enable = true;

tests/modules/programs/eww/null-config.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{
   config = {
     programs.eww = { enable = true; };
 

tests/modules/programs/firefox/deprecated-native-messenger.nix

@@ -1,18 +1,13 @@
 modulePath:
 { config, lib, ... }:
-
-with lib;
-
 let
-
-  moduleName = concatStringsSep "." modulePath;
+  moduleName = lib.concatStringsSep "." modulePath;
 
   firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+  config = lib.mkIf config.test.enableBig (lib.setAttrByPath modulePath {
     enable = true;
     enableGnomeExtensions = true;
   } // {

tests/modules/programs/firefox/policies.nix

@@ -1,20 +1,15 @@
 modulePath:
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
-
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
 in {
   imports = [ firefoxMockOverlay ];
 
-  config = mkIf config.test.enableBig ({
+  config = lib.mkIf config.test.enableBig ({
     home.stateVersion = "23.05";
-  } // setAttrByPath modulePath {
+  } // lib.setAttrByPath modulePath {
     enable = true;
     policies = { BlockAboutConfig = true; };
     package = pkgs.${cfg.wrappedPackageName}.override {

tests/modules/programs/firefox/state-version-19_09.nix

@@ -1,20 +1,15 @@
 modulePath:
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ config, lib, ... }:
 let
-
-  cfg = getAttrFromPath modulePath config;
+  cfg = lib.getAttrFromPath modulePath config;
 
   firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
-
 in {
   imports = [ firefoxMockOverlay ];
 
   config = lib.mkIf config.test.enableBig ({
     home.stateVersion = "19.09";
-  } // setAttrByPath modulePath { enable = true; } // {
+  } // lib.setAttrByPath modulePath { enable = true; } // {
     nmt.script = ''
       assertFileRegex \
         home-path/bin/${cfg.wrappedPackageName} \

tests/modules/programs/fish/functions.nix

@@ -1,7 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ lib, pkgs, ... }:
 let
 
   func = pkgs.writeText "func.fish" ''

tests/modules/programs/fish/no-functions.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ lib, ... }: {
   config = {
     programs.fish = {
       enable = true;

tests/modules/programs/fish/plugins.nix

@@ -1,7 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ lib, pkgs, ... }:
 let
 
   fooPluginSrc = pkgs.writeText "fooPluginSrc" "";

tests/modules/programs/getmail/getmail.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   imports = [ ../../accounts/email-test-accounts.nix ];
 

tests/modules/programs/git-worktree-switcher/fish.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     fish.enable = true;

tests/modules/programs/git-worktree-switcher/zsh.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   programs = {
     zsh.enable = true;

tests/modules/programs/gnome-shell/gnome-shell.nix

@@ -1,7 +1,4 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
   dummy-gnome-shell-extensions = pkgs.runCommand "dummy-package" { } ''
     mkdir -p $out/share/gnome-shell/extensions/dummy-package
@@ -31,7 +28,7 @@ let
     "test-extension-uuid"
   ];
 
-  actualEnabledExtensions = catAttrs "value"
+  actualEnabledExtensions = lib.catAttrs "value"
     config.dconf.settings."org/gnome/shell".enabled-extensions.value;
 
 in {
@@ -62,8 +59,8 @@ in {
       message = "Expected disable-user-extensions to be false.";
     }
     {
-      assertion =
-        all (e: elem e actualEnabledExtensions) expectedEnabledExtensions;
+      assertion = lib.all (e: lib.elem e actualEnabledExtensions)
+        expectedEnabledExtensions;
       message = ''
         Expected enabled-extensions to contain all of:
           ${toString expectedEnabledExtensions}

tests/modules/programs/gpg/override-defaults.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.gpg = {
       enable = true;

tests/modules/programs/kitty/example-settings.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ lib, pkgs, ... }: {
   config = {
     programs.kitty = {
       enable = true;

tests/modules/programs/kitty/null-shellIntegration.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.kitty = {

tests/modules/programs/lieer/lieer.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
   config = {

tests/modules/programs/looking-glass-client/empty-settings.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.looking-glass-client = {
       enable = true;

tests/modules/programs/looking-glass-client/example-settings.nix

@@ -1,8 +1,4 @@
-{ config, lib, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.looking-glass-client = {
       enable = true;

tests/modules/programs/man/apropos.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.man = {

tests/modules/programs/man/no-manpath.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.man = { enable = true; };

tests/modules/programs/mujmap/mujmap-defaults.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
   config = {

tests/modules/programs/mujmap/mujmap-fqdn-and-session-url-specified.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   imports = [ ../../accounts/email-test-accounts.nix ];
 
   config = {

tests/modules/programs/readline/prefer-xdg-dirs.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   home.preferXdgDirectories = true;
 

tests/modules/programs/readline/using-all-options.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.readline = {

tests/modules/programs/ssh/default-config.nix

@@ -1,13 +1,9 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     programs.ssh = { enable = true; };
 
     home.file.assertions.text = builtins.toJSON
-      (map (a: a.message) (filter (a: !a.assertion) config.assertions));
+      (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
 
     nmt.script = ''
       assertFileExists home-files/.ssh/config

tests/modules/programs/ssh/forwards-dynamic-bind-path-with-port-asserts.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {

tests/modules/programs/ssh/forwards-dynamic-valid-bind-no-asserts.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     programs.ssh = {
       enable = true;
@@ -25,7 +21,7 @@ with lib;
     };
 
     home.file.result.text = builtins.toJSON
-      (map (a: a.message) (filter (a: !a.assertion) config.assertions));
+      (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
 
     nmt.script = ''
       assertFileExists home-files/.ssh/config

tests/modules/programs/ssh/forwards-local-bind-path-with-port-asserts.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {

tests/modules/programs/ssh/forwards-local-host-path-with-port-asserts.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {

tests/modules/programs/ssh/forwards-remote-bind-path-with-port-asserts.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {

tests/modules/programs/ssh/forwards-remote-host-path-with-port-asserts.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.ssh = {

tests/modules/programs/ssh/match-blocks-attrs.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     programs.ssh = {
       enable = true;
@@ -12,7 +8,7 @@ with lib;
           proxyJump = "jump-host";
         };
 
-        ordered = hm.dag.entryAfter [ "xyz" ] { port = 1; };
+        ordered = lib.hm.dag.entryAfter [ "xyz" ] { port = 1; };
 
         xyz = {
           identityFile = "file";
@@ -49,7 +45,7 @@ with lib;
     };
 
     home.file.assertions.text = builtins.toJSON
-      (map (a: a.message) (filter (a: !a.assertion) config.assertions));
+      (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
 
     nmt.script = ''
       assertFileExists home-files/.ssh/config

tests/modules/programs/ssh/match-blocks-match-and-hosts.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, lib, ... }: {
   config = {
     programs.ssh = {
       enable = true;
@@ -19,7 +15,7 @@ with lib;
     };
 
     home.file.assertions.text = builtins.toJSON
-      (map (a: a.message) (filter (a: !a.assertion) config.assertions));
+      (map (a: a.message) (lib.filter (a: !a.assertion) config.assertions));
 
     nmt.script = ''
       assertFileExists home-files/.ssh/config

tests/modules/programs/texlive/texlive-minimal.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ lib, pkgs, ... }: {
   config = {
     programs.texlive.enable = true;
 
@@ -14,7 +10,7 @@ with lib;
           combine = tpkgs:
             pkgs.symlinkJoin {
               name = "dummy-texlive-combine";
-              paths = attrValues tpkgs;
+              paths = lib.attrValues tpkgs;
             };
         };
       })

tests/modules/programs/tmux/default-shell.nix

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

tests/modules/programs/tmux/disable-confirmation-prompt.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {

tests/modules/programs/tmux/emacs-with-plugins.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ pkgs, ... }: {
   config = {
     programs.tmux = {
       aggressiveResize = true;

tests/modules/programs/tmux/mouse-enabled.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {

tests/modules/programs/tmux/not-enabled.nix

@@ -1,7 +1,3 @@
-{ config, lib, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = { enable = false; };

tests/modules/programs/tmux/prefix.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {

tests/modules/programs/tmux/secure-socket-enabled.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {

tests/modules/programs/tmux/shortcut-without-prefix.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {

tests/modules/programs/tmux/vi-all-true.nix

@@ -1,7 +1,3 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
 {
   config = {
     programs.tmux = {

tests/modules/programs/watson/empty-settings.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, pkgs, ... }: {
   programs.watson = {
     enable = true;
     package = config.lib.test.mkStubPackage { };

tests/modules/programs/watson/example-settings.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, pkgs, ... }: {
   programs.watson = {
     enable = true;
     package = config.lib.test.mkStubPackage { };

tests/modules/programs/wlogout/layout-multiple.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     home.stateVersion = "22.11";
 

tests/modules/programs/wlogout/layout-single.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     home.stateVersion = "22.11";
 

tests/modules/programs/wlogout/styling.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     home.stateVersion = "22.11";
 

tests/modules/programs/xmobar/basic-configuration.nix

@@ -1,8 +1,4 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
+{ config, ... }: {
   config = {
     programs.xmobar = {
       enable = true;

tests/modules/services/activitywatch/empty-server-settings.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.activitywatch.enable = true;
 

tests/modules/services/fluidsynth/service.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   services.fluidsynth.enable = true;
   services.fluidsynth.soundService = "pipewire-pulse";

tests/modules/services/window-managers/i3/i3-bar-focused-colors.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 

tests/modules/services/window-managers/i3/i3-followmouse.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   xsession.windowManager.i3 = {
     enable = true;

tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 

tests/modules/services/window-managers/i3/i3-fonts.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 

tests/modules/services/window-managers/i3/i3-null-config.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 

tests/modules/services/window-managers/i3/i3-workspace-default.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [ ./i3-stubs.nix ];
 

tests/modules/services/window-managers/i3/i3-workspace-output.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 let
   i3 = {
     ws1 = "1";

tests/modules/systemd/timers.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   systemd.user.timers.test-timer = {
     Unit = { Description = "A basic test timer"; };

tests/modules/targets-darwin/darwin.nix

@@ -1,14 +1,9 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ pkgs, ... }:
 let
-
   darwinTestApp = pkgs.runCommandLocal "target-darwin-example-app" { } ''
     mkdir -p $out/Applications
     touch $out/Applications/example-app
   '';
-
 in {
   config = {
     home.packages = [ darwinTestApp ];

tests/modules/targets-linux/generic-linux.nix

@@ -1,9 +1,6 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
+{ lib, pkgs, ... }:
 let
-  expectedXdgDataDirs = concatStringsSep ":" [
+  expectedXdgDataDirs = lib.concatStringsSep ":" [
     "\${NIX_STATE_DIR:-/nix/var/nix}/profiles/default/share"
     "/home/hm-user/.nix-profile/share"
     "/usr/share/ubuntu"
@@ -12,7 +9,6 @@ let
     "/var/lib/snapd/desktop"
     "/foo"
   ];
-
 in {
   config = {
     targets.genericLinux.enable = true;

tests/modules/xresources/empty.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   xresources.properties = { };
 

tests/modules/xresources/xresources.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   xresources = {
     properties = {

tests/stubs.nix

@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
+  inherit (lib) mkOption types;
 
   stubType = types.submodule ({ name, ... }: {
     options = {
@@ -15,13 +13,13 @@ let
       outPath = mkOption {
         type = types.nullOr types.str;
         default = "@${name}@";
-        defaultText = literalExpression ''"@''${name}@"'';
+        defaultText = lib.literalExpression ''"@''${name}@"'';
       };
 
       version = mkOption {
         type = types.nullOr types.str;
         default = null;
-        defaultText = literalExpression "pkgs.\${name}.version or null";
+        defaultText = lib.literalExpression "pkgs.\${name}.version or null";
       };
 
       buildScript = mkOption {
@@ -52,7 +50,7 @@ let
           meta.mainProgram = name;
         } buildScript;
 
-      stubbedPkg = pkg // optionalAttrs (outPath != null) {
+      stubbedPkg = pkg // lib.optionalAttrs (outPath != null) {
         inherit outPath;
 
         # Prevent getOutput from descending into outputs
@@ -63,7 +61,8 @@ let
           buildHost = pkg;
           hostTarget = pkg;
         };
-      } // optionalAttrs (version != null) { inherit version; } // extraAttrs;
+      } // lib.optionalAttrs (version != null) { inherit version; }
+        // extraAttrs;
     in stubbedPkg;
 
 in {
@@ -90,11 +89,12 @@ in {
   config = {
     lib.test.mkStubPackage = mkStubPackage;
 
-    test.stubOverlays = [ ] ++ optional (config.test.stubs != { }) (self: super:
-      mapAttrs (n: v:
-        builtins.traceVerbose "${n} - stubbed" (mkStubPackage (v
-          // optionalAttrs (v.version == null) {
-            version = super.${n}.version or null;
-          }))) config.test.stubs) ++ config.test.unstubs;
+    test.stubOverlays = [ ] ++ lib.optional (config.test.stubs != { })
+      (self: super:
+        lib.mapAttrs (n: v:
+          builtins.traceVerbose "${n} - stubbed" (mkStubPackage (v
+            // lib.optionalAttrs (v.version == null) {
+              version = super.${n}.version or null;
+            }))) config.test.stubs) ++ config.test.unstubs;
   };
 }