treewide: reformat

effects.nix

@@ -54,10 +54,9 @@ in
               inherit (herculesCI) config;
               inherit pkgs;
             };
-            cachixCommands =
+            cachixCommands = lib.concatMapStringsSep "\n" (
-              lib.concatMapStringsSep "\n"
+              { name, drv }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}"
-                ({ name, drv }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}")
+            ) collected;
-                collected;
           in
           hci-effects.runIf (herculesCI.config.repo.branch == "main") (
             hci-effects.mkEffect {
@@ -93,13 +92,11 @@ in
         let
           systems = lib.groupBy ({ drv, ... }: drv.system) legacyPackages.outputsList;
         in
-        lib.concatMapStringsSep "\n"
+        lib.concatMapStringsSep "\n" (
-          (
           { name, value }:
           ''
             ${name}=${builtins.toJSON (map (d: d.name) value)}
           ''
-          )
+        ) (lib.attrsToList systems);
-          (lib.attrsToList systems);
     };
 }

flake.nix

@@ -133,7 +133,8 @@
     };
   };
 
-  /* TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
+  /*
+    TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
     nixConfig = {
       extra-substituters = [
         "https://hyprland.cachix.org"

hosts/hijiri/skhd.nix

@@ -5,16 +5,13 @@
     skhdConfig =
       let
         spaceCount = 6;
-        spaceBindings =
+        spaceBindings = lib.genList (
-          lib.genList
-            (
           i:
           let
             num = toString (i + 1);
           in
           "cmd - ${num} : yabai -m space --focus ${num}"
-            )
+        ) spaceCount;
-            spaceCount;
       in
       ''
         cmd - return : wezterm

hosts/legion/desktop.nix

@@ -41,14 +41,11 @@
 
   hardware.steam-hardware.enable = true;
 
-  services.logind =
+  services.logind = lib.genAttrs [
-    lib.genAttrs
-      [
     "lidSwitch"
     "lidSwitchDocked"
     "lidSwitchExternalPower"
-      ]
+  ] (_: "ignore");
-      (_: "ignore");
 
   services.pipewire = {
     enable = true;

hosts/legion/disks.nix

@@ -1,5 +1,6 @@
 args:
-/* let
+/*
+  let
     bootDevice = args.bootDevice or "/dev/nvme0n1";
   in
 */

modules/system/common/github-runner.nix

@@ -22,8 +22,7 @@ let
     services.github-runners = lib.pipe cfg.runners [
       (lib.mapAttrsToList (
         name: cfg:
-        lib.genList
+        lib.genList (
-          (
           i:
           lib.nameValuePair "${name}-${toString i}" {
             enable = true;
@@ -36,8 +35,7 @@ let
             };
             extraLabels = [ "nix" ];
           }
-          )
+        ) cfg.instances
-          cfg.instances
       ))
       lib.flatten
       lib.listToAttrs

modules/system/settei/sane-defaults.nix

@@ -43,8 +43,7 @@ let
         let
           configName' =
             args.configurationName
-              or (throw "pass configurationName to module arguments or set users.users.${username}.openssh.authorizedKeys yourself"
+              or (throw "pass configurationName to module arguments or set users.users.${username}.openssh.authorizedKeys yourself");
-              );
           filteredKeys = lib.filterAttrs (name: _: name != configName') cfg.allSshKeys;
         in
         lib.mkDefault (lib.attrValues filteredKeys);

wrappers/fish/default.nix

@@ -12,9 +12,9 @@
         prependFlags =
           let
             # Can't rely on pathAdd because fish used as login shell will ignore the variables the wrapper sets up
-            path-add-lines =
+            path-add-lines = lib.concatMapStringsSep "\n" (
-              lib.concatMapStringsSep "\n" (pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'")
+              pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'"
-                config.pathAdd;
+            ) config.pathAdd;
             config-fish = pkgs.writeText "config.fish" ''
               ${path-add-lines}