diff --git a/flake.nix b/flake.nix
index 3f6867e6..99a90fb0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,7 @@
 
   outputs = inputs:
     let
-      overlay = import ./overlays;
+      overlay = import ./overlays { inherit inputs; };
       overlays = with inputs; [
         overlay
         nur.overlay
@@ -111,18 +111,11 @@
       templates = import ./templates;
 
     } // inputs.utils.lib.eachDefaultSystem (system:
-      let
-        inherit (inputs.nix-colors.lib { inherit pkgs; }) gtkThemeFromScheme;
-        inherit (inputs.nix-colors) colorSchemes;
-        inherit (builtins) mapAttrs;
-        pkgs = import inputs.nixpkgs { inherit system overlays; };
-      in
+      let pkgs = import inputs.nixpkgs { inherit system overlays; }; in
       {
         # Allows 'nix build .#package-name', including vanilla, overlayed, and custom packages
-        packages = pkgs // {
-          # Add custom generated gtk themes
-          generated-gtk-themes = mapAttrs (_: scheme: gtkThemeFromScheme { inherit scheme; }) colorSchemes;
-        };
+        packages = pkgs;
+
         # 'nix develop' for bootstrapping
         devShell = pkgs.mkShell {
           buildInputs = with pkgs; [ home-manager git ];
diff --git a/overlays/default.nix b/overlays/default.nix
index f4fb9f10..f53569d8 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,4 +1,10 @@
-final: prev:
+{ inputs, ... }: final: prev:
+let
+  inherit (inputs.nix-colors.lib { pkgs = final; }) gtkThemeFromScheme;
+  inherit (inputs.nix-colors) colorSchemes;
+  inherit (builtins) mapAttrs;
+  inherit (final) fetchFromGitHub;
+in
 {
   vimPlugins = prev.vimPlugins // {
     vim-numbertoggle = prev.vimPlugins.vim-numbertoggle.overrideAttrs
@@ -10,7 +16,7 @@ final: prev:
     vim-nix = prev.vimPlugins.vim-nix.overrideAttrs
       (_oldAttrs: rec {
         version = "2022-02-20";
-        src = final.fetchFromGitHub {
+        src = fetchFromGitHub {
           owner = "hqurve";
           repo = "vim-nix";
           rev = "26abd9cb976b5f4da6da02ee81449a959027b958";
@@ -33,4 +39,6 @@ final: prev:
     patches = (oldAttrs.patches or [ ]) ++ [ ./wofi-run-shell.patch ];
   });
 
+  generated-gtk-themes = mapAttrs (_: scheme: gtkThemeFromScheme { inherit scheme; }) colorSchemes;
+
 } // import ../pkgs { pkgs = final; }