treewide: remove formatting excludes

This removes the last three formatting excludes so that the entire
project is formatted by nixfmt. This is the first step towards moving
to the RFC style format.

format

@@ -23,23 +23,9 @@ for arg do
     esac
 done
 
-# The excludes are for files touched by open pull requests and we want
-# to avoid merge conflicts.
-excludes=(
-    modules/files.nix
-    modules/home-environment.nix
-    modules/programs/zsh.nix
-)
-
-exclude_args=()
-for e in "${excludes[@]}"; do
-    exclude_args+=(-e "$e")
-done
-
 git_root=$(git rev-parse --show-toplevel)
 
 git ls-files -z --cached --others --full-name -- "${files[@]}" |
     grep -z '\.nix$' |
-    grep -z -v "${exclude_args[@]}" |
     sed -z "s|^|$git_root/|" |
     xargs -0 nixfmt "${nixfmt_args[@]}"

modules/files.nix

@@ -8,22 +8,22 @@ let
 
   homeDirectory = config.home.homeDirectory;
 
-  fileType = (import lib/file-type.nix {
-    inherit homeDirectory lib pkgs;
-  }).fileType;
+  fileType =
+    (import lib/file-type.nix { inherit homeDirectory lib pkgs; }).fileType;
 
   sourceStorePath = file:
     let
       sourcePath = toString file.source;
       sourceName = config.lib.strings.storeFileName (baseNameOf sourcePath);
-    in
-      if builtins.hasContext sourcePath
-      then file.source
-      else builtins.path { path = file.source; name = sourceName; };
+    in if builtins.hasContext sourcePath then
+      file.source
+    else
+      builtins.path {
+        path = file.source;
+        name = sourceName;
+      };
 
