diff --git a/overlays/30-ghc.nix b/overlays/30-ghc.nix
deleted file mode 100644
index 4536d343..00000000
--- a/overlays/30-ghc.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-final: prev:
-let
-  inherit (prev.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
-  makeHaskellScriptPackages = p: {
-    inherit (p)
-      aeson shh string-interpolate relude replace-megaparsec async say
-      megaparsec fdo-notify these fsnotify
-      ;
-  };
-  makeHaskellPackages = p:
-    {
-      inherit (p)
-        brittany ormolu releaser cabal-fmt stack ghcid ghcide arbtt iCalendar
-        pretty-simple tz stm-containers streamly haskell-language-server
-        cabal-install dhall taskwarrior pandoc hlint cabal2nix weeder
-        reflex-dom password optics shh-extras neuron hspec-discover paths
-        hmatrix postgresql-simple snap hedgehog nix-derivation req
-        witch
-        ;
-    } // makeHaskellScriptPackages p;
-in
-{
-  myHaskellPackages = makeHaskellPackages prev.unstableHaskellPackages;
-  myHaskellScriptPackages = makeHaskellScriptPackages prev.haskellPackages;
-  ghcWithPackages = prev.unstableGhc.withHoogle (p: builtins.attrValues (makeHaskellPackages p));
-}
diff --git a/overlays/30-ghc/default.nix b/overlays/30-ghc/default.nix
new file mode 100644
index 00000000..bbd055f6
--- /dev/null
+++ b/overlays/30-ghc/default.nix
@@ -0,0 +1,10 @@
+final: prev:
+let
+  inherit (prev.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
+  myPkgs = import ./packages.nix;
+in
+{
+  myHaskellPackages = myPkgs.makeHaskellPackages prev.unstableHaskellPackages;
+  myHaskellScriptPackages = myPkgs.makeHaskellScriptPackages prev.haskellPackages;
+  ghcWithPackages = prev.unstableGhc.withHoogle (p: builtins.attrValues (myPkgs.makeHaskellPackages p));
+}
diff --git a/overlays/30-ghc/packages.nix b/overlays/30-ghc/packages.nix
new file mode 100644
index 00000000..01a0b326
--- /dev/null
+++ b/overlays/30-ghc/packages.nix
@@ -0,0 +1,17 @@
+rec {
+  makeHaskellScriptPackages = p: {
+    inherit (p)
+      aeson shh string-interpolate relude replace-megaparsec async say
+      megaparsec fdo-notify these fsnotify
+      ;
+  };
+  makeHaskellPackages = p:
+    {
+      inherit (p)
+        releaser cabal-fmt stack ghcid ghcide iCalendar pretty-simple
+        stm-containers streamly haskell-language-server cabal-install dhall
+        taskwarrior pandoc hlint cabal2nix weeder reflex-dom password optics
+        shh-extras neuron hmatrix postgresql-simple nix-derivation req witch
+        ;
+    } // makeHaskellScriptPackages p;
+}
diff --git a/overlays/30-ghc/ummaintained-packages.nix b/overlays/30-ghc/ummaintained-packages.nix
new file mode 100644
index 00000000..d5aaabc7
--- /dev/null
+++ b/overlays/30-ghc/ummaintained-packages.nix
@@ -0,0 +1,7 @@
+let
+  pkgs = import (import ../../nix/sources.nix).nixos-unstable { };
+  inherit (pkgs) lib;
+  myPkgs = (import ./packages.nix).makeHaskellPackages (pkgs.haskellPackages);
+in
+lib.attrNames (lib.filterAttrs (_: pkg: [ ] == pkg.meta.maintainers or [ ]) myPkgs)
+