treewide: remove no-ops (#8061)

lib/default.nix

@@ -17,23 +17,21 @@
         lib
         pkgs
         ;
-      configuration =
+      configuration = {
-        { ... }:
+        imports = modules ++ [
-        {
+          {
-          imports = modules ++ [
+            programs.home-manager.path = builtins.path {
-            {
+              path = ../.;
-              programs.home-manager.path = builtins.path {
+              name = "source";
-                path = ../.;
+            };
-                name = "source";
+          }
-              };
+        ];
-            }
-          ];
 
-          nixpkgs = {
+        nixpkgs = {
-            config = lib.mkDefault pkgs.config;
+          config = lib.mkDefault pkgs.config;
 
-            inherit (pkgs) overlays;
+          inherit (pkgs) overlays;
-          };
         };
+      };
     };
 }

modules/programs/nnn.nix

@@ -13,43 +13,40 @@ let
 
   renderSettings = settings: lib.concatStringsSep ";" (lib.mapAttrsToList renderSetting settings);
 
-  pluginModule = types.submodule (
+  pluginModule = types.submodule ({
-    { ... }:
+    options = {
-    {
+      src = mkOption {
-      options = {
+        type = with types; nullOr path;
-        src = mkOption {
+        example = literalExpression ''
-          type = with types; nullOr path;
+          (pkgs.fetchFromGitHub {
-          example = literalExpression ''
+            owner = "jarun";
-            (pkgs.fetchFromGitHub {
+            repo = "nnn";
-              owner = "jarun";
+            rev = "v4.0";
-              repo = "nnn";
+            sha256 = "sha256-Hpc8YaJeAzJoEi7aJ6DntH2VLkoR6ToP6tPYn3llR7k=";
-              rev = "v4.0";
+          }) + "/plugins";
-              sha256 = "sha256-Hpc8YaJeAzJoEi7aJ6DntH2VLkoR6ToP6tPYn3llR7k=";
+        '';
-            }) + "/plugins";
+        default = null;
-          '';
+        description = ''
-          default = null;
+          Path to the plugin folder.
-          description = ''
+        '';
-            Path to the plugin folder.
-          '';
-        };
-
-        mappings = mkOption {
-          type = with types; attrsOf str;
-          description = ''
-            Key mappings to the plugins.
-          '';
-          default = { };
-          example = literalExpression ''
-            {
-              c = "fzcd";
-              f = "finder";
-              v = "imgview";
-            };
-          '';
-        };
       };
-    }
+
-  );
+      mappings = mkOption {
+        type = with types; attrsOf str;
+        description = ''
+          Key mappings to the plugins.
+        '';
+        default = { };
+        example = literalExpression ''
+          {
+            c = "fzcd";
+            f = "finder";
+            v = "imgview";
+          };
+        '';
+      };
+    };
+  });
 in
 {
   meta.maintainers = with lib.maintainers; [ thiagokokada ];

modules/services/swayidle.nix

@@ -21,49 +21,45 @@ in
   options.services.swayidle =
     let
 
-      timeoutModule =
+      timeoutModule = {
-        { ... }:
+        options = {
-        {
+          timeout = mkOption {
-          options = {
+            type = types.ints.positive;
-            timeout = mkOption {
+            example = 60;
-              type = types.ints.positive;
+            description = "Timeout in seconds.";
-              example = 60;
+          };
-              description = "Timeout in seconds.";
-            };
 
-            command = mkOption {
+          command = mkOption {
-              type = types.str;
+            type = types.str;
-              description = "Command to run after timeout seconds of inactivity.";
+            description = "Command to run after timeout seconds of inactivity.";
-            };
+          };
 
-            resumeCommand = mkOption {
+          resumeCommand = mkOption {
-              type = with types; nullOr str;
+            type = with types; nullOr str;
-              default = null;
+            default = null;
-              description = "Command to run when there is activity again.";
+            description = "Command to run when there is activity again.";
-            };
           };
         };
+      };
 
-      eventModule =
+      eventModule = {
-        { ... }:
+        options = {
-        {
+          event = mkOption {
-          options = {
+            type = types.enum [
-            event = mkOption {
+              "before-sleep"
-              type = types.enum [
+              "after-resume"
-                "before-sleep"
+              "lock"
-                "after-resume"
+              "unlock"
-                "lock"
+            ];
-                "unlock"
+            description = "Event name.";
-              ];
+          };
-              description = "Event name.";
-            };
 
-            command = mkOption {
+          command = mkOption {
-              type = types.str;
+            type = types.str;
-              description = "Command to run when event occurs.";
+            description = "Command to run when event occurs.";
-            };
           };
         };
+      };
 
     in
     {

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,30 +4,26 @@
   name = "nixos-basics";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
+    imports = [ ../../../nixos ]; # Import the HM NixOS module.
-    {
-      imports = [ ../../../nixos ]; # Import the HM NixOS module.
 
-      virtualisation.memorySize = 2048;
+    virtualisation.memorySize = 2048;
 
-      users.users.alice = {
+    users.users.alice = {
-        isNormalUser = true;
+      isNormalUser = true;
-        description = "Alice Foobar";
+      description = "Alice Foobar";
-        password = "foobar";
+      password = "foobar";
-        uid = 1000;
+      uid = 1000;
-      };
-
-      home-manager.users.alice =
-        { ... }:
-        {
-          home.stateVersion = "24.11";
-          home.file.test.text = "testfile";
-          # Enable a light-weight systemd service.
-          services.pueue.enable = true;
-        };
     };
 
+    home-manager.users.alice = {
+      home.stateVersion = "24.11";
+      home.file.test.text = "testfile";
+      # Enable a light-weight systemd service.
+      services.pueue.enable = true;
+    };
+  };
+
   testScript = ''
     def login_as_alice():
       machine.wait_until_tty_matches("1", "login: ")

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

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

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

@@ -4,52 +4,46 @@
   name = "nixos-legacy-profile-management";
   meta.maintainers = [ pkgs.lib.maintainers.rycee ];
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
+    imports = [
-    {
+      # Make the nixpkgs channel available.
-      imports = [
+      "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix"
-        # Make the nixpkgs channel available.
+      # Import the HM NixOS module.
-        "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix"
+      ../../../nixos
-        # Import the HM NixOS module.
+    ];
-        ../../../nixos
-      ];
 
-      system.stateVersion = "24.11";
+    system.stateVersion = "24.11";
 
-      users.users.alice = {
+    users.users.alice = {
-        isNormalUser = true;
+      isNormalUser = true;
-      };
+    };
 
-      specialisation = {
+    specialisation = {
-        legacy.configuration = {
+      legacy.configuration = {
-          home-manager = {
+        home-manager = {
-            # Force legacy profile management.
+          # Force legacy profile management.
-            enableLegacyProfileManagement = true;
+          enableLegacyProfileManagement = true;
 
-            users.alice =
+          users.alice = {
-              { ... }:
+            home.stateVersion = "24.11";
-              {
+            home.file.test.text = "testfile legacy";
-                home.stateVersion = "24.11";
-                home.file.test.text = "testfile legacy";
-              };
           };
         };
+      };
 
-        modern.configuration = {
+      modern.configuration = {
-          home-manager = {
+        home-manager = {
-            # Assert that we expect the option to default to false.
+          # Assert that we expect the option to default to false.
-            enableLegacyProfileManagement = pkgs.lib.mkOptionDefault false;
+          enableLegacyProfileManagement = pkgs.lib.mkOptionDefault false;
 
-            users.alice =
+          users.alice = {
-              { ... }:
+            home.stateVersion = "24.11";
-              {
+            home.file.test.text = "testfile modern";
-                home.stateVersion = "24.11";
-                home.file.test.text = "testfile modern";
-              };
           };
         };
       };
     };
+  };
 
   testScript =
     { nodes, ... }:

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,28 +4,26 @@
   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;
-      imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    nix = {
-      virtualisation.memorySize = 3072;
+      registry.home-manager.to = {
-      nix = {
+        type = "path";
-        registry.home-manager.to = {
+        path = ../../..;
-          type = "path";
-          path = ../../..;
-        };
-        settings.extra-experimental-features = [
-          "nix-command"
-          "flakes"
-        ];
-      };
-      users.users.alice = {
-        isNormalUser = true;
-        description = "Alice Foobar";
-        password = "foobar";
-        uid = 1000;
       };
+      settings.extra-experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
     };
+    users.users.alice = {
+      isNormalUser = true;
+      description = "Alice Foobar";
+      password = "foobar";
+      uid = 1000;
+    };
+  };
 
   testScript = ''
     start_all()

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

@@ -10,19 +10,17 @@ 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;
-      imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    users.users.alice = {
-      virtualisation.memorySize = 2048;
+      isNormalUser = true;
-      users.users.alice = {
+      description = "Alice Foobar";
-        isNormalUser = true;
+      password = "foobar";
-        description = "Alice Foobar";
+      uid = 1000;
-        password = "foobar";
+      home = nixHome;
-        uid = 1000;
-        home = nixHome;
-      };
     };
+  };
 
   testScript = ''
     import shlex

tests/integration/standalone/kitty.nix

@@ -3,18 +3,16 @@
   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;
-      imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    users.users.alice = {
-      virtualisation.memorySize = 2048;
+      isNormalUser = true;
-      users.users.alice = {
+      description = "Alice Foobar";
-        isNormalUser = true;
+      password = "foobar";
-        description = "Alice Foobar";
+      uid = 1000;
-        password = "foobar";
-        uid = 1000;
-      };
     };
+  };
 
   testScript = ''
     start_all()

tests/integration/standalone/mu/default.nix

@@ -2,18 +2,16 @@
 {
   name = "mu-store-init";
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
+    imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
-    {
+    virtualisation.memorySize = 2048;
-      imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    users.users.alice = {
-      virtualisation.memorySize = 2048;
+      isNormalUser = true;
-      users.users.alice = {
+      description = "Alice Foobar";
-        isNormalUser = true;
+      password = "foobar";
-        description = "Alice Foobar";
+      uid = 1000;
-        password = "foobar";
-        uid = 1000;
-      };
     };
+  };
 
   testScript = ''
     start_all()

tests/integration/standalone/nh.nix

@@ -9,30 +9,28 @@ 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;
-      imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    environment.systemPackages = [ pkgs.nh ];
-      virtualisation.memorySize = 2048;
+    nix = {
-      environment.systemPackages = [ pkgs.nh ];
+      registry.home-manager.to = {
-      nix = {
+        type = "path";
-        registry.home-manager.to = {
+        path = ../../..;
-          type = "path";
-          path = ../../..;
-        };
-        settings.extra-experimental-features = [
-          "nix-command"
-          "flakes"
-        ];
-      };
-      users.users.alice = {
-        isNormalUser = true;
-        description = "Alice Foobar";
-        password = "foobar";
-        uid = 1000;
-        inherit home;
       };
+      settings.extra-experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
     };
+    users.users.alice = {
+      isNormalUser = true;
+      description = "Alice Foobar";
+      password = "foobar";
+      uid = 1000;
+      inherit home;
+    };
+  };
 
   testScript = ''
     import shlex

tests/integration/standalone/restic.nix

@@ -24,21 +24,19 @@ in
 {
   name = "restic";
 
-  nodes.machine =
+  nodes.machine = {
-    { ... }:
+    imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
-    {
+    virtualisation.memorySize = 2048;
-      imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    users.users.alice = {
-      virtualisation.memorySize = 2048;
+      isNormalUser = true;
-      users.users.alice = {
+      description = "Alice Foobar";
-        isNormalUser = true;
+      password = "foobar";
-        description = "Alice Foobar";
+      uid = 1000;
-        password = "foobar";
-        uid = 1000;
-      };
-
-      security.polkit.enable = true;
     };
 
+    security.polkit.enable = true;
+  };
+
   testScript = ''
     start_all()
     machine.wait_for_unit("network.target")

tests/integration/standalone/specialisation.nix

@@ -4,18 +4,16 @@
   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;
-      imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    users.users.alice = {
-      virtualisation.memorySize = 2048;
+      isNormalUser = true;
-      users.users.alice = {
+      description = "Alice Foobar";
-        isNormalUser = true;
+      password = "foobar";
-        description = "Alice Foobar";
+      uid = 1000;
-        password = "foobar";
-        uid = 1000;
-      };
     };
+  };
 
   testScript = ''
     start_all()

tests/integration/standalone/standard-basics.nix

@@ -4,18 +4,16 @@
   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;
-      imports = [ "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ];
+    users.users.alice = {
-      virtualisation.memorySize = 2048;
+      isNormalUser = true;
-      users.users.alice = {
+      description = "Alice Foobar";
-        isNormalUser = true;
+      password = "foobar";
-        description = "Alice Foobar";
+      uid = 1000;
-        password = "foobar";
-        uid = 1000;
-      };
     };
+  };
 
   testScript = ''
     start_all()

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

@@ -36,35 +36,33 @@ in
       };
     };
 
-  home-cursor-legacy-disabled =
+  home-cursor-legacy-disabled = {
-    { ... }:
+    config = {
-    {
+      home.pointerCursor = null;
-      config = {
-        home.pointerCursor = null;
 
-        home.stateVersion = "24.11";
+      home.stateVersion = "24.11";
 
-        test.asserts.warnings.expected = [
+      test.asserts.warnings.expected = [
-          ''
+        ''
-            Setting home.pointerCursor to null is deprecated.
+          Setting home.pointerCursor to null is deprecated.
-            Please update your configuration to explicitly set:
+          Please update your configuration to explicitly set:
 
-              home.pointerCursor.enable = false;
+            home.pointerCursor.enable = false;
-          ''
+        ''
-        ];
+      ];
 
-        nmt.script = ''
+      nmt.script = ''
-          assertPathNotExists home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme
+        assertPathNotExists home-path/share/icons/catppuccin-macchiato-blue-cursors/index.theme
 
-          hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
+        hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
-          assertFileExists $hmEnvFile
+        assertFileExists $hmEnvFile
-          assertFileNotRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileNotRegex $hmEnvFile 'XCURSOR_THEME="catppuccin-macchiato-blue-standard"'
-          assertFileNotRegex $hmEnvFile 'XCURSOR_SIZE="32"'
+        assertFileNotRegex $hmEnvFile 'XCURSOR_SIZE="32"'
-          assertFileNotRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"'
+        assertFileNotRegex $hmEnvFile 'HYPRCURSOR_THEME="catppuccin-macchiato-blue-standard"'
-          assertFileNotRegex $hmEnvFile 'HYPRCURSOR_SIZE="32"'
+        assertFileNotRegex $hmEnvFile 'HYPRCURSOR_SIZE="32"'
-        '';
+      '';
-      };
     };
+  };
 
   home-cursor-legacy-disabled-with-enable =
     { config, ... }:

tests/modules/config/i18n/default.nix

@@ -1,21 +1,19 @@
 {
-  i18n =
+  i18n = {
-    { ... }:
+    config = {
-    {
+      nmt.script = ''
-      config = {
+        hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
-        nmt.script = ''
+        assertFileExists $hmEnvFile
-          hmEnvFile=home-path/etc/profile.d/hm-session-vars.sh
+        assertFileRegex $hmEnvFile \
-          assertFileExists $hmEnvFile
+          '^export LOCALE_ARCHIVE_._..=".*/lib/locale/locale-archive"$'
-          assertFileRegex $hmEnvFile \
-            '^export LOCALE_ARCHIVE_._..=".*/lib/locale/locale-archive"$'
 
-          envFile=home-files/.config/environment.d/10-home-manager.conf
+        envFile=home-files/.config/environment.d/10-home-manager.conf
-          assertFileExists $envFile
+        assertFileExists $envFile
-          assertFileRegex $envFile \
+        assertFileRegex $envFile \
-            '^LOCALE_ARCHIVE_._..=.*/lib/locale/locale-archive$'
+          '^LOCALE_ARCHIVE_._..=.*/lib/locale/locale-archive$'
-        '';
+      '';
-      };
     };
+  };
 
   i18n-custom-locales =
     { config, pkgs, ... }:

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

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

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

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

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

@@ -37,16 +37,14 @@ let
 
 in
 {
-  config = {
+  home.sessionVariables = {
-    home.sessionVariables = {
+    V1 = "v1";
-      V1 = "v1";
+    V2 = "v2-${config.home.sessionVariables.V1}";
-      V2 = "v2-${config.home.sessionVariables.V1}";
-    };
-
-    nmt.script = ''
-      assertFileExists home-path/etc/profile.d/hm-session-vars.sh
-      assertFileContent home-path/etc/profile.d/hm-session-vars.sh \
-        ${expected}
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-path/etc/profile.d/hm-session-vars.sh
+    assertFileContent home-path/etc/profile.d/hm-session-vars.sh \
+      ${expected}
+  '';
 }

tests/modules/misc/xdg/mime.nix

@@ -1,29 +1,26 @@
-{ ... }:
 {
-  config = {
+  xdg.mime.enable = true;
-    xdg.mime.enable = true;
+  xdg.desktopEntries = {
-    xdg.desktopEntries = {
+    mime-test = {
-      mime-test = {
+      # mime info test
-        # mime info test
+      name = "mime-test";
-        name = "mime-test";
+      mimeType = [
-        mimeType = [
+        "text/html"
-          "text/html"
+        "text/xml"
-          "text/xml"
+      ];
-        ];
-      };
-
     };
 
-    nmt.script = ''
-      assertFileExists home-path/share/applications/mimeinfo.cache # Check that update-desktop-database created file
-      # Check that update-desktop-database file matches expected
-      assertFileContent \
-        home-path/share/applications/mimeinfo.cache \
-        ${./mime-expected.cache}
-
-      assertDirectoryExists home-path/share/mime # Check that update-mime-database created directory
-      assertDirectoryNotEmpty home-path/share/mime # Check that update-mime-database created files
-
-    '';
   };
+
+  nmt.script = ''
+    assertFileExists home-path/share/applications/mimeinfo.cache # Check that update-desktop-database created file
+    # Check that update-desktop-database file matches expected
+    assertFileContent \
+      home-path/share/applications/mimeinfo.cache \
+      ${./mime-expected.cache}
+
+    assertDirectoryExists home-path/share/mime # Check that update-mime-database created directory
+    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: