Remove a few format exceptions

format

@@ -26,25 +26,15 @@ find . -name '*.nix' \
   ! -path ./modules/lib/file-type.nix \
   ! -path ./modules/manual.nix \
   ! -path ./modules/misc/news.nix \
-  ! -path ./modules/misc/nixpkgs.nix \
-  ! -path ./modules/misc/xdg.nix \
-  ! -path ./modules/modules.nix \
   ! -path ./modules/programs/bash.nix \
-  ! -path ./modules/programs/firefox.nix \
   ! -path ./modules/programs/gpg.nix \
   ! -path ./modules/programs/ssh.nix \
   ! -path ./modules/programs/tmux.nix \
   ! -path ./modules/programs/zsh.nix \
   ! -path ./modules/services/gpg-agent.nix \
   ! -path ./modules/services/mpd.nix \
-  ! -path ./modules/services/sxhkd.nix \
-  ! -path ./modules/systemd.nix \
   ! -path ./nix-darwin/default.nix \
   ! -path ./tests/default.nix \
   ! -path ./tests/modules/home-environment/session-variables.nix \
   ! -path ./tests/modules/programs/gpg/override-defaults.nix \
-  ! -path ./tests/modules/programs/zsh/session-variables.nix \
-  ! -path ./tests/modules/services/sxhkd/service.nix \
-  ! -path ./tests/modules/systemd/services.nix \
-  ! -path ./tests/modules/systemd/session-variables.nix \
   -exec nixfmt $CHECK_ARG {} +

modules/misc/nixpkgs.nix

@@ -6,38 +6,29 @@ with lib;
 
 let
 
-  isConfig = x:
+  isConfig = x: builtins.isAttrs x || builtins.isFunction x;
-    builtins.isAttrs x || builtins.isFunction x;
 
-  optCall = f: x:
+  optCall = f: x: if builtins.isFunction f then f x else f;
-    if builtins.isFunction f
-    then f x
-    else f;
 
   mergeConfig = lhs_: rhs_:
     let
       lhs = optCall lhs_ { inherit pkgs; };
       rhs = optCall rhs_ { inherit pkgs; };
-    in
+    in lhs // rhs // optionalAttrs (lhs ? packageOverrides) {
-    lhs // rhs //
-    optionalAttrs (lhs ? packageOverrides) {
       packageOverrides = pkgs:
-        optCall lhs.packageOverrides pkgs //
+        optCall lhs.packageOverrides pkgs
-        optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+        // optCall (attrByPath [ "packageOverrides" ] ({ }) rhs) pkgs;
-    } //
+    } // optionalAttrs (lhs ? perlPackageOverrides) {
-    optionalAttrs (lhs ? perlPackageOverrides) {
       perlPackageOverrides = pkgs:
-        optCall lhs.perlPackageOverrides pkgs //
+        optCall lhs.perlPackageOverrides pkgs
-        optCall (attrByPath ["perlPackageOverrides"] ({}) rhs) pkgs;
+        // optCall (attrByPath [ "perlPackageOverrides" ] ({ }) rhs) pkgs;
     };
 
   configType = mkOptionType {
     name = "nixpkgs-config";
     description = "nixpkgs config";
     check = x:
-      let traceXIfNot = c:
+      let traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false;
-            if c x then true
-            else lib.traceSeqN 1 x false;
       in traceXIfNot isConfig;
     merge = args: fold (def: mergeConfig def.value) { };
   };
@@ -49,13 +40,9 @@ let
     merge = lib.mergeOneOption;
   };
 
-  _pkgs = import pkgsPath (
+  _pkgs = import pkgsPath (filterAttrs (n: v: v != null) config.nixpkgs);
-    filterAttrs (n: v: v != null) config.nixpkgs
-  );
 
