clean up packages and overlays

outputs.nix

@@ -39,7 +39,7 @@
 
   nixosModules = import ./nixos/modules inputs;
 
-  overlays = import ./overlays;
+  overlays = import ./overlays.nix;
 
   hydraJobs = import ./hydra-jobs.nix inputs;
 

overlays.nix

@@ -0,0 +1,41 @@
+{
+  tubslatex = final: prev: {
+    # Based on https://gist.github.com/clefru/9ed1186bf0b76d27e0ad20cbd9966b87
+    tubslatex =
+      prev.lib.overrideDerivation
+        (prev.texlive.combine {
+          inherit (prev.texlive) scheme-full;
+          tubslatex.pkgs = [ (prev.callPackage ../pkgs/tubslatex { }) ];
+        })
+        (oldAttrs: {
+          postBuild =
+            ''
+              # Save the udpmap.cfg because texlive.combine removes it.
+              cat $out/share/texmf/web2c/updmap.cfg > $out/share/texmf/web2c/updmap.cfg.1
+            ''
+            + oldAttrs.postBuild
+            + ''
+              # Move updmap.cfg into its original place and rerun mktexlsr, so that kpsewhich finds it
+              rm $out/share/texmf/web2c/updmap.cfg || true
+              cat $out/share/texmf/web2c/updmap.cfg.1 > $out/share/texmf/web2c/updmap.cfg
+              rm $out/share/texmf/web2c/updmap.cfg.1
+              perl `type -P mktexlsr.pl` $out/share/texmf
+              yes | perl `type -P updmap.pl` --sys --syncwithtrees --force || true
+              perl `type -P updmap.pl` --sys --enable Map=NexusProSerif.map --enable Map=NexusProSans.map
+              # Regenerate .map files.
+              perl `type -P updmap.pl` --sys
+            '';
+        });
+  };
+
+  kanboard = final: prev: {
+    kanboard = prev.kanboard.overrideAttrs (oldAttrs: {
+      src = prev.fetchFromGitHub {
+        owner = "kanboard";
+        repo = "kanboard";
+        rev = "v${oldAttrs.version}";
+        sha256 = "sha256-WG2lTPpRG9KQpRdb+cS7CqF4ZDV7JZ8XtNqAI6eVzm0=";
+      };
+    });
+  };
+}

overlays/default.nix

@@ -1,15 +0,0 @@
-let
-  python3Packages = import ./python3-packages.nix;
-in
-{
-  kanboard = final: prev: {
-    kanboard = prev.kanboard.overrideAttrs (oldAttrs: {
-      src = prev.fetchFromGitHub {
-        owner = "kanboard";
-        repo = "kanboard";
-        rev = "v${oldAttrs.version}";
-        sha256 = "sha256-WG2lTPpRG9KQpRdb+cS7CqF4ZDV7JZ8XtNqAI6eVzm0=";
-      };
-    });
-  };
-}

overlays/python3-packages.nix

@@ -1,7 +0,0 @@
-self: super: {
-  python3Packages =
-    super.python3Packages
-    // super.recurseIntoAttrs (
-      super.python3Packages.callPackage ../pkgs/python-pkgs { }
-    );
-}

overlays/tubslatex.nix

@@ -1,28 +0,0 @@
-self: super: {
-  # Based on https://gist.github.com/clefru/9ed1186bf0b76d27e0ad20cbd9966b87
-  tubslatex =
-    super.lib.overrideDerivation
-      (super.texlive.combine {
-        inherit (super.texlive) scheme-full;
-        tubslatex.pkgs = [ (super.callPackage ../pkgs/tubslatex { }) ];
-      })
-      (oldAttrs: {
-        postBuild =
-          ''
-            # Save the udpmap.cfg because texlive.combine removes it.
-            cat $out/share/texmf/web2c/updmap.cfg > $out/share/texmf/web2c/updmap.cfg.1
-          ''
-          + oldAttrs.postBuild
-          + ''
-            # Move updmap.cfg into its original place and rerun mktexlsr, so that kpsewhich finds it
-            rm $out/share/texmf/web2c/updmap.cfg || true
-            cat $out/share/texmf/web2c/updmap.cfg.1 > $out/share/texmf/web2c/updmap.cfg
-            rm $out/share/texmf/web2c/updmap.cfg.1
-            perl `type -P mktexlsr.pl` $out/share/texmf
-            yes | perl `type -P updmap.pl` --sys --syncwithtrees --force || true
-            perl `type -P updmap.pl` --sys --enable Map=NexusProSerif.map --enable Map=NexusProSans.map
-            # Regenerate .map files.
-            perl `type -P updmap.pl` --sys
-          '';
-      });
-}

pkgs/python-pkgs/default.nix

@@ -1 +0,0 @@
-{ callPackage }: { }