diff --git a/effects.nix b/effects.nix
index ecc2081..aa9906a 100644
--- a/effects.nix
+++ b/effects.nix
@@ -54,10 +54,9 @@ in
               inherit (herculesCI) config;
               inherit pkgs;
             };
-            cachixCommands =
-              lib.concatMapStringsSep "\n"
-                ({ name, drv }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}")
-                collected;
+            cachixCommands = lib.concatMapStringsSep "\n" (
+              { name, drv }: "cachix pin nrabulinski ${lib.escapeShellArg name} ${lib.escapeShellArg drv}"
+            ) 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"
-          (
-            { name, value }:
-            ''
-              ${name}=${builtins.toJSON (map (d: d.name) value)}
-            ''
-          )
-          (lib.attrsToList systems);
+        lib.concatMapStringsSep "\n" (
+          { name, value }:
+          ''
+            ${name}=${builtins.toJSON (map (d: d.name) value)}
+          ''
+        ) (lib.attrsToList systems);
     };
 }
diff --git a/flake.nix b/flake.nix
index 770a8b6..4a36c39 100644
--- a/flake.nix
+++ b/flake.nix
@@ -133,24 +133,25 @@
     };
   };
 
-  /* TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
-     nixConfig = {
-       extra-substituters = [
-         "https://hyprland.cachix.org"
-         "https://cache.garnix.io"
-         "https://nix-community.cachix.org"
-         "https://hercules-ci.cachix.org"
-         "https://nrabulinski.cachix.org"
-         "https://cache.nrab.lol"
-       ];
-       extra-trusted-public-keys = [
-         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-         "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-         "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
-         "nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic="
-         "cache.nrab.lol-1:CJl1TouOyuJ1Xh4tZSXLwm3Upt06HzUNZmeyuEB9EZg="
-       ];
-     };
+  /*
+    TODO: Uncomment once (if ever?) nixConfig makes sense in flakes
+    nixConfig = {
+      extra-substituters = [
+        "https://hyprland.cachix.org"
+        "https://cache.garnix.io"
+        "https://nix-community.cachix.org"
+        "https://hercules-ci.cachix.org"
+        "https://nrabulinski.cachix.org"
+        "https://cache.nrab.lol"
+      ];
+      extra-trusted-public-keys = [
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
+        "nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic="
+        "cache.nrab.lol-1:CJl1TouOyuJ1Xh4tZSXLwm3Upt06HzUNZmeyuEB9EZg="
+      ];
+    };
   */
 }
diff --git a/hosts/hijiri/skhd.nix b/hosts/hijiri/skhd.nix
index fb3afb7..fd7f9c3 100644
--- a/hosts/hijiri/skhd.nix
+++ b/hosts/hijiri/skhd.nix
@@ -5,16 +5,13 @@
     skhdConfig =
       let
         spaceCount = 6;
-        spaceBindings =
-          lib.genList
-            (
-              i:
-              let
-                num = toString (i + 1);
-              in
-              "cmd - ${num} : yabai -m space --focus ${num}"
-            )
-            spaceCount;
+        spaceBindings = lib.genList (
+          i:
+          let
+            num = toString (i + 1);
+          in
+          "cmd - ${num} : yabai -m space --focus ${num}"
+        ) spaceCount;
       in
       ''
         cmd - return : wezterm
diff --git a/hosts/legion/desktop.nix b/hosts/legion/desktop.nix
index a8e73a5..b9bd21a 100644
--- a/hosts/legion/desktop.nix
+++ b/hosts/legion/desktop.nix
@@ -41,14 +41,11 @@
 
   hardware.steam-hardware.enable = true;
 
-  services.logind =
-    lib.genAttrs
-      [
-        "lidSwitch"
-        "lidSwitchDocked"
-        "lidSwitchExternalPower"
-      ]
-      (_: "ignore");
+  services.logind = lib.genAttrs [
+    "lidSwitch"
+    "lidSwitchDocked"
+    "lidSwitchExternalPower"
+  ] (_: "ignore");
 
   services.pipewire = {
     enable = true;
diff --git a/hosts/legion/disks.nix b/hosts/legion/disks.nix
index 89c0339..55f4317 100644
--- a/hosts/legion/disks.nix
+++ b/hosts/legion/disks.nix
@@ -1,7 +1,8 @@
 args:
-/* let
-     bootDevice = args.bootDevice or "/dev/nvme0n1";
-   in
+/*
+  let
+    bootDevice = args.bootDevice or "/dev/nvme0n1";
+  in
 */
 {
   assertions = [
diff --git a/modules/system/common/github-runner.nix b/modules/system/common/github-runner.nix
index 058bea7..549630a 100644
--- a/modules/system/common/github-runner.nix
+++ b/modules/system/common/github-runner.nix
@@ -22,22 +22,20 @@ let
     services.github-runners = lib.pipe cfg.runners [
       (lib.mapAttrsToList (
         name: cfg:
-        lib.genList
-          (
-            i:
-            lib.nameValuePair "${name}-${toString i}" {
-              enable = true;
-              tokenFile = config.age.secrets.github-token.path;
-              inherit (cfg) url;
-              name = "${cfg.name}-${toString i}";
-              user = github-runner-user;
-              serviceOverrides = {
-                DynamicUser = false;
-              };
-              extraLabels = [ "nix" ];
-            }
-          )
-          cfg.instances
+        lib.genList (
+          i:
+          lib.nameValuePair "${name}-${toString i}" {
+            enable = true;
+            tokenFile = config.age.secrets.github-token.path;
+            inherit (cfg) url;
+            name = "${cfg.name}-${toString i}";
+            user = github-runner-user;
+            serviceOverrides = {
+              DynamicUser = false;
+            };
+            extraLabels = [ "nix" ];
+          }
+        ) cfg.instances
       ))
       lib.flatten
       lib.listToAttrs
diff --git a/modules/system/settei/sane-defaults.nix b/modules/system/settei/sane-defaults.nix
index e25d87f..03fe86b 100644
--- a/modules/system/settei/sane-defaults.nix
+++ b/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);
diff --git a/wrappers/fish/default.nix b/wrappers/fish/default.nix
index 8b3167f..373fed8 100644
--- a/wrappers/fish/default.nix
+++ b/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 =
-              lib.concatMapStringsSep "\n" (pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'")
-                config.pathAdd;
+            path-add-lines = lib.concatMapStringsSep "\n" (
+              pkg: "fish_add_path --path --prepend '${lib.getExe' pkg ""}'"
+            ) config.pathAdd;
             config-fish = pkgs.writeText "config.fish" ''
               ${path-add-lines}