chore: update nixfmt

tao3k · Nov 30, 2023 · 80933e6 · 80933e6
1 parent abbde0b
commit 80933e6
Show file tree

Hide file tree

Showing 245 changed files with 504 additions and 517 deletions.
diff --git a/default.nix b/default.nix
@@ -12,4 +12,4 @@ let
     + "/flake.nix"
   );
 in
-call-flake.outputs { } ./.
+call-flake.outputs {} ./.
diff --git a/examples/overlays/__fixture/test1.nix b/examples/overlays/__fixture/test1.nix
@@ -5,4 +5,4 @@
 _:
 
 _final: _prev:
-{ }
+{}
diff --git a/examples/overlays/__fixture/test2.nix b/examples/overlays/__fixture/test2.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ inputs }: _final: _prev: { }
+{inputs}: _final: _prev: {}
diff --git a/examples/overlays/default.nix b/examples/overlays/default.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ omnibus }: omnibus.pops.overlays { src = ./__fixture; }
+{omnibus}: omnibus.pops.overlays {src = ./__fixture;}
diff --git a/examples/packages/__fixture/hello1.nix b/examples/packages/__fixture/hello1.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation {
   };
   meta = {
     description = "An example package with unfree license (for testing)";
-    maintainers = [ lib.maintainers.oxij ];
+    maintainers = [lib.maintainers.oxij];
   };
 }
diff --git a/examples/packages/__fixture/hello2.nix b/examples/packages/__fixture/hello2.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "An example package with unfree license (for testing)";
-    maintainers = [ lib.maintainers.oxij ];
+    maintainers = [lib.maintainers.oxij];
   };
 }
diff --git a/examples/packages/__fixture/py/btest_1.nix b/examples/packages/__fixture/py/btest_1.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zeek/btest";
     changelog = "https://github.com/zeek/btest/blob/${version}/CHANGES";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    maintainers = with maintainers; [fab];
   };
 }
diff --git a/examples/packages/__fixture/py/btest_2/default.nix b/examples/packages/__fixture/py/btest_2/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zeek/btest";
     changelog = "https://github.com/zeek/btest/blob/${version}/CHANGES";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ fab ];
+    maintainers = with maintainers; [fab];
   };
 }
diff --git a/examples/packages/default.nix b/examples/packages/default.nix
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 # [[file:../../docs/org/pops-packages.org::*Example][Example:1]]
-{ omnibus, inputs }:
+{omnibus, inputs}:
 let
   nixpkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
 in
@@ -18,7 +18,7 @@ in
           fetchurl
           fetchFromGitHub
           dockerTools
-        ;
+          ;
       };
     };
   };

diff --git a/examples/packagesOverlay.nix b/examples/packagesOverlay.nix
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 # [[file:../docs/org/pops-packages.org::*Example][Example:3]]
-{ super, omnibus }:
+{super, omnibus}:
 let
   nixos-23_05 = omnibus.flake.inputs.nixos-23_05;
 in