-in
-
-{
+in {
   options = {
     home.file = mkOption {
       description = "Attribute set of files to link into the user home.";
@@ -39,11 +39,9 @@ in
   };
 
   config = {
-    assertions = [(
-      let
-        dups =
-          attrNames
-            (filterAttrs (n: v: v > 1)
+    assertions = [
+      (let
+        dups = attrNames (filterAttrs (n: v: v > 1)
           (foldAttrs (acc: v: acc + v) 0
             (mapAttrsToList (n: v: { ${v.target} = 1; }) cfg)));
         dupsStr = concatStringsSep ", " dups;
@@ -65,19 +63,17 @@ in
       let
         pathStr = toString path;
         name = hm.strings.storeFileName (baseNameOf pathStr);
-      in
-        pkgs.runCommandLocal name {} ''ln -s ${escapeShellArg pathStr} $out'';
+      in pkgs.runCommandLocal name { } "ln -s ${escapeShellArg pathStr} $out";
 
     # This verifies that the links we are about to create will not
     # overwrite an existing file.
-    home.activation.checkLinkTargets = hm.dag.entryBefore ["writeBoundary"] (
-      let
+    home.activation.checkLinkTargets = hm.dag.entryBefore [ "writeBoundary" ]
+      (let
         # Paths that should be forcibly overwritten by Home Manager.
         # Caveat emptor!
         forcedPaths =
           concatMapStringsSep " " (p: ''"$HOME"/${escapeShellArg p}'')
-            (mapAttrsToList (n: v: v.target)
-            (filterAttrs (n: v: v.force) cfg));
+          (mapAttrsToList (n: v: v.target) (filterAttrs (n: v: v.force) cfg));
 
         storeDir = escapeShellArg builtins.storeDir;
 
@@ -87,8 +83,7 @@ in
           inherit (config.lib.bash) initHomeManagerLib;
           inherit forcedPaths storeDir;
         };
-      in
-      ''
+      in ''
         function checkNewGenCollision() {
           local newGenFiles
           newGenFiles="$(readlink -e "$newGenPath/home-files")"
@@ -97,8 +92,7 @@ in
         }
 
         checkNewGenCollision || exit 1
-      ''
-    );
+      '');
 
     # This activation script will
     #
@@ -121,8 +115,7 @@ in
     # and a failure during the intermediate state FA ∩ FB will not
     # result in lost links because this set of links are in both the
     # source and target generation.
-    home.activation.linkGeneration = hm.dag.entryAfter ["writeBoundary"] (
-      let
+    home.activation.linkGeneration = hm.dag.entryAfter [ "writeBoundary" ] (let
       link = pkgs.writeShellScript "link" ''
         ${config.lib.bash.initHomeManagerLib}
 
@@ -154,7 +147,9 @@ in
 
         # A symbolic link whose target path matches this pattern will be
         # considered part of a Home Manager generation.
-          homeFilePattern="$(readlink -e ${escapeShellArg builtins.storeDir})/*-home-manager-files/*"
+        homeFilePattern="$(readlink -e ${
+          escapeShellArg builtins.storeDir
+        })/*-home-manager-files/*"
 
         newGenFiles="$1"
         shift 1
@@ -185,8 +180,7 @@ in
           fi
         done
       '';
-      in
-        ''
+    in ''
       function linkNewGen() {
         _i "Creating home file links in %s" "$HOME"
 
@@ -238,12 +232,10 @@ in
       fi
 
       linkNewGen
-        ''
-    );
+    '');
 
-    home.activation.checkFilesChanged = hm.dag.entryBefore ["linkGeneration"] (
-      let
-        homeDirArg = escapeShellArg homeDirectory;
+    home.activation.checkFilesChanged = hm.dag.entryBefore [ "linkGeneration" ]
+      (let homeDirArg = escapeShellArg homeDirectory;
       in ''
         function _cmp() {
           if [[ -d $1 && -d $2 ]]; then
@@ -261,14 +253,12 @@ in
           _cmp ${sourceArg} ${homeDirArg}/${targetArg} \
             && changedFiles[${targetArg}]=0 \
             || changedFiles[${targetArg}]=1
-        '') (filter (v: v.onChange != "") (attrValues cfg))
-      + ''
+        '') (filter (v: v.onChange != "") (attrValues cfg)) + ''
           unset -f _cmp
-      ''
-    );
+        '');
 
-    home.activation.onFilesChange = hm.dag.entryAfter ["linkGeneration"] (
-      concatMapStrings (v: ''
+    home.activation.onFilesChange = hm.dag.entryAfter [ "linkGeneration" ]
+      (concatMapStrings (v: ''
         if (( ''${changedFiles[${escapeShellArg v.target}]} == 1 )); then
           if [[ -v DRY_RUN || -v VERBOSE ]]; then
             echo "Running onChange hook for" ${escapeShellArg v.target}
@@ -277,17 +267,13 @@ in
             ${v.onChange}
           fi
         fi
-      '') (filter (v: v.onChange != "") (attrValues cfg))
-    );
+      '') (filter (v: v.onChange != "") (attrValues cfg)));
 
     # Symlink directories and files that have the right execute bit.
     # Copy files that need their execute bit changed.
-    home-files = pkgs.runCommandLocal
-      "home-manager-files"
-      {
+    home-files = pkgs.runCommandLocal "home-manager-files" {
       nativeBuildInputs = [ pkgs.xorg.lndir ];
-      }
-      (''
+    } (''
       mkdir -p $out
 
       # Needed in case /nix is a symbolic link.
@@ -349,18 +335,15 @@ in
           fi
         fi
       }
-      '' + concatStrings (
-        mapAttrsToList (n: v: ''
+    '' + concatStrings (mapAttrsToList (n: v: ''
       insertFile ${
         escapeShellArgs [
           (sourceStorePath v)
           v.target
-              (if v.executable == null
-               then "inherit"
-               else toString v.executable)
+          (if v.executable == null then "inherit" else toString v.executable)
           (toString v.recursive)
-            ]}
-        '') cfg
-      ));
+        ]
+      }
+    '') cfg));
   };
 }

modules/home-environment.nix

@@ -113,10 +113,10 @@ let
     options = {
       layout = mkOption {
         type = with types; nullOr str;
-        default =
-          if versionAtLeast config.home.stateVersion "19.09"
-          then null
-          else "us";
+        default = if versionAtLeast config.home.stateVersion "19.09" then
+          null
+        else
+          "us";
         defaultText = literalExpression "null";
         description = ''
           Keyboard layout. If `null`, then the system
@@ -148,9 +148,7 @@ let
       variant = mkOption {
         type = with types; nullOr str;
         default =
-          if versionAtLeast config.home.stateVersion "19.09"
-          then null
-          else "";
+          if versionAtLeast config.home.stateVersion "19.09" then null else "";
         defaultText = literalExpression "null";
         example = "colemak";
         description = ''
@@ -164,9 +162,7 @@ let
     };
   };
 
-in
-
-{
+in {
   meta.maintainers = [ maintainers.rycee ];
 
   imports = [
@@ -257,7 +253,10 @@ in
     home.sessionVariables = mkOption {
       default = { };
       type = with types; lazyAttrsOf (oneOf [ str path int float ]);
-      example = { EDITOR = "emacs"; GS_OPTIONS = "-sPAPERSIZE=a4"; };
+      example = {
+        EDITOR = "emacs";
+        GS_OPTIONS = "-sPAPERSIZE=a4";
+      };
       description = ''
         Environment variables to always set at login.
 
@@ -494,15 +493,12 @@ in
       }
     ];
 
-    warnings =
-      let
+    warnings = let
       hmRelease = config.home.version.release;
       nixpkgsRelease = lib.trivial.release;
-        releaseMismatch =
-          config.home.enableNixpkgsReleaseCheck
-          && hmRelease != nixpkgsRelease;
-      in
-        optional releaseMismatch ''
+      releaseMismatch = config.home.enableNixpkgsReleaseCheck && hmRelease
+        != nixpkgsRelease;
+    in optional releaseMismatch ''
       You are using
 
         Home Manager version ${hmRelease} and
@@ -519,52 +515,38 @@ in
       to your configuration.
     '';
 
-    home.username =
-      mkIf (versionOlder config.home.stateVersion "20.09")
+    home.username = mkIf (versionOlder config.home.stateVersion "20.09")
       (mkDefault (builtins.getEnv "USER"));
-    home.homeDirectory =
-      mkIf (versionOlder config.home.stateVersion "20.09")
+    home.homeDirectory = mkIf (versionOlder config.home.stateVersion "20.09")
       (mkDefault (builtins.getEnv "HOME"));
 
-    home.profileDirectory =
-      if config.submoduleSupport.enable
-        && config.submoduleSupport.externalPackageInstall
-      then "/etc/profiles/per-user/${cfg.username}"
-      else if config.nix.enable && (config.nix.settings.use-xdg-base-directories or false)
-      then "${config.xdg.stateHome}/nix/profile"
-      else cfg.homeDirectory + "/.nix-profile";
+    home.profileDirectory = if config.submoduleSupport.enable
+    && config.submoduleSupport.externalPackageInstall then
+      "/etc/profiles/per-user/${cfg.username}"
+    else if config.nix.enable
+    && (config.nix.settings.use-xdg-base-directories or false) then
+      "${config.xdg.stateHome}/nix/profile"
+    else
+      cfg.homeDirectory + "/.nix-profile";
 
     programs.bash.shellAliases = cfg.shellAliases;
     programs.zsh.shellAliases = cfg.shellAliases;
     programs.fish.shellAliases = cfg.shellAliases;
 
     home.sessionVariables =
-      let
-        maybeSet = n: v: optionalAttrs (v != null) { ${n} = v; };
-      in
-        (maybeSet "LANG" cfg.language.base)
-        //
-        (maybeSet "LC_CTYPE" cfg.language.ctype)
-        //
-        (maybeSet "LC_NUMERIC" cfg.language.numeric)
-        //
-        (maybeSet "LC_TIME" cfg.language.time)
-        //
-        (maybeSet "LC_COLLATE" cfg.language.collate)
-        //
-        (maybeSet "LC_MONETARY" cfg.language.monetary)
-        //
-        (maybeSet "LC_MESSAGES" cfg.language.messages)
-        //
-        (maybeSet "LC_PAPER" cfg.language.paper)
-        //
-        (maybeSet "LC_NAME" cfg.language.name)
-        //
-        (maybeSet "LC_ADDRESS" cfg.language.address)
-        //
-        (maybeSet "LC_TELEPHONE" cfg.language.telephone)
-        //
-        (maybeSet "LC_MEASUREMENT" cfg.language.measurement);
+      let maybeSet = n: v: optionalAttrs (v != null) { ${n} = v; };
+      in (maybeSet "LANG" cfg.language.base)
+      // (maybeSet "LC_CTYPE" cfg.language.ctype)
+      // (maybeSet "LC_NUMERIC" cfg.language.numeric)
+      // (maybeSet "LC_TIME" cfg.language.time)
+      // (maybeSet "LC_COLLATE" cfg.language.collate)
+      // (maybeSet "LC_MONETARY" cfg.language.monetary)
+      // (maybeSet "LC_MESSAGES" cfg.language.messages)
+      // (maybeSet "LC_PAPER" cfg.language.paper)
+      // (maybeSet "LC_NAME" cfg.language.name)
+      // (maybeSet "LC_ADDRESS" cfg.language.address)
+      // (maybeSet "LC_TELEPHONE" cfg.language.telephone)
+      // (maybeSet "LC_MEASUREMENT" cfg.language.measurement);
 
     # Provide a file holding all session variables.
     home.sessionVariablesPackage = pkgs.writeTextFile {
@@ -602,14 +584,10 @@ in
     # In case the user has moved from a user-install of Home Manager
     # to a submodule managed one we attempt to uninstall the
     # `home-manager-path` package if it is installed.
-    home.activation.installPackages = hm.dag.entryAfter ["writeBoundary"] (
-      if config.submoduleSupport.externalPackageInstall
-      then
-        ''
+    home.activation.installPackages = hm.dag.entryAfter [ "writeBoundary" ]
+      (if config.submoduleSupport.externalPackageInstall then ''
         nixProfileRemove home-manager-path
-        ''
-      else
-        ''
+      '' else ''
         function nixReplaceProfile() {
           local oldNix="$(command -v nix)"
 
@@ -637,14 +615,12 @@ in
         fi
         unset -f nixReplaceProfile
         unset INSTALL_CMD INSTALL_CMD_ACTUAL LIST_CMD REMOVE_CMD_SYNTAX
-        ''
-    );
+      '');
 
     # Text containing Bash commands that will initialize the Home Manager Bash
     # library. Most importantly, this will prepare for using translated strings
     # in the `hm-modules` text domain.
-    lib.bash.initHomeManagerLib =
-      let
+    lib.bash.initHomeManagerLib = let
       domainDir = pkgs.runCommand "hm-modules-messages" {
         nativeBuildInputs = [ pkgs.buildPackages.gettext ];
       } ''
@@ -655,22 +631,19 @@ in
           msgfmt -o "$out/$lang/LC_MESSAGES/hm-modules.mo" "$path"
         done
       '';
-      in
-        ''
+    in ''
       export TEXTDOMAIN=hm-modules
       export TEXTDOMAINDIR=${domainDir}
       source ${../lib/bash/home-manager.sh}
     '';
 
-    home.activationPackage =
-      let
+    home.activationPackage = let
       mkCmd = res: ''
         _iNote "Activating %s" "${res.name}"
         ${res.data}
       '';
       sortedCommands = hm.dag.topoSort cfg.activation;
-        activationCmds =
-          if sortedCommands ? result then
+      activationCmds = if sortedCommands ? result then
         concatStringsSep "\n" (map mkCmd sortedCommands.result)
       else
         abort ("Dependency cycle in activation script: "
@@ -678,8 +651,8 @@ in
 
       # Programs that always should be available on the activation
       # script's PATH.
-        activationBinPaths = lib.makeBinPath (
-          with pkgs; [
+      activationBinPaths = lib.makeBinPath (with pkgs;
+        [
           bash
           coreutils
           diffutils # For `cmp` and `diff`.
@@ -689,17 +662,13 @@ in
           gnused
           jq
           ncurses # For `tput`.
-          ]
-          ++ config.home.extraActivationPath
-        )
-        + (
+        ] ++ config.home.extraActivationPath) + (
           # Add path of the Nix binaries, if a Nix package is configured, then
           # use that one, otherwise grab the path of the nix-env tool.
           if config.nix.enable && config.nix.package != null then
             ":${config.nix.package}/bin"
           else
-            ":$(${pkgs.coreutils}/bin/dirname $(${pkgs.coreutils}/bin/readlink -m $(type -p nix-env)))"
-        )
+            ":$(${pkgs.coreutils}/bin/dirname $(${pkgs.coreutils}/bin/readlink -m $(type -p nix-env)))")
         + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";
 
       activationScript = pkgs.writeShellScript "activation-script" ''
@@ -720,13 +689,7 @@ in
 
         ${activationCmds}
       '';
-      in
-        pkgs.runCommand
-          "home-manager-generation"
-          {
-            preferLocalBuild = true;
-          }
-          ''
+    in pkgs.runCommand "home-manager-generation" { preferLocalBuild = true; } ''
       mkdir -p $out
 
       echo "${config.home.version.full}" > $out/hm-version

modules/programs/zsh.nix

@@ -6,21 +6,21 @@ let
 
   cfg = config.programs.zsh;
 
-  relToDotDir = file: (optionalString (cfg.dotDir != null) (cfg.dotDir + "/")) + file;
+  relToDotDir = file:
+    (optionalString (cfg.dotDir != null) (cfg.dotDir + "/")) + file;
 
-  pluginsDir = if cfg.dotDir != null then
-    relToDotDir "plugins" else ".zsh/plugins";
+  pluginsDir =
+    if cfg.dotDir != null then relToDotDir "plugins" else ".zsh/plugins";
 
   envVarsStr = config.lib.zsh.exportAll cfg.sessionVariables;
   localVarsStr = config.lib.zsh.defineAll cfg.localVariables;
 
-  aliasesStr = concatStringsSep "\n" (
-    mapAttrsToList (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellAliases
-  );
+  aliasesStr = concatStringsSep "\n" (mapAttrsToList
+    (k: v: "alias -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}")
+    cfg.shellAliases);
 
-  dirHashesStr = concatStringsSep "\n" (
-    mapAttrsToList (k: v: ''hash -d ${k}="${v}"'') cfg.dirHashes
-  );
+  dirHashesStr = concatStringsSep "\n"
+    (mapAttrsToList (k: v: ''hash -d ${k}="${v}"'') cfg.dirHashes);
 
   zdotdir = "$HOME/" + lib.escapeShellArg cfg.dotDir;
 
@@ -64,14 +64,16 @@ let
 
       path = mkOption {
         type = types.str;
-        default = if versionAtLeast stateVersion "20.03"
-          then "$HOME/.zsh_history"
-          else relToDotDir ".zsh_history";
+        default = if versionAtLeast stateVersion "20.03" then
+          "$HOME/.zsh_history"
+        else
+          relToDotDir ".zsh_history";
         defaultText = literalExpression ''
           "$HOME/.zsh_history" if state version ≥ 20.03,
           "$ZDOTDIR/.zsh_history" otherwise
         '';
-        example = literalExpression ''"''${config.xdg.dataHome}/zsh/zsh_history"'';
+        example =
+          literalExpression ''"''${config.xdg.dataHome}/zsh/zsh_history"'';
         description = "History file location";
       };
 
@@ -273,13 +275,25 @@ let
     };
   };
 
-in
-
-{
+in {
   imports = [
-    (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ])
-    (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
-    (mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [ "programs" "zsh" "zprof" ])
+    (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [
+      "programs"
+      "zsh"
+      "autosuggestion"
+      "enable"
+    ])
+    (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [
+      "programs"
+      "zsh"
+      "syntaxHighlighting"
+      "enable"
+    ])
+    (mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [
+      "programs"
+      "zsh"
+      "zprof"
+    ])
   ];
 
   options = {
@@ -374,7 +388,8 @@ in
 
       completionInit = mkOption {
         default = "autoload -U compinit && compinit";
-        description = "Initialization commands to run when completion is enabled.";
+        description =
+          "Initialization commands to run when completion is enabled.";
         type = types.lines;
       };
 
@@ -415,7 +430,8 @@ in
         };
 
         strategy = mkOption {
-          type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]);
+          type = types.listOf
+            (types.enum [ "history" "completion" "match_prev_cmd" ]);
           default = [ "history" ];
           description = ''
             `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated.
@@ -457,7 +473,8 @@ in
       initExtraBeforeCompInit = mkOption {
         default = "";
         type = types.lines;
-        description = "Extra commands that should be added to {file}`.zshrc` before compinit.";
+        description =
+          "Extra commands that should be added to {file}`.zshrc` before compinit.";
       };
 
       initExtra = mkOption {
@@ -481,7 +498,8 @@ in
       profileExtra = mkOption {
         default = "";
         type = types.lines;
-        description = "Extra commands that should be added to {file}`.zprofile`.";
+        description =
+          "Extra commands that should be added to {file}`.zprofile`.";
       };
 
       loginExtra = mkOption {
@@ -493,7 +511,8 @@ in
       logoutExtra = mkOption {
         default = "";
         type = types.lines;
-        description = "Extra commands that should be added to {file}`.zlogout`.";
+        description =
+          "Extra commands that should be added to {file}`.zlogout`.";
       };
 
       plugins = mkOption {
@@ -638,18 +657,20 @@ in
           # Oh-My-Zsh/Prezto calls compinit during initialization,
           # calling it twice causes slight start up slowdown
           # as all $fpath entries will be traversed again.
-        ${optionalString (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable)
-          cfg.completionInit
-        }''
+          ${optionalString
+          (cfg.enableCompletion && !cfg.oh-my-zsh.enable && !cfg.prezto.enable)
+          cfg.completionInit}''
 
         (optionalString cfg.autosuggestion.enable ''
           source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
           ${optionalString (cfg.autosuggestion.strategy != [ ]) ''
-            ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.autosuggestion.strategy})
-          ''
-          }
+            ZSH_AUTOSUGGEST_STRATEGY=(${
+              concatStringsSep " " cfg.autosuggestion.strategy
+            })
+          ''}
         '')
-        (optionalString (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) ''
+        (optionalString
+          (cfg.autosuggestion.enable && cfg.autosuggestion.highlight != null) ''
             ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.autosuggestion.highlight}"
           '')
 
@@ -658,20 +679,17 @@ in
           ${cfg.oh-my-zsh.extraConfig}
           # oh-my-zsh configuration generated by NixOS
           ${optionalString (cfg.oh-my-zsh.plugins != [ ])
-              "plugins=(${concatStringsSep " " cfg.oh-my-zsh.plugins})"
-            }
+          "plugins=(${concatStringsSep " " cfg.oh-my-zsh.plugins})"}
           ${optionalString (cfg.oh-my-zsh.custom != "")
-              "ZSH_CUSTOM=\"${cfg.oh-my-zsh.custom}\""
-            }
+          ''ZSH_CUSTOM="${cfg.oh-my-zsh.custom}"''}
           ${optionalString (cfg.oh-my-zsh.theme != "")
-              "ZSH_THEME=\"${cfg.oh-my-zsh.theme}\""
-            }
+          ''ZSH_THEME="${cfg.oh-my-zsh.theme}"''}
           source $ZSH/oh-my-zsh.sh
         '')
 
         ''
-        ${optionalString cfg.prezto.enable
-            (builtins.readFile "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zshrc")}
+          ${optionalString cfg.prezto.enable (builtins.readFile
+            "${pkgs.zsh-prezto}/share/zsh-prezto/runcoms/zshrc")}
 
           ${concatStrings (map (plugin: ''
             if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then
@@ -683,30 +701,49 @@ in
           # See https://github.com/nix-community/home-manager/issues/177.
           HISTSIZE="${toString cfg.history.size}"
           SAVEHIST="${toString cfg.history.save}"
-        ${optionalString (cfg.history.ignorePatterns != []) "HISTORY_IGNORE=${lib.escapeShellArg "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})"}"}
-        ${if versionAtLeast config.home.stateVersion "20.03"
-          then ''HISTFILE="${cfg.history.path}"''
-          else ''HISTFILE="$HOME/${cfg.history.path}"''}
+          ${optionalString (cfg.history.ignorePatterns != [ ])
+          "HISTORY_IGNORE=${
+            lib.escapeShellArg
+            "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})"
+          }"}
+          ${if versionAtLeast config.home.stateVersion "20.03" then
+            ''HISTFILE="${cfg.history.path}"''
+          else
+            ''HISTFILE="$HOME/${cfg.history.path}"''}
           mkdir -p "$(dirname "$HISTFILE")"
 
           setopt HIST_FCNTL_LOCK
           ${if cfg.history.append then "setopt" else "unsetopt"} APPEND_HISTORY
-        ${if cfg.history.ignoreDups then "setopt" else "unsetopt"} HIST_IGNORE_DUPS
-        ${if cfg.history.ignoreAllDups then "setopt" else "unsetopt"} HIST_IGNORE_ALL_DUPS
-        ${if cfg.history.ignoreSpace then "setopt" else "unsetopt"} HIST_IGNORE_SPACE
-        ${if cfg.history.expireDuplicatesFirst then "setopt" else "unsetopt"} HIST_EXPIRE_DUPS_FIRST
+          ${
+            if cfg.history.ignoreDups then "setopt" else "unsetopt"
+          } HIST_IGNORE_DUPS
+          ${
+            if cfg.history.ignoreAllDups then "setopt" else "unsetopt"
+          } HIST_IGNORE_ALL_DUPS
+          ${
+            if cfg.history.ignoreSpace then "setopt" else "unsetopt"
+          } HIST_IGNORE_SPACE
+          ${
+            if cfg.history.expireDuplicatesFirst then "setopt" else "unsetopt"
+          } HIST_EXPIRE_DUPS_FIRST
           ${if cfg.history.share then "setopt" else "unsetopt"} SHARE_HISTORY
-        ${if cfg.history.extended then "setopt" else "unsetopt"} EXTENDED_HISTORY
-        ${if cfg.autocd != null then "${if cfg.autocd then "setopt" else "unsetopt"} autocd" else ""}
+          ${
+            if cfg.history.extended then "setopt" else "unsetopt"
+          } EXTENDED_HISTORY
+          ${if cfg.autocd != null then
+            "${if cfg.autocd then "setopt" else "unsetopt"} autocd"
+          else
+            ""}
 
           ${cfg.initExtra}
 
           # Aliases
           ${aliasesStr}
         ''
-      ]
-      ++ (mapAttrsToList (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}") cfg.shellGlobalAliases)
-      ++ [ (''
+      ] ++ (mapAttrsToList
+        (k: v: "alias -g -- ${lib.escapeShellArg k}=${lib.escapeShellArg v}")
+        cfg.shellGlobalAliases) ++ [
+          (''
             # Named Directory Hashes
             ${dirHashesStr}
           '')
@@ -716,17 +753,18 @@ in
             # https://github.com/zsh-users/zsh-syntax-highlighting#faq
             ''
               source ${cfg.syntaxHighlighting.package}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-          ZSH_HIGHLIGHT_HIGHLIGHTERS+=(${lib.concatStringsSep " " (map lib.escapeShellArg cfg.syntaxHighlighting.highlighters)})
-          ${lib.concatStringsSep "\n" (
-              lib.mapAttrsToList
-                (name: value: "ZSH_HIGHLIGHT_STYLES+=(${lib.escapeShellArg name} ${lib.escapeShellArg value})")
-                cfg.syntaxHighlighting.styles
-          )}
-          ${lib.concatStringsSep "\n" (
-              lib.mapAttrsToList
-                (name: value: "ZSH_HIGHLIGHT_PATTERNS+=(${lib.escapeShellArg name} ${lib.escapeShellArg value})")
-                cfg.syntaxHighlighting.patterns
-          )}
+              ZSH_HIGHLIGHT_HIGHLIGHTERS+=(${
+                lib.concatStringsSep " "
+                (map lib.escapeShellArg cfg.syntaxHighlighting.highlighters)
+              })
+              ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value:
+                "ZSH_HIGHLIGHT_STYLES+=(${lib.escapeShellArg name} ${
+                  lib.escapeShellArg value
+                })") cfg.syntaxHighlighting.styles)}
+              ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value:
+                "ZSH_HIGHLIGHT_PATTERNS+=(${lib.escapeShellArg name} ${
+                  lib.escapeShellArg value
+                })") cfg.syntaxHighlighting.patterns)}
             '')
 
           (optionalString (cfg.historySubstringSearch.enable or false)
@@ -735,17 +773,14 @@ in
             ''
               source ${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh
               ${lib.concatMapStringsSep "\n"
-            (upKey: "bindkey \"${upKey}\" history-substring-search-up")
-            (lib.toList cfg.historySubstringSearch.searchUpKey)
-          }
+              (upKey: ''bindkey "${upKey}" history-substring-search-up'')
+              (lib.toList cfg.historySubstringSearch.searchUpKey)}
               ${lib.concatMapStringsSep "\n"
-            (downKey: "bindkey \"${downKey}\" history-substring-search-down")
-            (lib.toList cfg.historySubstringSearch.searchDownKey)
-          }
+              (downKey: ''bindkey "${downKey}" history-substring-search-down'')
+              (lib.toList cfg.historySubstringSearch.searchDownKey)}
             '')
 
-        (optionalString cfg.zprof.enable
-        ''
+          (optionalString cfg.zprof.enable ''
             zprof
           '')
         ]);
@@ -762,8 +797,7 @@ in
       # but allow the user to opt out.
       programs.zsh.enableCompletion = mkDefault true;
 
-      home.file =
-        foldl' (a: b: a // b) {}
+      home.file = foldl' (a: b: a // b) { }
         (map (plugin: { "${pluginsDir}/${plugin.name}".source = plugin.src; })
           cfg.plugins);
     })