treewide: Reformat with nixfmt

DataHearth · May 5, 2024 · 62f32bf · 62f32bf
1 parent c628126
commit 62f32bf
Show file tree

Hide file tree

Showing 459 changed files with 28,030 additions and 26,268 deletions.
diff --git a/default.nix b/default.nix
@@ -1,14 +1,11 @@
-(
-  import
-  (
-    let
-      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    in
-      fetchTarball {
-        url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-        sha256 = lock.nodes.flake-compat.locked.narHash;
-      }
-  )
-  {src = ./.;}
-)
-.defaultNix
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
+  fetchTarball {
+    url =
+      lock.nodes.flake-compat.locked.url
+        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash;
+  }
+) { src = ./.; }).defaultNix
diff --git a/docs/default.nix b/docs/default.nix
@@ -2,18 +2,19 @@
   rawModules,
   helpers,
   pkgs,
-}: let
+}:
+let
   pkgsDoc =
-    import (pkgs.applyPatches {
-      name = "nixpkgs-nixvim-doc";
-      src = pkgs.path;
-      patches = [
-        ./either_recursive.patch
-      ];
-    }) {
-      inherit (pkgs) system;
-      config.allowUnfree = true;
-    };
+    import
+      (pkgs.applyPatches {
+        name = "nixpkgs-nixvim-doc";
+        src = pkgs.path;
+        patches = [ ./either_recursive.patch ];
+      })
+      {
+        inherit (pkgs) system;
+        config.allowUnfree = true;
+      };
 
   inherit (pkgsDoc) lib;
 
@@ -24,21 +25,21 @@
     name = "<${repo}/${subpath}>";
   };
 
-  transformOptions = opt:
+  transformOptions =
+    opt:
     opt
     // {
-      declarations =
-        map (
-          decl:
-            if lib.hasPrefix nixvimPath (toString decl)
-            then
-              gitHubDeclaration "nix-community" "nixvim" "main"
-              (lib.removePrefix "/" (lib.removePrefix nixvimPath (toString decl)))
-            else if decl == "lib/modules.nix"
-            then gitHubDeclaration "NixOS" "nixpkgs" "master" decl
-            else decl
-        )
-        opt.declarations;
+      declarations = map (
+        decl:
+        if lib.hasPrefix nixvimPath (toString decl) then
+          gitHubDeclaration "nix-community" "nixvim" "main" (
+            lib.removePrefix "/" (lib.removePrefix nixvimPath (toString decl))
+          )
+        else if decl == "lib/modules.nix" then
+          gitHubDeclaration "NixOS" "nixpkgs" "master" decl
+        else
+          decl
+      ) opt.declarations;
     };
 
   nixvmConfigType = lib.mkOptionType {
@@ -48,61 +49,51 @@
     # Evaluation is irrelevant, only used for documentation.
   };
 