-in
+in {
-
-{
   options.nixpkgs = {
     config = mkOption {
       default = null;
@@ -91,8 +78,7 @@ in
 
     overlays = mkOption {
       default = null;
-      example = literalExample
+      example = literalExample ''
-        ''
         [ (self: super: {
             openssh = super.openssh.override {
               hpnSupport = true;
@@ -144,9 +130,10 @@ in
     _module.args = {
       pkgs = mkOverride modules.defaultPriority _pkgs;
       pkgs_i686 =
-        if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86
+        if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86 then
-        then _pkgs.pkgsi686Linux
+          _pkgs.pkgsi686Linux
-        else { };
+        else
+          { };
     };
   };
 }

modules/misc/xdg.nix

@@ -16,14 +16,10 @@ let
   defaultDataHome = "${config.home.homeDirectory}/.local/share";
 
   getXdgDir = name: fallback:
-    let
+    let value = builtins.getEnv name;
-      value = builtins.getEnv name;
+    in if value != "" then value else fallback;
-    in
-      if value != "" then value else fallback;
 
-in
+in {
-
-{
   options.xdg = {
     enable = mkEnableOption "management of XDG base directories";
 

modules/modules.nix

@@ -7,8 +7,7 @@
 , check ? true
 
   # If disabled, the pkgs attribute passed to this function is used instead.
-, useNixpkgsModule ? true
+, useNixpkgsModule ? true }:
-}:
 
 with lib;
 
@@ -237,8 +236,8 @@ let
   pkgsModule = { config, ... }: {
     config = {
       _module.args.baseModules = modules;
-      _module.args.pkgsPath = lib.mkDefault (
+      _module.args.pkgsPath = lib.mkDefault
-        if versionAtLeast config.home.stateVersion "20.09" then
+        (if versionAtLeast config.home.stateVersion "20.09" then
           pkgs.path
         else
           <nixpkgs>);
@@ -250,6 +249,4 @@ let
     };
   };
 
-in
+in modules ++ [ pkgsModule ]
-
-  modules ++ [ pkgsModule ]

modules/programs/firefox.nix

@@ -9,19 +9,15 @@ let
   cfg = config.programs.firefox;
 
   mozillaConfigPath =
-    if isDarwin
+    if isDarwin then "Library/Application Support/Mozilla" else ".mozilla";
-    then "Library/Application Support/Mozilla"
-    else ".mozilla";
 
-  firefoxConfigPath =
+  firefoxConfigPath = if isDarwin then
-    if isDarwin
+    "Library/Application Support/Firefox"
-    then "Library/Application Support/Firefox"
+  else
-    else "${mozillaConfigPath}/firefox";
+    "${mozillaConfigPath}/firefox";
 
   profilesPath =
-    if isDarwin
+    if isDarwin then "${firefoxConfigPath}/Profiles" else firefoxConfigPath;
-    then "${firefoxConfigPath}/Profiles"
-    else firefoxConfigPath;
 
   # The extensions path shared by all profiles; will not be supported
   # by future Firefox versions.
@@ -32,21 +28,14 @@ let
     paths = cfg.extensions;
   };
 
-  profiles =
+  profiles = flip mapAttrs' cfg.profiles (_: profile:
-    flip mapAttrs' cfg.profiles (_: profile:
     nameValuePair "Profile${toString profile.id}" {
       Name = profile.name;
-        Path =
+      Path = if isDarwin then "Profiles/${profile.path}" else profile.path;
-          if isDarwin
-          then "Profiles/${profile.path}"
-          else profile.path;
       IsRelative = 1;
       Default = if profile.isDefault then 1 else 0;
-      }
+    }) // {
-    ) // {
+      General = { StartWithLastProfile = 1; };
-      General = {
-        StartWithLastProfile = 1;
-      };
     };
 
   profilesIni = generators.toINI { } profiles;
@@ -61,9 +50,7 @@ let
     ${extraPrefs}
   '';
 
-in
+in {
-
-{
   meta.maintainers = [ maintainers.rycee ];
 
   imports = [
@@ -81,10 +68,10 @@ in
 
       package = mkOption {
         type = types.package;
-        default =
+        default = if versionAtLeast config.home.stateVersion "19.09" then
-          if versionAtLeast config.home.stateVersion "19.09"
+          pkgs.firefox
-          then pkgs.firefox
+        else
-          else pkgs.firefox-unwrapped;
+          pkgs.firefox-unwrapped;
         defaultText = literalExample "pkgs.firefox";
         example = literalExample ''
           pkgs.firefox.override {
@@ -243,36 +230,27 @@ in
 
   config = mkIf cfg.enable {
     assertions = [
-      (
+      (let
-        let
         defaults =
           catAttrs "name" (filter (a: a.isDefault) (attrValues cfg.profiles));
       in {
         assertion = cfg.profiles == { } || length defaults == 1;
-          message =
+        message = "Must have exactly one default Firefox profile but found "
-            "Must have exactly one default Firefox profile but found "
+          + toString (length defaults) + optionalString (length defaults > 1)
-            + toString (length defaults)
-            + optionalString (length defaults > 1)
           (", namely " + concatStringsSep ", " defaults);
-        }
+      })
-      )
 
-      (
+      (let
-        let
+        duplicates = filterAttrs (_: v: length v != 1) (zipAttrs
-          duplicates =
+          (mapAttrsToList (n: v: { "${toString v.id}" = n; }) (cfg.profiles)));
-            filterAttrs (_: v: length v != 1)
-            (zipAttrs
-            (mapAttrsToList (n: v: { "${toString v.id}" = n; })
-            (cfg.profiles)));
 
         mkMsg = n: v: "  - ID ${n} is used by ${concatStringsSep ", " v}";
       in {
         assertion = duplicates == { };
-          message =
+        message = ''
-            "Must not have Firefox profiles with duplicate IDs but\n"
+          Must not have Firefox profiles with duplicate IDs but
-            + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates);
+        '' + concatStringsSep "\n" (mapAttrsToList mkMsg duplicates);
-        }
+      })
-      )
     ];
 
     warnings = optional (cfg.enableGnomeExtensions or false) ''
@@ -282,65 +260,53 @@ in
       its example for how to do this.
     '';
 
-    home.packages =
+    home.packages = let
-      let
       # The configuration expected by the Firefox wrapper.
-        fcfg = {
+      fcfg = { enableGnomeExtensions = cfg.enableGnomeExtensions; };
-          enableGnomeExtensions = cfg.enableGnomeExtensions;
-        };
 
       # A bit of hackery to force a config into the wrapper.
-        browserName = cfg.package.browserName
+      browserName = cfg.package.browserName or (builtins.parseDrvName
-          or (builtins.parseDrvName cfg.package.name).name;
+        cfg.package.name).name;
 
       # The configuration expected by the Firefox wrapper builder.
       bcfg = setAttrByPath [ browserName ] fcfg;
 
-        package =
+      package = if isDarwin then
-          if isDarwin then
         cfg.package
       else if versionAtLeast config.home.stateVersion "19.09" then
         cfg.package.override (old: { cfg = old.cfg or { } // fcfg; })
       else
         (pkgs.wrapFirefox.override { config = bcfg; }) cfg.package { };
-      in
+    in [ package ];
-        [ package ];
 
-    home.file = mkMerge (
+    home.file = mkMerge ([{
-      [{
       "${mozillaConfigPath}/${extensionPath}" = mkIf (cfg.extensions != [ ]) {
         source = "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
         recursive = true;
       };
 
-        "${firefoxConfigPath}/profiles.ini" = mkIf (cfg.profiles != {}) {
+      "${firefoxConfigPath}/profiles.ini" =
-          text = profilesIni;
+        mkIf (cfg.profiles != { }) { text = profilesIni; };
-        };
+    }] ++ flip mapAttrsToList cfg.profiles (_: profile: {
-      }]
-      ++ flip mapAttrsToList cfg.profiles (_: profile: {
       "${profilesPath}/${profile.path}/.keep".text = "";
 
       "${profilesPath}/${profile.path}/chrome/userChrome.css" =
-          mkIf (profile.userChrome != "") {
+        mkIf (profile.userChrome != "") { text = profile.userChrome; };
-            text = profile.userChrome;
-          };
 
       "${profilesPath}/${profile.path}/chrome/userContent.css" =
-          mkIf (profile.userContent != "") {
+        mkIf (profile.userContent != "") { text = profile.userContent; };
-            text = profile.userContent;
-          };
 
       "${profilesPath}/${profile.path}/user.js" =
         mkIf (profile.settings != { } || profile.extraConfig != "") {
           text = mkUserJs profile.settings profile.extraConfig;
         };
 
-        "${profilesPath}/${profile.path}/extensions" = mkIf (cfg.extensions != []) {
+      "${profilesPath}/${profile.path}/extensions" =
+        mkIf (cfg.extensions != [ ]) {
           source = "${extensionsEnvPkg}/share/mozilla/${extensionPath}";
           recursive = true;
           force = true;
         };
-      })
+    }));
-    );
   };
 }

modules/services/sxhkd.nix

@@ -6,19 +6,13 @@ let
 
   cfg = config.services.sxhkd;
 
-  keybindingsStr = concatStringsSep "\n" (
+  keybindingsStr = concatStringsSep "\n" (mapAttrsToList (hotkey: command:
-    mapAttrsToList (hotkey: command:
     optionalString (command != null) ''
       ${hotkey}
         ${command}
-      ''
+    '') cfg.keybindings);
-    )
-    cfg.keybindings
-  );
 
-in
+in {
-
-{
   imports = [
     (mkRemovedOptionModule [ "services" "sxhkd" "extraPath" ]
       "This option is no longer needed and can be removed.")
@@ -31,13 +25,15 @@ in
       type = types.package;
       default = pkgs.sxhkd;
       defaultText = "pkgs.sxhkd";
-      description = "Package containing the <command>sxhkd</command> executable.";
+      description =
+        "Package containing the <command>sxhkd</command> executable.";
     };
 
     extraOptions = mkOption {
       type = types.listOf types.str;
       default = [ ];
-      description = "Command line arguments to invoke <command>sxhkd</command> with.";
+      description =
+        "Command line arguments to invoke <command>sxhkd</command> with.";
       example = literalExample ''[ "-m 1" ]'';
     };
 
@@ -72,13 +68,10 @@ in
 
     home.packages = [ cfg.package ];
 
-    xdg.configFile."sxhkd/sxhkdrc".text = concatStringsSep "\n" [
+    xdg.configFile."sxhkd/sxhkdrc".text =
-      keybindingsStr
+      concatStringsSep "\n" [ keybindingsStr cfg.extraConfig ];
-      cfg.extraConfig
-    ];
 
-    xsession.initExtra =
+    xsession.initExtra = let
-      let
       sxhkdCommand = "${cfg.package}/bin/sxhkd ${toString cfg.extraOptions}";
     in ''
       systemctl --user stop sxhkd.scope 2> /dev/null || true

modules/systemd.nix

@@ -7,27 +7,28 @@ let
   inherit (lib) getAttr hm isBool literalExample mkIf mkMerge mkOption types;
 
   # From <nixpkgs/nixos/modules/system/boot/systemd-lib.nix>
-  mkPathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""];
+  mkPathSafeName =
+    lib.replaceChars [ "@" ":" "\\" "[" "]" ] [ "-" "-" "-" "" "" ];
 
-  enabled = cfg.services != {}
+  enabled = cfg.services != { } # \
-      || cfg.slices != {}
+    || cfg.slices != { } # \
-      || cfg.sockets != {}
+    || cfg.sockets != { } # \
-      || cfg.targets != {}
+    || cfg.targets != { } # \
-      || cfg.timers != {}
+    || cfg.timers != { } # \
-      || cfg.paths != {}
+    || cfg.paths != { } # \
-      || cfg.mounts != {}
+    || cfg.mounts != { } # \
-      || cfg.automounts != {}
+    || cfg.automounts != { } # \
     || cfg.sessionVariables != { };
 
   toSystemdIni = lib.generators.toINI {
     listsAsDuplicateKeys = true;
     mkKeyValue = key: value:
       let
-        value' =
+        value' = if isBool value then
-          if isBool value then (if value then "true" else "false")
+          (if value then "true" else "false")
-          else toString value;
+        else
-      in
+          toString value;
-        "${key}=${value'}";
+      in "${key}=${value'}";
   };
 
   buildService = style: name: serviceCfg:
@@ -43,30 +44,24 @@ let
         destination = lib.escapeShellArg "/${filename}";
       } + "/${filename}";
 
-      wantedBy = target:
+      wantedBy = target: {
-        {
         name = "systemd/user/${target}.wants/${filename}";
         value = { inherit source; };
       };
-    in
+    in lib.singleton {
-      lib.singleton {
       name = "systemd/user/${filename}";
       value = { inherit source; };
-      }
+    } ++ map wantedBy (serviceCfg.Install.WantedBy or [ ]);
-      ++
-      map wantedBy (serviceCfg.Install.WantedBy or []);
 
   buildServices = style: serviceCfgs:
     lib.concatLists (lib.mapAttrsToList (buildService style) serviceCfgs);
 
   servicesStartTimeoutMs = builtins.toString cfg.servicesStartTimeoutMs;
 
-  unitType = unitKind: with types;
+  unitType = unitKind:
-    let
+    with types;
-      primitive = either bool (either int str);
+    let primitive = either bool (either int str);
-    in
+    in attrsOf (attrsOf (attrsOf (either primitive (listOf primitive)))) // {
-      attrsOf (attrsOf (attrsOf (either primitive (listOf primitive))))
-      // {
       description = "systemd ${unitKind} unit configuration";
     };
 
@@ -82,7 +77,8 @@ let
     </citerefentry>.
   '';
 
-  unitExample = type: literalExample ''
+  unitExample = type:
+    literalExample ''
       {
         ${lib.toLower type}-name = {
           Unit = {
@@ -98,15 +94,12 @@ let
     '';
 
   sessionVariables = mkIf (cfg.sessionVariables != { }) {
-    "environment.d/10-home-manager.conf".text =
+    "environment.d/10-home-manager.conf".text = lib.concatStringsSep "\n"
-      lib.concatStringsSep "\n" (
+      (lib.mapAttrsToList (n: v: "${n}=${toString v}") cfg.sessionVariables)
-        lib.mapAttrsToList (n: v: "${n}=${toString v}") cfg.sessionVariables
+      + "\n";
-      ) + "\n";
   };
 
-in
+in {
-
-{
   meta.maintainers = [ lib.maintainers.rycee ];
 
   options = {
@@ -180,10 +173,9 @@ in
 
       startServices = mkOption {
         default = "suggest";
-        type = with types; either bool (enum ["suggest" "legacy" "sd-switch"]);
+        type = with types;
-        apply = p:
+          either bool (enum [ "suggest" "legacy" "sd-switch" ]);
-          if isBool p then if p then "legacy" else "suggest"
+        apply = p: if isBool p then if p then "legacy" else "suggest" else p;
-          else p;
         description = ''
           Whether new or changed services that are wanted by active targets
           should be started. Additionally, stop obsolete services from the
@@ -248,44 +240,34 @@ in
 
   config = mkMerge [
     {
-      assertions = [
+      assertions = [{
-        {
         assertion = enabled -> pkgs.stdenv.isLinux;
-          message =
+        message = let
-            let
+          names = lib.concatStringsSep ", " (lib.attrNames ( # \
-              names = lib.concatStringsSep ", " (
+            cfg.services # \
-                  lib.attrNames (
+            // cfg.slices # \
-                      cfg.services // cfg.slices // cfg.sockets // cfg.targets
+            // cfg.sockets # \
-                      // cfg.timers // cfg.paths // cfg.mounts // cfg.sessionVariables
+            // cfg.targets # \
-                  )
+            // cfg.timers # \
-              );
+            // cfg.paths # \
-            in
+            // cfg.mounts # \
-              "Must use Linux for modules that require systemd: " + names;
+            // cfg.sessionVariables));
-        }
+        in "Must use Linux for modules that require systemd: " + names;
-      ];
+      }];
     }
 
     # If we run under a Linux system we assume that systemd is
     # available, in particular we assume that systemctl is in PATH.
     (mkIf pkgs.stdenv.isLinux {
       xdg.configFile = mkMerge [
-        (lib.listToAttrs (
+        (lib.listToAttrs ((buildServices "service" cfg.services)
-          (buildServices "service" cfg.services)
+          ++ (buildServices "slices" cfg.slices)
-          ++
+          ++ (buildServices "socket" cfg.sockets)
-          (buildServices "slices" cfg.slices)
+          ++ (buildServices "target" cfg.targets)
-          ++
+          ++ (buildServices "timer" cfg.timers)
-          (buildServices "socket" cfg.sockets)
+          ++ (buildServices "path" cfg.paths)
-          ++
+          ++ (buildServices "mount" cfg.mounts)
-          (buildServices "target" cfg.targets)
+          ++ (buildServices "automount" cfg.automounts)))
-          ++
-          (buildServices "timer" cfg.timers)
-          ++
-          (buildServices "path" cfg.paths)
-          ++
-          (buildServices "mount" cfg.mounts)
-          ++
-          (buildServices "automount" cfg.automounts)
-          ))
 
         sessionVariables
       ];
@@ -294,8 +276,8 @@ in
       # running this from the NixOS module then XDG_RUNTIME_DIR is not
       # set and systemd commands will fail. We'll therefore have to
       # set it ourselves in that case.
-      home.activation.reloadSystemd = hm.dag.entryAfter ["linkGeneration"] (
+      home.activation.reloadSystemd = hm.dag.entryAfter [ "linkGeneration" ]
-        let
+        (let
           cmd = {
             suggest = ''
               PATH=${dirOf cfg.systemctlPath}:$PATH \
@@ -306,10 +288,8 @@ in
               ${pkgs.ruby}/bin/ruby ${./systemd-activate.rb} \
                 "''${oldGenPath=}" "$newGenPath" "${servicesStartTimeoutMs}"
             '';
-            sd-switch =
+            sd-switch = let
-              let
+              timeoutArg = if cfg.servicesStartTimeoutMs != 0 then
-                timeoutArg =
-                  if cfg.servicesStartTimeoutMs != 0 then
                 "--timeout " + servicesStartTimeoutMs
               else
                 "";
@@ -321,11 +301,11 @@ in
             '';
           };
 
-          ensureRuntimeDir = "XDG_RUNTIME_DIR=\${XDG_RUNTIME_DIR:-/run/user/$(id -u)}";
+          ensureRuntimeDir =
+            "XDG_RUNTIME_DIR=\${XDG_RUNTIME_DIR:-/run/user/$(id -u)}";
 
           systemctl = "${ensureRuntimeDir} ${cfg.systemctlPath}";
-        in
+        in ''
-          ''
           systemdStatus=$(${systemctl} --user is-system-running 2>&1 || true)
 
           if [[ $systemdStatus == 'running' || $systemdStatus == 'degraded' ]]; then
@@ -342,8 +322,7 @@ in
           fi
 
           unset systemdStatus
-          ''
+        '');
-      );
     })
   ];
 }

tests/modules/programs/zsh/session-variables.nix

@@ -13,11 +13,8 @@ with lib;
       };
     };
 
-    nixpkgs.overlays = [
+    nixpkgs.overlays =
-      (self: super: {
+      [ (self: super: { zsh = pkgs.writeScriptBin "dummy-zsh" ""; }) ];
-        zsh = pkgs.writeScriptBin "dummy-zsh" "";
-      })
-    ];
 
     nmt.script = ''
       assertFileExists home-files/.zshrc

tests/modules/services/sxhkd/service.nix

@@ -9,7 +9,9 @@
 
     services.sxhkd = {
       enable = true;
-      package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out" // { outPath = "@sxhkd@"; };
+      package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out" // {
+        outPath = "@sxhkd@";
+      };
       extraOptions = [ "-m 1" ];
     };
 

tests/modules/systemd/services.nix

@@ -5,9 +5,7 @@ with lib;
 {
   config = {
     systemd.user.services."test-service@" = {
-      Unit = {
+      Unit = { Description = "A basic test service"; };
-        Description = "A basic test service";
-      };
 
       Service = {
         Environment = [ "VAR1=1" "VAR2=2" ];
@@ -19,7 +17,8 @@ with lib;
       serviceFile=home-files/.config/systemd/user/test-service@.service
       assertFileExists $serviceFile
       assertFileContent $serviceFile \
-        ${builtins.toFile "services-expected.conf" ''
+        ${
+          builtins.toFile "services-expected.conf" ''
             [Service]
             Environment=VAR1=1
             Environment=VAR2=2
@@ -27,7 +26,8 @@ with lib;
 
             [Unit]
             Description=A basic test service
-        ''}
+          ''
+        }
     '';
   };
 }

tests/modules/systemd/session-variables.nix

@@ -10,11 +10,13 @@
     nmt.script = ''
       envFile=home-files/.config/environment.d/10-home-manager.conf
       assertFileExists $envFile
-      assertFileContent $envFile ${pkgs.writeText "expected" ''
+      assertFileContent $envFile ${
+        pkgs.writeText "expected" ''
           LOCALE_ARCHIVE_2_27=${pkgs.glibcLocales}/lib/locale/locale-archive
           V_int=1
           V_str=2
-      ''}
+        ''
+      }
     '';
   };
 }