diff --git a/flake.nix b/flake.nix
index 7a31516f..7655df50 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,5 +37,12 @@
       osu-backgrounds = callPackage ./packages/osu-backgrounds.nix { };
       webp-thumbnailer = callPackage ./packages/webp-thumbnailer.nix { };
     };
+
+    overlays = {
+      base16-schemes = import ./overlays/base16-schemes.nix;
+      kitty = import ./overlays/kitty.nix;
+      srb2 = import ./overlays/srb2.nix;
+      zola = import ./overlays/zola.nix;
+    };
   };
 }
diff --git a/overlays/base16-schemes.nix b/overlays/base16-schemes.nix
index 272375fc..64cce17a 100644
--- a/overlays/base16-schemes.nix
+++ b/overlays/base16-schemes.nix
@@ -1,25 +1,21 @@
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      base16-schemes = prev.base16-schemes.overrideAttrs (oldAttrs: {
-        version = "unstable-2023-05-02";
+(final: prev: {
+  base16-schemes = prev.base16-schemes.overrideAttrs (oldAttrs: {
+    version = "unstable-2023-05-02";
 
-        src = prev.fetchFromGitHub {
-          owner = "tinted-theming";
-          repo = "base16-schemes";
-          rev = "9a4002f78dd1094c123169da243680b2fda3fe69";
-          hash = "sha256-AngNF++RZQB0l4M8pRgcv66pAcIPY+cCwmUOd+RBJKA=";
-        };
+    src = prev.fetchFromGitHub {
+      owner = "tinted-theming";
+      repo = "base16-schemes";
+      rev = "9a4002f78dd1094c123169da243680b2fda3fe69";
+      hash = "sha256-AngNF++RZQB0l4M8pRgcv66pAcIPY+cCwmUOd+RBJKA=";
+    };
 
-        installPhase = ''
-          runHook preInstall
+    installPhase = ''
+      runHook preInstall
 
-          mkdir -p $out/share/themes/
-          install *.yaml $out/share/themes/
+      mkdir -p $out/share/themes/
+      install *.yaml $out/share/themes/
 
-          runHook postInstall
-        '';
-      });
-    })
-  ];
-}
+      runHook postInstall
+    '';
+  });
+})
diff --git a/overlays/default.nix b/overlays/default.nix
index 7eaf718a..45383cb3 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,8 +1,8 @@
 {
-  imports = [
-    ./base16-schemes.nix
-    ./kitty.nix
-    ./srb2.nix
-    ./zola.nix
+  nixpkgs.overlays = [
+    (import ./base16-schemes.nix)
+    (import ./kitty.nix)
+    (import ./srb2.nix)
+    (import ./zola.nix)
   ];
 }
diff --git a/overlays/kitty.nix b/overlays/kitty.nix
index d998e92b..52a4d3fc 100644
--- a/overlays/kitty.nix
+++ b/overlays/kitty.nix
@@ -1,26 +1,22 @@
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      kitty = prev.kitty.overrideAttrs (oldAttrs: rec {
-        version = "0.31.0";
+(final: prev: {
+  kitty = prev.kitty.overrideAttrs (oldAttrs: rec {
+    version = "0.31.0";
 
-        src = prev.fetchFromGitHub {
-          owner = "kovidgoyal";
-          repo = "kitty";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-VWWuC4T0pyTgqPNm0gNL1j3FShU5b8S157C1dKLon1g=";
-        };
+    src = prev.fetchFromGitHub {
+      owner = "kovidgoyal";
+      repo = "kitty";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-VWWuC4T0pyTgqPNm0gNL1j3FShU5b8S157C1dKLon1g=";
+    };
 
-        goModules = (prev.buildGoModule {
-          pname = "kitty-go-modules";
-          inherit src version;
-          vendorHash = "sha256-OyZAWefSIiLQO0icxMIHWH3BKgNas8HIxLcse/qWKcU=";
-        }).goModules;
+    goModules = (prev.buildGoModule {
+      pname = "kitty-go-modules";
+      inherit src version;
+      vendorHash = "sha256-OyZAWefSIiLQO0icxMIHWH3BKgNas8HIxLcse/qWKcU=";
+    }).goModules;
 
-        patches = (oldAttrs.patches or [ ]) ++ [
-          ../patches/kitty-wlroots-copying-fix.patch
-        ];
-      });
-    })
-  ];
-}
+    patches = (oldAttrs.patches or [ ]) ++ [
+      ../patches/kitty-wlroots-copying-fix.patch
+    ];
+  });
+})
diff --git a/overlays/srb2.nix b/overlays/srb2.nix
index d5d2c149..095f2289 100644
--- a/overlays/srb2.nix
+++ b/overlays/srb2.nix
@@ -1,20 +1,16 @@
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      srb2 = prev.srb2.overrideAttrs (oldAttrs: {
-        desktopItems = [
-          (prev.makeDesktopItem rec {
-            name = "Sonic Robo Blast 2";
-            exec = oldAttrs.pname;
-            icon = oldAttrs.pname;
-            comment = oldAttrs.meta.description;
-            desktopName = name;
-            genericName = name;
-            startupWMClass = ".srb2-wrapped";
-            categories = [ "Game" ];
-          })
-        ];
-      });
-    })
-  ];
-}
+(final: prev: {
+  srb2 = prev.srb2.overrideAttrs (oldAttrs: {
+    desktopItems = [
+      (prev.makeDesktopItem rec {
+        name = "Sonic Robo Blast 2";
+        exec = oldAttrs.pname;
+        icon = oldAttrs.pname;
+        comment = oldAttrs.meta.description;
+        desktopName = name;
+        genericName = name;
+        startupWMClass = ".srb2-wrapped";
+        categories = [ "Game" ];
+      })
+    ];
+  });
+})
diff --git a/overlays/zola.nix b/overlays/zola.nix
index 28589a93..85891f09 100644
--- a/overlays/zola.nix
+++ b/overlays/zola.nix
@@ -1,9 +1,5 @@
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      zola = prev.zola.overrideAttrs (oldAttrs: {
-        patches = (oldAttrs.patches or [ ]) ++ [ ../patches/zola-serve-fix.patch ];
-      });
-    })
-  ];
-}
+(final: prev: {
+  zola = prev.zola.overrideAttrs (oldAttrs: {
+    patches = (oldAttrs.patches or [ ]) ++ [ ../patches/zola-serve-fix.patch ];
+  });
+})