-  topLevelModules =
-    [
-      ../wrappers/modules/output.nix
-      # Fake module to avoid a duplicated documentation
-      (lib.setDefaultModuleLocation "${nixvimPath}/wrappers/modules/files.nix" {
-        options.files = lib.mkOption {
-          type = lib.types.attrsOf nixvmConfigType;
-          description = "Extra files to add to the runtimepath";
-          example = {
-            "ftplugin/nix.lua" = {
-              options = {
-                tabstop = 2;
-                shiftwidth = 2;
-                expandtab = true;
-              };
+  topLevelModules = [
+    ../wrappers/modules/output.nix
+    # Fake module to avoid a duplicated documentation
+    (lib.setDefaultModuleLocation "${nixvimPath}/wrappers/modules/files.nix" {
+      options.files = lib.mkOption {
+        type = lib.types.attrsOf nixvmConfigType;
+        description = "Extra files to add to the runtimepath";
+        example = {
+          "ftplugin/nix.lua" = {
+            options = {
+              tabstop = 2;
+              shiftwidth = 2;
+              expandtab = true;
             };
           };
         };
-      })
-    ]
-    ++ (rawModules pkgsDoc);
-
-  hmOptions =
-    builtins.removeAttrs
-    (lib.evalModules {
-      modules = [
-        (import ../wrappers/modules/hm.nix {inherit lib;})
-      ];
+      };
     })
-    .options
-    ["_module"];
+  ] ++ (rawModules pkgsDoc);
+
+  hmOptions = builtins.removeAttrs (lib.evalModules {
+    modules = [ (import ../wrappers/modules/hm.nix { inherit lib; }) ];
+  }).options [ "_module" ];
 in
-  rec {
-    options-json =
-      (pkgsDoc.nixosOptionsDoc
-        {
-          inherit
-            (lib.evalModules {
-              modules = topLevelModules;
-              specialArgs.helpers = helpers;
-            })
-            options
-            ;
-          inherit transformOptions;
-          warningsAreErrors = false;
+rec {
+  options-json =
+    (pkgsDoc.nixosOptionsDoc {
+      inherit
+        (lib.evalModules {
+          modules = topLevelModules;
+          specialArgs.helpers = helpers;
         })
-      .optionsJSON;
-    man-docs = pkgsDoc.callPackage ./man {inherit options-json;};
-  }
-  # Do not check if documentation builds fine on darwin as it fails:
-  # > sandbox-exec: pattern serialization length 69298 exceeds maximum (65535)
-  // lib.optionalAttrs (!pkgsDoc.stdenv.isDarwin) {
-    docs = pkgsDoc.callPackage ./mdbook {
+        options
+        ;
       inherit transformOptions;
-      modules = topLevelModules;
-      inherit helpers hmOptions;
-    };
-  }
+      warningsAreErrors = false;
+    }).optionsJSON;
+  man-docs = pkgsDoc.callPackage ./man { inherit options-json; };
+}
+# Do not check if documentation builds fine on darwin as it fails:
+# > sandbox-exec: pattern serialization length 69298 exceeds maximum (65535)
+// lib.optionalAttrs (!pkgsDoc.stdenv.isDarwin) {
+  docs = pkgsDoc.callPackage ./mdbook {
+    inherit transformOptions;
+    modules = topLevelModules;
+    inherit helpers hmOptions;
+  };
+}
diff --git a/docs/man/default.nix b/docs/man/default.nix
@@ -4,7 +4,8 @@
   installShellFiles,
   nixos-render-docs,
   pandoc,
-}: let
+}:
+let
   manualFilter = ''
     local text = pandoc.text
 
@@ -23,26 +24,34 @@
     end
   '';
 
-  manHeader = let
-    mkMDSection = file: "<(pandoc --lua-filter <(echo \"$manualFilter\") -f gfm -t man ${file})";
-  in
-    runCommand "nixvim-general-doc-manpage" {
-      nativeBuildInputs = [pandoc];
-      inherit manualFilter;
-    } ''
-      mkdir -p $out
-      cat \
-        ${./nixvim-header-start.5} \
-        ${mkMDSection ../user-guide/helpers.md} \
-        ${mkMDSection ../user-guide/faq.md} \
-        ${./nixvim-header-end.5} \
-        >$out/nixvim-header.5
-    '';
-  # FIXME add platform specific docs to manpage
+  manHeader =
+    let
+      mkMDSection = file: "<(pandoc --lua-filter <(echo \"$manualFilter\") -f gfm -t man ${file})";
+    in
+    runCommand "nixvim-general-doc-manpage"
+      {
+        nativeBuildInputs = [ pandoc ];
+        inherit manualFilter;
+      }
+      ''
+        mkdir -p $out
+        cat \
+          ${./nixvim-header-start.5} \
+          ${mkMDSection ../user-guide/helpers.md} \
+          ${mkMDSection ../user-guide/faq.md} \
+          ${./nixvim-header-end.5} \
+          >$out/nixvim-header.5
+      '';
 in
-  runCommand "nixvim-configuration-reference-manpage" {
-    nativeBuildInputs = [installShellFiles nixos-render-docs];
-  } ''
+# FIXME add platform specific docs to manpage
+runCommand "nixvim-configuration-reference-manpage"
+  {
+    nativeBuildInputs = [
+      installShellFiles
+      nixos-render-docs
+    ];
+  }
+  ''
     # Generate man-pages
     mkdir -p $out/share/man/man5
     nixos-render-docs -j $NIX_BUILD_CORES options manpage \