treewide: remove no-ops (#8061)

lib/default.nix

@@ -17,9 +17,7 @@
         lib
         pkgs
         ;
-      configuration =
+      configuration = {
-        { ... }:
-        {
         imports = modules ++ [
           {
             programs.home-manager.path = builtins.path {

modules/programs/nnn.nix

@@ -13,9 +13,7 @@ let
 
   renderSettings = settings: lib.concatStringsSep ";" (lib.mapAttrsToList renderSetting settings);
 
-  pluginModule = types.submodule (
+  pluginModule = types.submodule ({
-    { ... }:
-    {
     options = {
       src = mkOption {
         type = with types; nullOr path;
@@ -48,8 +46,7 @@ let
         '';
       };
     };
-    }
+  });
-  );
 in
 {
   meta.maintainers = with lib.maintainers; [ thiagokokada ];

modules/services/swayidle.nix

@@ -21,9 +21,7 @@ in
   options.services.swayidle =
     let
 
-      timeoutModule =
+      timeoutModule = {
-        { ... }:
-        {
         options = {
           timeout = mkOption {
             type = types.ints.positive;
@@ -44,9 +42,7 @@ in
         };
       };
 
-      eventModule =
+      eventModule = {
-        { ... }:
-        {
         options = {
           event = mkOption {
             type = types.enum [

tests/default.nix

@@ -42,7 +42,7 @@ let
       if lib.isDerivation value then scrubbedValue // newDrvAttrs else scrubbedValue
     else
       value;
-  scrubDerivations = attrs: lib.mapAttrs scrubDerivation attrs;
+  scrubDerivations = lib.mapAttrs scrubDerivation;
 
   # Globally unscrub a few selected packages that are used by a wide selection of tests.
   whitelist =
@@ -111,10 +111,7 @@ let
             pkgs =
               let
                 overlays =
-                  config.test.stubOverlays
+                  config.test.stubOverlays ++ lib.optionals (config.nixpkgs.overlays != null) config.nixpkgs.overlays;
-                  ++ lib.optionals (
-                    config.nixpkgs.overlays != null && config.nixpkgs.overlays != [ ]
-                  ) config.nixpkgs.overlays;
                 stubbedPkgs =
                   if overlays == [ ] then
                     scrubbedPkgs

tests/integration/nixos/basics.nix

@@ -4,9 +4,7 @@
   name = "nixos-basics";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ ../../../nixos ]; # Import the HM NixOS module.
 
     virtualisation.memorySize = 2048;
@@ -18,9 +16,7 @@
       uid = 1000;
     };
 
-      home-manager.users.alice =
+    home-manager.users.alice = {
-        { ... }:
-        {
       home.stateVersion = "24.11";
       home.file.test.text = "testfile";
       # Enable a light-weight systemd service.

tests/integration/nixos/legacy-profile-management-new-conf.nix

@@ -1,4 +1,3 @@
-{ ... }:
 {
   imports = [ ../../../nixos ]; # Import the HM NixOS module.
 
@@ -9,9 +8,7 @@
   };
 
   home-manager = {
-    users.alice =
+    users.alice = {
-      { ... }:
-      {
       home.stateVersion = "24.11";
       home.file.test.text = "testfile new profile";
     };

tests/integration/nixos/legacy-profile-management.nix

@@ -4,9 +4,7 @@
   name = "nixos-legacy-profile-management";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [
       # Make the nixpkgs channel available.
       "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix"
@@ -26,9 +24,7 @@
           # Force legacy profile management.
           enableLegacyProfileManagement = true;
 
-            users.alice =
+          users.alice = {
-              { ... }:
-              {
             home.stateVersion = "24.11";
             home.file.test.text = "testfile legacy";
           };
@@ -40,9 +36,7 @@
           # Assert that we expect the option to default to false.
           enableLegacyProfileManagement = pkgs.lib.mkOptionDefault false;
 
-            users.alice =
+          users.alice = {
-              { ... }:
-              {
             home.stateVersion = "24.11";
             home.file.test.text = "testfile modern";
           };

tests/integration/standalone/alice-home-specialisation.nix

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

tests/integration/standalone/flake-basics.nix

@@ -4,9 +4,7 @@
   name = "standalone-flake-basics";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
     virtualisation.memorySize = 3072;
     nix = {

tests/integration/standalone/home-with-symbols.nix

@@ -10,9 +10,7 @@ in
   name = "home-with-symbols";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
     virtualisation.memorySize = 2048;
     users.users.alice = {

tests/integration/standalone/kitty.nix

@@ -3,9 +3,7 @@
   name = "kitty-theme-path";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
     virtualisation.memorySize = 2048;
     users.users.alice = {

tests/integration/standalone/mu/default.nix

@@ -2,9 +2,7 @@
 {
   name = "mu-store-init";
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
     virtualisation.memorySize = 2048;
     users.users.alice = {

tests/integration/standalone/nh.nix

@@ -9,9 +9,7 @@ in
   name = "works-with-nh-stable";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
     virtualisation.memorySize = 2048;
     environment.systemPackages = [ pkgs.nh ];

tests/integration/standalone/restic.nix

@@ -24,9 +24,7 @@ in
 {
   name = "restic";
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
     virtualisation.memorySize = 2048;
     users.users.alice = {

tests/integration/standalone/specialisation.nix

@@ -4,9 +4,7 @@
   name = "standalone-specialisation";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
     virtualisation.memorySize = 2048;
     users.users.alice = {

tests/integration/standalone/standard-basics.nix

@@ -4,9 +4,7 @@
   name = "standalone-standard-basics";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
-    {
     imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
     virtualisation.memorySize = 2048;
     users.users.alice = {

tests/modules/config/home-cursor/default.nix

@@ -36,9 +36,7 @@ in
       };
     };
 
-  home-cursor-legacy-disabled =
+  home-cursor-legacy-disabled = {
-    { ... }:
-    {
     config = {
       home.pointerCursor = null;
 

tests/modules/config/i18n/default.nix

@@ -1,7 +1,5 @@
 {
-  i18n =
+  i18n = {
-    { ... }:
-    {
     config = {
       nmt.script = ''
         hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh

tests/modules/home-environment/session-path.nix

@@ -1,22 +1,8 @@
-{ ... }:
-
 {
-  imports = [
+  home.sessionPath = [
-    (
-      { ... }:
-      {
-        config.home.sessionPath = [ "foo" ];
-      }
-    )
-    (
-      { ... }:
-      {
-        config.home.sessionPath = [
     "bar"
     "baz"
-        ];
+    "foo"
-      }
-    )
   ];
 
   nmt.script = ''

tests/modules/home-environment/session-search-variables.nix

@@ -1,22 +1,8 @@
-{ ... }:
-
 {
-  imports = [
+  home.sessionSearchVariables.TEST = [
-    (
-      { ... }:
-      {
-        config.home.sessionSearchVariables.TEST = [ "foo" ];
-      }
-    )
-    (
-      { ... }:
-      {
-        config.home.sessionSearchVariables.TEST = [
     "bar"
     "baz"
-        ];
+    "foo"
-      }
-    )
   ];
 
   nmt.script = ''

tests/modules/home-environment/session-variables.nix

@@ -37,7 +37,6 @@ let
 
 in
 {
-  config = {
   home.sessionVariables = {
     V1 = "v1";
     V2 = "v2-${config.home.sessionVariables.V1}";
@@ -48,5 +47,4 @@ in
     assertFileContent home-path/etc/profile.d/hm-session-vars.sh \
       ${expected}
   '';
-  };
 }

tests/modules/misc/xdg/mime.nix

@@ -1,6 +1,4 @@
-{ ... }:
 {
-  config = {
   xdg.mime.enable = true;
   xdg.desktopEntries = {
     mime-test = {
@@ -25,5 +23,4 @@
     assertDirectoryNotEmpty home-path/share/mime # Check that update-mime-database created files
 
   '';
-  };
 }

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

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

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

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

tests/modules/programs/keepassxc/default-settings.nix

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

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

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

tests/modules/programs/kubeswitch/fish.nix

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

tests/modules/programs/lazydocker/custom-settings.nix

@@ -1,4 +1,3 @@
-{ ... }:
 {
   programs.lazydocker = {
     enable = true;

tests/modules/programs/lazydocker/default-settings.nix

@@ -1,4 +1,3 @@
-{ ... }:
 {
   programs.lazydocker.enable = true;
   test.stubs.lazydocker = { };

tests/modules/programs/swaylock/disabled.nix

@@ -1,4 +1,3 @@
-{ ... }:
 {
   programs.swaylock.settings = { };
 

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

@@ -1,4 +1,3 @@
-{ ... }:
 {
   programs.uv = {
     enable = true;

tests/modules/programs/zsh/history-ignore-pattern.nix

@@ -1,20 +1,11 @@
 {
-  imports = [
+  programs.zsh = {
-    (
+    enable = true;
-      { ... }:
+    history.ignorePatterns = [
-      {
+      "echo *"
-        config.programs.zsh.history.ignorePatterns = [ "echo *" ];
+      "rm *"
-      }
-    )
-    (
-      { ... }:
-      {
-        config.programs.zsh.history.ignorePatterns = [ "rm *" ];
-      }
-    )
     ];
-
+  };
-  programs.zsh.enable = true;
 
   nmt.script = ''
     assertFileContains home-files/.zshrc "HISTORY_IGNORE='(echo *|rm *)'"

tests/modules/services/clipse/clipse-sway-session-target.nix

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

tests/modules/services/easyeffects/example-preset.nix

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

tests/modules/services/easyeffects/service.nix

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

tests/modules/systemd/slices.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   systemd.user.slices.app-test = {
     Unit = {

tests/stubs.nix

@@ -108,8 +108,7 @@ in
     lib.test.mkStubPackage = mkStubPackage;
 
     test.stubOverlays =
-      [ ]
+      lib.optional (config.test.stubs != { }) (
-      ++ lib.optional (config.test.stubs != { }) (
         self: super:
         lib.mapAttrs (
           n: v: