tests: some minor cleanups

tests/modules/programs/beets/mpdstats-external.nix

@@ -1,7 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 {
-  config = {
   home.stateVersion = "23.05";
 
   programs.beets = {
@@ -25,5 +24,4 @@
       home-files/.config/systemd/user/beets-mpdstats.service \
       ${./mpdstats-external-expected.service}
   '';
-  };
 }

tests/modules/programs/beets/mpdstats.nix

@@ -1,7 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 {
-  config = {
   home.stateVersion = "23.05";
 
   services.mpd = {
@@ -27,5 +26,4 @@
       home-files/.config/systemd/user/beets-mpdstats.service \
       ${./mpdstats-expected.service}
   '';
-  };
 }

tests/modules/programs/beets/mpdupdate.nix

@@ -1,7 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:
 
 {
-  config = {
   home.stateVersion = "23.05";
 
   programs.beets = {
@@ -16,5 +15,4 @@
       home-files/.config/beets/config.yaml \
       ${./mpdupdate-expected.yaml}
   '';
-  };
 }

tests/modules/programs/nnn/nnn.nix

@@ -1,7 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
-  config = {
   programs.nnn = {
     enable = true;
     bookmarks = {
@@ -51,5 +50,4 @@
       done
     '';
   };
-  };
 }

tests/modules/programs/qutebrowser/keybindings.nix

@@ -1,9 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
-
-with lib;
 
 {
-  config = {
   programs.qutebrowser = {
     enable = true;
 
@@ -13,7 +10,7 @@ with lib;
       normal = {
         "<Ctrl-v>" = "spawn mpv {url}";
         ",l" = ''config-cycle spellcheck.languages ["en-GB"] ["en-US"]'';
-          "<F1>" = mkMerge [
+        "<F1>" = lib.mkMerge [
           "config-cycle tabs.show never always"
           "config-cycle statusbar.show in-mode always"
           "config-cycle scrolling.bar never always"
@@ -43,5 +40,4 @@ with lib;
           config.bind("<Ctrl-y>", "prompt-yes", mode="prompt")''
       }
   '';
-  };
 }

tests/modules/programs/qutebrowser/quickmarks.nix

@@ -1,9 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
-
-with lib;
 
 {
-  config = {
   programs.qutebrowser = {
     enable = true;
 
@@ -29,5 +26,4 @@ with lib;
           nixpkgs https://github.com/NixOS/nixpkgs''
       }
   '';
-  };
 }

tests/modules/programs/qutebrowser/settings.nix

@@ -1,9 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
-
-with lib;
 
 {
-  config = {
   programs.qutebrowser = {
     enable = true;
 
@@ -46,5 +43,4 @@ with lib;
         ''
       }
   '';
-  };
 }

tests/modules/programs/terminator/config-file.nix

@@ -1,5 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ pkgs, ... }:
-  config = {
+
+{
   programs.terminator = {
     enable = true;
     config = {
@@ -20,5 +21,4 @@
         background_color = "#002b36"''
     }
   '';
-  };
 }

tests/modules/programs/topgrade/settings.nix

@@ -1,13 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
-
-with lib;
 
 {
-  config = {
   programs.topgrade = {
     enable = true;
 
-      settings = mkMerge [
+    settings = lib.mkMerge [
       {
         disable = [ "sdkman" "flutter" "node" "nix" "home_manager" ];
 
@@ -32,5 +29,4 @@ with lib;
       home-files/.config/topgrade.toml \
       ${./settings-expected.toml}
   '';
-  };
 }

tests/modules/programs/vscode/keybindings.nix

@@ -1,7 +1,5 @@
 # Test that keybindings.json is created correctly.
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
-
-with lib;
 
 let
   bindings = [
@@ -65,7 +63,6 @@ let
   '';
 
 in {
-  config = {
   programs.vscode = {
     enable = true;
     keybindings = bindings;
@@ -78,5 +75,4 @@ in {
 
     assertPathNotExists "home-files/${settingsPath}"
   '';
-  };
 }

tests/modules/programs/vscode/tasks.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 let
 

tests/modules/programs/zplug/modules.nix

@@ -1,9 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
-
-with lib;
 
 {
-  config = {
   programs.zsh = {
     enable = true;
     zplug = {
@@ -48,5 +45,4 @@ with lib;
     assertFileContains home-files/.zshrc \
       'export ZPLUG_HOME=${config.programs.zsh.zplug.zplugHome}'
   '';
-  };
 }