diff --git a/ci.nix b/ci.nix
index 47d2236..8fc5b46 100644
--- a/ci.nix
+++ b/ci.nix
@@ -9,7 +9,7 @@
 # then your CI will be able to build and cache only those packages for
 # which this is possible.
 
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs ? import <nixpkgs> { } }:
 
 with builtins;
 
@@ -29,10 +29,10 @@ let
     let
       f = p:
         if shouldRecurseForDerivations p then flattenPkgs p
-        else if isDerivation p then [p]
-        else [];
+        else if isDerivation p then [ p ]
+        else [ ];
     in
-      concatMap f (attrValues s);
+    concatMap f (attrValues s);
 
   outputsOf = p: map (o: p.${o}) p.outputs;
 
@@ -40,10 +40,10 @@ let
 
   nurPkgs =
     flattenPkgs
-    (listToAttrs
-    (map (n: nameValuePair n nurAttrs.${n})
-    (filter (n: !isReserved n)
-    (attrNames nurAttrs))));
+      (listToAttrs
+        (map (n: nameValuePair n nurAttrs.${n})
+          (filter (n: !isReserved n)
+            (attrNames nurAttrs))));
 
 in
 
diff --git a/pkgs/applications/editors/jetbrains/common-plugins.nix b/pkgs/applications/editors/jetbrains/common-plugins.nix
index 734055c..3f5ad2f 100644
--- a/pkgs/applications/editors/jetbrains/common-plugins.nix
+++ b/pkgs/applications/editors/jetbrains/common-plugins.nix
@@ -21,21 +21,25 @@ let
     ];
   };
 
-  generateCommon = lib.makeOverridable ({
-    common ? ./manual-common-packages.nix
-  }: let
+  generateCommon = lib.makeOverridable (
+    { common ? ./manual-common-packages.nix
+    }:
+    let
 
-    imported = import common {
-      inherit (self) callPackage;
-    };
+      imported = import common {
+        inherit (self) callPackage;
+      };
 
-    super = imported;
+      super = imported;
 
-    overrides = { };
+      overrides = { };
 
-    jetbrainsPlugins = super // overrides;
+      jetbrainsPlugins = super // overrides;
 
-  in jetbrainsPlugins // { inherit commonBuild; });
+    in
+    jetbrainsPlugins // { inherit commonBuild; }
+  );
 
-in generateCommon { }
+in
+generateCommon { }
 
diff --git a/pkgs/applications/editors/jetbrains/idea-plugins.nix b/pkgs/applications/editors/jetbrains/idea-plugins.nix
index 33188ec..9ea1ac7 100644
--- a/pkgs/applications/editors/jetbrains/idea-plugins.nix
+++ b/pkgs/applications/editors/jetbrains/idea-plugins.nix
@@ -9,21 +9,25 @@ let
     jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
   };
 
-  generateIdea = lib.makeOverridable ({
-    idea ? ./manual-idea-packages.nix
-  }: let
+  generateIdea = lib.makeOverridable (
+    { idea ? ./manual-idea-packages.nix
+    }:
+    let
 
-    imported = import idea {
-      inherit (self) callPackage;
-    };
+      imported = import idea {
+        inherit (self) callPackage;
+      };
 
-    super = imported;
+      super = imported;
 
-    overrides = { };
+      overrides = { };
 
-    ideaPlugins = super // overrides;
+      ideaPlugins = super // overrides;
 
-  in ideaPlugins // { inherit ideaBuild; });
+    in
+    ideaPlugins // { inherit ideaBuild; }
+  );
 
-in generateIdea { }
+in
+generateIdea { }
 
diff --git a/pkgs/tools/misc/spotify-ripper/default.nix b/pkgs/tools/misc/spotify-ripper/default.nix
index d653d20..c13bf3c 100644
--- a/pkgs/tools/misc/spotify-ripper/default.nix
+++ b/pkgs/tools/misc/spotify-ripper/default.nix
@@ -5,20 +5,27 @@
 , python3Packages
 , lame
 
-, aacSupport ? false, faac
-, alacSupport ? false, libav
-, flacSupport ? false, flac
-, m4aSupport ? false, mp4Support ? false, fdk-aac-encoder
-, oggSupport ? false, vorbisTools
-, opusSupport ? false, opusTools
+, aacSupport ? false
+, faac
+, alacSupport ? false
+, libav
+, flacSupport ? false
+, flac
+, m4aSupport ? false
+, mp4Support ? false
+, fdk-aac-encoder
+, oggSupport ? false
+, vorbisTools
+, opusSupport ? false
+, opusTools
 }:
 
-assert aacSupport               -> faac.meta.available;
-assert alacSupport              -> libav.meta.available;
-assert flacSupport              -> flac.meta.available;
+assert aacSupport -> faac.meta.available;
+assert alacSupport -> libav.meta.available;
+assert flacSupport -> flac.meta.available;
 assert m4aSupport || mp4Support -> fdk-aac-encoder.meta.available;
-assert oggSupport               -> vorbisTools.meta.available;
-assert opusSupport              -> opusTools.meta.available;
+assert oggSupport -> vorbisTools.meta.available;
+assert opusSupport -> opusTools.meta.available;
 
 python3Packages.buildPythonApplication rec {
   pname = "spotify-ripper";
diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix
index 03bd65f..fff71ea 100644
--- a/pkgs/tools/misc/ytarchive/default.nix
+++ b/pkgs/tools/misc/ytarchive/default.nix
@@ -3,7 +3,8 @@
 , fetchFromGitHub
 
 , python3
-, ffmpeg }:
+, ffmpeg
+}:
 
 stdenv.mkDerivation rec {
   pname = "ytarchive";
diff --git a/pkgs/top-level/jetbrains-plugins.nix b/pkgs/top-level/jetbrains-plugins.nix
index badfac5..75d26bf 100644
--- a/pkgs/top-level/jetbrains-plugins.nix
+++ b/pkgs/top-level/jetbrains-plugins.nix
@@ -20,14 +20,16 @@ let
     inherit lib;
   };
 
-in lib.makeScope newScope (self: lib.makeOverridable ({
-  jetbrainsPlugins ? mkJetbrainsPlugins self
-  , ideaPlugins ? mkIdeaPlugins self
-}: ({ }
-  // jetbrainsPlugins // { inherit jetbrainsPlugins; }
-  // ideaPlugins // { inherit ideaPlugins; }
-  // {
+in
+lib.makeScope newScope (self: lib.makeOverridable
+  ({ jetbrainsPlugins ? mkJetbrainsPlugins self
+   , ideaPlugins ? mkIdeaPlugins self
+   }: ({ }
+    // jetbrainsPlugins // { inherit jetbrainsPlugins; }
+    // ideaPlugins // { inherit ideaPlugins; }
+    // {
     inherit variant;
     jetbrainsWithPlugins = jetbrainsWithPlugins self variant;
   })
-) { })
+  )
+  { })