nix: format all nix files with nixfmt

contrib/nixos/modules/copyparty.nix

@@ -4,26 +4,29 @@
   lib,
   ...
 }:
-with lib; let
+with lib;
-  mkKeyValue = key: value:
+let
-    if value == true
+  mkKeyValue =
-    then
+    key: value:
+    if value == true then
       # sets with a true boolean value are coerced to just the key name
       key
-    else if value == false
+    else if value == false then
-    then
       # or omitted completely when false
       ""
-    else (generators.mkKeyValueDefault {inherit mkValueString;} ": " key value);
+    else
+      (generators.mkKeyValueDefault { inherit mkValueString; } ": " key value);
 
   mkAttrsString = value: (generators.toKeyValue { inherit mkKeyValue; } value);
 
-  mkValueString = value:
+  mkValueString =
-    if isList value
+    value:
-    then (concatStringsSep ", " (map mkValueString value))
+    if isList value then
-    else if isAttrs value
+      (concatStringsSep ", " (map mkValueString value))
-    then "\n" + (mkAttrsString value)
+    else if isAttrs value then
-    else (generators.mkValueStringDefault {} value);
+      "\n" + (mkAttrsString value)
+    else
+      (generators.mkValueStringDefault { } value);
 
   mkSectionName = value: "[" + (escape [ "[" "]" ] value) + "]";
 
@@ -57,7 +60,8 @@ with lib; let
   externalCacheDir = "/var/cache/copyparty";
   externalStateDir = "/var/lib/copyparty";
   defaultShareDir = "${externalStateDir}/data";