@@ -13,7 +13,7 @@ nixos-23_05.legacyPackages.x86_64-linux.appendOverlays [
   (final: prev: {
     python3Packages = prev.python3Packages.override (
       old: {
-        overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (
+        overrides = prev.lib.composeExtensions (old.overrides or (_: _: {})) (
           selfP: _:
           # can be either super.packages.exports.packages.py.packages selfP
           {

diff --git a/flake.nix b/flake.nix
@@ -8,9 +8,9 @@
   };
 
   outputs =
-    { self, ... }@inputs:
+    {self, ...}@inputs:
     let
-      srcPops = import ./src/__init.nix { inherit inputs; };
+      srcPops = import ./src/__init.nix {inherit inputs;};
       src = srcPops.exports.default;
     in
     src.flakeOutputs

diff --git a/local/cells/repo/configs.nix b/local/cells/repo/configs.nix
@@ -10,7 +10,7 @@
       (2) have all the things in one place / fromat
       (3) potentially share / re-use configuration data - keeping it in sync
 */
-{ inputs, cell }:
+{inputs, cell}:
 with inputs.std.inputs.dmerge;
 let
   cfg = {

diff --git a/local/cells/repo/pops.nix b/local/cells/repo/pops.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ inputs, cell }:
+{inputs, cell}:
 let
   inherit (inputs) nixpkgs;
   inputs' = (inputs.omnibus.pops.flake.setSystem nixpkgs.system).inputs;

diff --git a/local/cells/repo/shells.nix b/local/cells/repo/shells.nix
@@ -6,7 +6,7 @@
 
    They conveniently also generate config files in their startup hook.
 */
-{ inputs, cell }:
+{inputs, cell}:
 let
   inherit (inputs.std) lib;
   inherit (inputs) nixpkgs std;
@@ -16,7 +16,7 @@ in
   default = lib.dev.mkShell {
     name = "omnibus devshell";
 
-    imports = [ cell.pops.devshellProfiles.exports.default.nickel ];
+    imports = [cell.pops.devshellProfiles.exports.default.nickel];
 
     # Tool Homepage: https://nix-community.github.io/nixago/
     # This is Standard's devshell integration.
@@ -37,6 +37,6 @@ in
       nixpkgs.nixci
     ];
 
-    commands = [ ];
+    commands = [];
   };
 }
diff --git a/local/ci/flake.nix b/local/ci/flake.nix
@@ -4,7 +4,7 @@
   inputs.call-flake.url = "github:divnix/call-flake";
 
   outputs =
-    { self, call-flake }:
+    {self, call-flake}:
     let
       local = call-flake ../.;
       inherit (local) examples;

diff --git a/local/flake.lock b/local/flake.lock
diff --git a/local/flake.nix b/local/flake.nix
@@ -42,7 +42,7 @@
   inputs.haumea.follows = "namaka/haumea";
 
   outputs =
-    { std, self, ... }@inputs:
+    {std, self, ...}@inputs:
     let
       omnibus = inputs.call-flake ../.;
     in
@@ -71,7 +71,7 @@
       {
         examples = omnibus.load {
           src = ../examples;
-          transformer = [ (_cursor: dir: if dir ? default then dir.default else dir) ];
+          transformer = [(_cursor: dir: if dir ? default then dir.default else dir)];
           inputs = inputs.nixpkgs.lib.recursiveUpdate omnibus.lib.loaderInputs {
             inherit inputs;
             trace = true;

diff --git a/local/lock/flake.lock b/local/lock/flake.lock
diff --git a/local/lock/flake.nix b/local/lock/flake.nix
@@ -88,5 +88,5 @@
     catppuccin-foliate.url = "github:catppuccin/foliate";
     catppuccin-foliate.flake = false;
   };
-  outputs = _: { };
+  outputs = _: {};
 }
diff --git a/src/__init.nix b/src/__init.nix
@@ -2,15 +2,15 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ inputs }:
+{inputs}:
 let
   inherit (inputs) flops self;
   inherit (flops.inputs)
     POP
     yants
     haumea
     nixlib
-  ;
+    ;
 in
 flops.lib.haumea.pops.default.setInit {
   src = ./.;

diff --git a/src/errors/inputsSource.nix b/src/errors/inputsSource.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ lib }:
+{lib}:
 list:
 let
   sources = (import ../../local/lock/flake.nix).inputs;

diff --git a/src/errors/requiredInputs.nix b/src/errors/requiredInputs.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ lib, super }:
+{lib, super}:
 inputs': object: listNames:
 let
   notFoundInputs =
@@ -13,7 +13,7 @@ let
   msg =
     (lib.concatMapStringsSep "\n         "
       (
-        { name, url }:
+        {name, url}:
         ''
           # please get the input from `${name}.url = "${url}"`
                    ${name} = inputs.${name};

diff --git a/src/flakeOutputs.nix b/src/flakeOutputs.nix
@@ -24,7 +24,7 @@ in
     devshellModules
     devshellProfiles
     flake
-  ;
+    ;
 
   scripts =
     (super.pops.scripts.addLoadExtender {

diff --git a/src/lib/addLoadToPops.nix b/src/lib/addLoadToPops.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ lib }:
+{lib}:
 list: pops: load:
 lib.listToAttrs (
   map

diff --git a/src/lib/addLoadToPopsFilterBySrc.nix b/src/lib/addLoadToPopsFilterBySrc.nix
@@ -2,14 +2,14 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ lib, super }:
+{lib, super}:
 dir: pops: ext:
 let
   list = lib.attrNames (lib.readDir dir);
   getDirs = host: lib.attrNames (lib.readDir (dir + "/${host}"));
   processPops =
     name:
-    lib.filterAttrs (_n: v: v != { }) (
+    lib.filterAttrs (_n: v: v != {}) (
       lib.mapAttrs
         (
           n: v:
@@ -21,11 +21,11 @@ let
             if lib.isFunction ext then
               ext v
             else if lib.isAttrs ext then
-              (v.addLoadExtender { load.src = src; }).addLoadExtender { load = ext; }
+              (v.addLoadExtender {load.src = src;}).addLoadExtender {load = ext;}
             else
               v
           else
-            { }
+            {}
         )
         pops
     );

diff --git a/src/lib/attrsets/filterAttrsOnlyRecursive.nix b/src/lib/attrsets/filterAttrsOnlyRecursive.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ lib, super }:
+{lib, super}:
 pred: set:
 lib.listToAttrs (
   lib.concatMap
@@ -21,7 +21,7 @@ lib.listToAttrs (
           ))
         ]
       else
-        [ ]
+        []
     )
     (lib.attrNames set)
 )
diff --git a/src/lib/attrsets/filterDerivations.nix b/src/lib/attrsets/filterDerivations.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ super, lib }:
+{super, lib}:
 super.filterAttrsOnlyRecursive (
   _n: attrs: lib.isDerivation attrs || attrs.recurseForDerivations or false
 )
diff --git a/src/lib/attrsets/stripAttrsForHydra.nix b/src/lib/attrsets/stripAttrsForHydra.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ super }:
+{super}:
 super.filterAttrsOnlyRecursive (
   n: _: n != "recurseForDerivations" && n != "dimension"
 )
diff --git a/src/lib/filterSrc.nix b/src/lib/filterSrc.nix
@@ -2,12 +2,12 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ lib, root }:
+{lib, root}:
 src:
 let
   inherit (root.pops.flake.inputs) nix-filter;
 in
-nix-filter.lib.filter { root = src; }
+nix-filter.lib.filter {root = src;}
 # include =
 #   let
 #     srcDirs = lib.attrNames (lib.readDir src);

diff --git a/src/lib/inputsToPaths.nix b/src/lib/inputsToPaths.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ lib, flops }:
+{lib, flops}:
 # let
 #   # Helper function to collect outPath attributes recursively
 #   collectPaths =
@@ -64,7 +64,7 @@ let
   attrsToPaths = i: lib.attrValues (extractAttrsFromInputs i);
 
   inherit (flops) recursiveMerge;
-  updatedInputs = (recursiveMerge (l.flatten [ inputs ]));
+  updatedInputs = (recursiveMerge (l.flatten [inputs]));
 in
 l.pipe updatedInputs [
   (

diff --git a/src/lib/loaderInputs.nix b/src/lib/loaderInputs.nix
@@ -10,6 +10,6 @@
 inputs.self.pops.self.load.inputs
 // {
   omnibus =
-    (lib.recursiveUpdate root { pops.self = inputs.self.pops.self; })
+    (lib.recursiveUpdate root {pops.self = inputs.self.pops.self;})
     // root.flakeOutputs;
 }
diff --git a/src/lib/mapLoadToPops.nix b/src/lib/mapLoadToPops.nix
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-{ lib }:
+{lib}:
 pops: load:
 lib.mapAttrsRecursiveCond ((as: !(as ? "addLoadExtender")))
   (n: v: v.addLoadExtender (load n v))