Massive nixfmt reformatting

home/modules/programs/my-kakoune/default.nix

@@ -1,11 +1,20 @@
-{ config, options, pkgs, lib, ... }:
+{
+  config,
+  options,
+  pkgs,
+  lib,
+  ...
+}:
 
 with lib;
 let
   cfg = config.programs.my-kakoune;
 in
 {
-  imports = [ ./fish-session.nix ./tree-sitter.nix ];
+  imports = [
+    ./fish-session.nix
+    ./tree-sitter.nix
+  ];
 
   options.programs.my-kakoune = {
     enable = mkEnableOption "My version of the kakoune configuration";
@@ -38,7 +47,11 @@ in
       let
         kakouneFaces =
           let
-            txt = strings.concatStringsSep "\n" (builtins.attrValues (builtins.mapAttrs (name: face: "face global ${name} \"${face}\"") cfg.extraFaces));
+            txt = strings.concatStringsSep "\n" (
+              builtins.attrValues (
+                builtins.mapAttrs (name: face: "face global ${name} \"${face}\"") cfg.extraFaces
+              )
+            );
           in
           pkgs.writeText "faces.kak" txt;
       in
@@ -51,15 +64,13 @@ in
           # Load faces
           source ${kakouneFaces}
         '';
-      } // lib.mapAttrs'
-        (name: attrs: {
-          name = "kak/autoload/${name}";
-          value = attrs // {
-            target = "kak/autoload/${name}";
-          };
-        })
-        cfg.autoloadFile;
+      }
+      // lib.mapAttrs' (name: attrs: {
+        name = "kak/autoload/${name}";
+        value = attrs // {
+          target = "kak/autoload/${name}";
+        };
+      }) cfg.autoloadFile;
     xdg.dataFile."kak".source = "${cfg.package}/share/kak";
   };
 }
-

home/modules/programs/my-kakoune/fish-session.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 with lib;
 let

home/modules/programs/my-kakoune/tree-sitter.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib;
 let
   cfg = config.programs.my-kakoune.tree-sitter;
@@ -14,14 +19,44 @@ let
         default = "src";
       };
       grammar.compile = {
-        command = mkOption { type = types.str; default = "${pkgs.gcc}/bin/gcc"; };
-        args = mkOption { type = types.listOf types.str; default = [ "-c" "-fpic" "../parser.c" "../scanner.c" "-I" ".." ]; };
-        flags = mkOption { type = types.listOf types.str; default = [ "-O3" ]; };
+        command = mkOption {
+          type = types.str;
+          default = "${pkgs.gcc}/bin/gcc";
+        };
+        args = mkOption {
+          type = types.listOf types.str;
+          default = [
+            "-c"
+            "-fpic"
+            "../parser.c"
+            "../scanner.c"
+            "-I"
+            ".."
+          ];
+        };
+        flags = mkOption {
+          type = types.listOf types.str;
+          default = [ "-O3" ];
+        };
       };
       grammar.link = {
-        command = mkOption { type = types.str; default = "${pkgs.gcc}/bin/gcc"; };
-        args = mkOption { type = types.listOf types.str; default = [ "-shared" "-fpic" "parser.o" "scanner.o" ]; };
-        flags = mkOption { type = types.listOf types.str; default = [ "-O3" ]; };
+        command = mkOption {
+          type = types.str;
+          default = "${pkgs.gcc}/bin/gcc";
+        };
+        args = mkOption {
+          type = types.listOf types.str;
+          default = [
+            "-shared"
+            "-fpic"
+            "parser.o"
+            "scanner.o"
+          ];
+        };
+        flags = mkOption {
+          type = types.listOf types.str;
+          default = [ "-O3" ];
+        };
       };
       queries.src = mkOption {
         type = types.package;
@@ -34,12 +69,27 @@ let
     };
   };
   mkGrammarPackage =