-in {
+in
+{
   options.services.copyparty = {
     enable = mkEnableOption "web-based file manager";
 
@@ -128,7 +132,10 @@ in {
     };
 
     accounts = mkOption {
-      type = types.attrsOf (types.submodule ({...}: {
+      type = types.attrsOf (
+        types.submodule (
+          { ... }:
+          {
             options = {
               passwordFile = mkOption {
                 type = types.str;
@@ -139,7 +146,9 @@ in {
                 example = "/run/keys/copyparty/ed";
               };
             };
-      }));
+          }
+        )
+      );
       description = ''
         A set of copyparty accounts to create.
       '';
@@ -152,7 +161,10 @@ in {
     };
 
     volumes = mkOption {
-      type = types.attrsOf (types.submodule ({...}: {
+      type = types.attrsOf (
+        types.submodule (
+          { ... }:
+          {
             options = {
               path = mkOption {
                 type = types.path;
@@ -214,12 +226,16 @@ in {
                 default = { };
               };
             };
-      }));
+          }
+        )
+      );
       description = "A set of copyparty volumes to create";
       default = {
         "/" = {
           path = defaultShareDir;
-          access = {r = "*";};
+          access = {
+            r = "*";
+          };
         };
       };
       example = literalExpression ''
@@ -238,9 +254,11 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (let
+  config = mkIf cfg.enable (
+    let
       command = "${getExe cfg.package} -c ${runtimeConfigPath}";
-  in {
+    in
+    {
       systemd.services.copyparty = {
         description = "http file sharing hub";
         wantedBy = [ "multi-user.target" ];
@@ -250,15 +268,16 @@ in {
           XDG_CONFIG_HOME = externalStateDir;
         };
 
-      preStart = let
+        preStart =
-        replaceSecretCommand = name: attrs: "${getExe pkgs.replace-secret} '${
+          let
-          passwordPlaceholder name
+            replaceSecretCommand =
-        }' '${attrs.passwordFile}' ${runtimeConfigPath}";
+              name: attrs:
-      in ''
+              "${getExe pkgs.replace-secret} '${passwordPlaceholder name}' '${attrs.passwordFile}' ${runtimeConfigPath}";
+          in
+          ''
             set -euo pipefail
             install -m 600 ${configFile} ${runtimeConfigPath}
-        ${concatStringsSep "\n"
+            ${concatStringsSep "\n" (mapAttrsToList replaceSecretCommand cfg.accounts)}
-          (mapAttrsToList replaceSecretCommand cfg.accounts)}
           '';
 
         serviceConfig = {
@@ -274,21 +293,15 @@ in {
           CacheDirectory = lib.mkIf (cfg.settings ? hist) [ "copyparty" ];
           CacheDirectoryMode = lib.mkIf (cfg.settings ? hist) "0700";
           WorkingDirectory = externalStateDir;
-        BindReadOnlyPaths =
+          BindReadOnlyPaths = [
-          [
             "/nix/store"
             "-/etc/resolv.conf"
             "-/etc/nsswitch.conf"
             "-/etc/hosts"
             "-/etc/localtime"
-          ]
+          ] ++ (mapAttrsToList (k: v: "-${v.passwordFile}") cfg.accounts);
-          ++ (mapAttrsToList (k: v: "-${v.passwordFile}") cfg.accounts);
           BindPaths =
-          (
+            (if cfg.settings ? hist then [ cfg.settings.hist ] else [ ])
-            if cfg.settings ? hist
-            then [cfg.settings.hist]
-            else []
-          )
             ++ [ externalStateDir ]
             ++ (mapAttrsToList (k: v: v.path) cfg.volumes);
           # ProtectSystem = "strict";
@@ -332,8 +345,7 @@ in {
               mode = ":755";
             };
           }
-      )
+        ) cfg.volumes
-      cfg.volumes
       );
 
       users.groups.copyparty = lib.mkIf (cfg.user == "copyparty" && cfg.group == "copyparty") { };
@@ -344,9 +356,7 @@ in {
         isSystemUser = true;
       };
       environment.systemPackages = lib.mkIf cfg.mkHashWrapper [
-      (pkgs.writeShellScriptBin
+        (pkgs.writeShellScriptBin "copyparty-hash" ''
-      "copyparty-hash"
-      ''
           set -a  # automatically export variables
           # set same environment variables as the systemd service
           ${lib.pipe config.systemd.services.copyparty.environment [
@@ -359,5 +369,6 @@ in {
           exec ${command} --ah-cli
         '')
       ];
-  });
+    }
+  );
 }

contrib/package/nix/copyparty/default.nix

@@ -1,4 +1,20 @@
-{ lib, stdenv, makeWrapper, fetchurl, util-linux, python, jinja2, impacket, pyftpdlib, pyopenssl, argon2-cffi, pillow, pyvips, pyzmq, ffmpeg, mutagen,
+{
+  lib,
+  stdenv,
+  makeWrapper,
+  fetchurl,
+  util-linux,
+  python,
+  jinja2,
+  impacket,
+  pyftpdlib,
+  pyopenssl,
+  argon2-cffi,
+  pillow,
+  pyvips,
+  pyzmq,
+  ffmpeg,
+  mutagen,
 
   # use argon2id-hashed passwords in config files (sha2 is always available)
   withHashedPasswords ? true,
@@ -42,8 +58,10 @@ extraPythonPackages ? (_p: [ ]),
 
 let
   pinData = lib.importJSON ./pin.json;
-  pyEnv = python.withPackages (ps:
+  pyEnv = python.withPackages (
-    with ps; [
+    ps:
+    with ps;
+    [
       jinja2
     ]
     ++ lib.optional withSMB impacket
@@ -57,7 +75,8 @@ let
     ++ lib.optional withZeroMQ pyzmq
     ++ (extraPythonPackages ps)
   );
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   pname = "copyparty";
   version = pinData.version;
   src = fetchurl {
@@ -70,7 +89,9 @@ in stdenv.mkDerivation {
   installPhase = ''
     install -Dm755 $src $out/share/copyparty-sfx.py
     makeWrapper ${pyEnv.interpreter} $out/bin/copyparty \
-      --set PATH '${lib.makeBinPath ([ util-linux ] ++ extraPackages ++ lib.optional withMediaProcessing ffmpeg)}:$PATH' \
+      --set PATH '${
+        lib.makeBinPath ([ util-linux ] ++ extraPackages ++ lib.optional withMediaProcessing ffmpeg)
+      }:$PATH' \
       --add-flags "$out/share/copyparty-sfx.py"
   '';
   meta.mainProgram = "copyparty";

flake.nix

@@ -4,16 +4,22 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
     {
       nixosModules.default = ./contrib/nixos/modules/copyparty.nix;
       overlays.default = self: super: {
-        copyparty =
+        copyparty = self.python3.pkgs.callPackage ./contrib/package/nix/copyparty {
-          self.python3.pkgs.callPackage ./contrib/package/nix/copyparty {
           ffmpeg = self.ffmpeg-full;
         };
       };
-    } // flake-utils.lib.eachDefaultSystem (system:
+    }
+    // flake-utils.lib.eachDefaultSystem (
+      system:
       let
         pkgs = import nixpkgs {
           inherit system;
@@ -22,10 +28,12 @@
           };
           overlays = [ self.overlays.default ];
         };
-      in {
+      in
+      {
         packages = {
           inherit (pkgs) copyparty;
           default = self.packages.${system}.copyparty;
         };
-      });
+      }
+    );
 }