-    { name
-    , src
-    , grammarPath ? "src"
-    , grammarCompileArgs ? [ "-O3" "-c" "-fpic" "../parser.c" "../scanner.c" "-I" ".." ]
-    , grammarLinkArgs ? [ "-shared" "-fpic" "parser.o" "scanner.o" ]
-    }: pkgs.stdenv.mkDerivation {
+    {
+      name,
+      src,
+      grammarPath ? "src",
+      grammarCompileArgs ? [
+        "-O3"
+        "-c"
+        "-fpic"
+        "../parser.c"
+        "../scanner.c"
+        "-I"
+        ".."
+      ],
+      grammarLinkArgs ? [
+        "-shared"
+        "-fpic"
+        "parser.o"
+        "scanner.o"
+      ],
+    }:
+    pkgs.stdenv.mkDerivation {
       inherit src;
       name = "kak-tree-sitter-grammar-${name}.so";
       version = "latest";
@@ -215,43 +265,54 @@ in
       toTs = name: "ts_${strings.concatStringsSep "_" (strings.splitString "." name)}";
       toScm = name: strings.concatStringsSep "." (strings.splitString "_" name);
 
-      definedFaces = attrsets.mapAttrs' (name: value: { inherit value; name = toTs name; }) allGroups;
-      aliasFaces = attrsets.mapAttrs' (name: value: { name = toTs name; value = "@${toTs value}"; }) aliases;
+      definedFaces = attrsets.mapAttrs' (name: value: {
+        inherit value;
+        name = toTs name;
+      }) allGroups;
+      aliasFaces = attrsets.mapAttrs' (name: value: {
+        name = toTs name;
+        value = "@${toTs value}";
+      }) aliases;
       faces = attrsets.recursiveUpdate definedFaces aliasFaces;
 
       toml = pkgs.formats.toml { };
 
-      toLanguageConf = name: lang: with lang; {
-        grammar = {
-          source.local.path = mkGrammarPackage {
-            inherit name;
-            src = grammar.src;
-            grammarPath = grammar.path;
-            grammarCompileArgs = grammar.compile.flags ++ grammar.compile.args;
-            grammarLinkArgs = grammar.link.flags ++ grammar.link.args;
+      toLanguageConf =
+        name: lang: with lang; {
+          grammar = {
+            source.local.path = mkGrammarPackage {
+              inherit name;
+              src = grammar.src;
+              grammarPath = grammar.path;
+              grammarCompileArgs = grammar.compile.flags ++ grammar.compile.args;
+              grammarLinkArgs = grammar.link.flags ++ grammar.link.args;
+            };
+            compile = grammar.compile.command;
+            compile_args = grammar.compile.args;
+            compile_flags = grammar.compile.flags;
+            link = grammar.link.command;
+            link_args = grammar.link.args ++ [
+              "-o"
+              "${name}.so"
+            ];
+            link_flags = grammar.link.flags;
+          };
+          queries = rec {
+            path = if queries.path == null then "runtime/queries/${name}" else queries.path;
+            source.local.path = "${queries.src}/${path}";
           };
-          compile = grammar.compile.command;
-          compile_args = grammar.compile.args;
-          compile_flags = grammar.compile.flags;
-          link = grammar.link.command;
-          link_args = grammar.link.args ++ [ "-o" "${name}.so" ];
-          link_flags = grammar.link.flags;
         };
-        queries = rec {
-          path = if queries.path == null then "runtime/queries/${name}" else queries.path;
-          source.local.path = "${queries.src}/${path}";
-        };
-      };
     in
     mkIf cfg.enable {
-      assertions = with lib.asserts; ([ ]
-        ++ attrsets.mapAttrsToList
-        (name: _: {
-          assertion = (! (builtins.hasAttr name allGroups));
-          message = "${name} was both defined and aliased";
-        })
-        aliases
-      );
+      assertions =
+        with lib.asserts;
+        (
+          [ ]
+          ++ attrsets.mapAttrsToList (name: _: {
+            assertion = (!(builtins.hasAttr name allGroups));
+            message = "${name} was both defined and aliased";
+          }) aliases
+        );
       home.packages = [ cfg.package ];
 
       xdg.configFile."kak-tree-sitter/config.toml" = {
@@ -271,4 +332,3 @@ in
     };
 
 }
-