diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..64b9dbd
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "nur-packages"]
+	path = nur-packages
+	url = git@github.com:dadada/nur-packages.git
diff --git a/metis.nix b/metis.nix
index 5bd2e15..32b6987 100644
--- a/metis.nix
+++ b/metis.nix
@@ -66,7 +66,7 @@ in
     unzip
     anki
     bluez-tools
-    texlive-tubs
+    texlive-tubslatex
     openssl
   ] ++ (with unstable; [
     python38Packages.managesieve
diff --git a/nur-packages b/nur-packages
new file mode 160000
index 0000000..b6c4f79
--- /dev/null
+++ b/nur-packages
@@ -0,0 +1 @@
+Subproject commit b6c4f79c929e5bf73451a24aaf98468857e1430d
diff --git a/overlays/dadada.nix b/overlays/dadada.nix
new file mode 120000
index 0000000..663bc1b
--- /dev/null
+++ b/overlays/dadada.nix
@@ -0,0 +1 @@
+../nur-packages/overlay.nix
\ No newline at end of file
diff --git a/overlays/tubslatex.nix b/overlays/texlive-tubslatex.nix
similarity index 84%
rename from overlays/tubslatex.nix
rename to overlays/texlive-tubslatex.nix
index d334826..31e9235 100644
--- a/overlays/tubslatex.nix
+++ b/overlays/texlive-tubslatex.nix
@@ -1,11 +1,9 @@
 self: super:
-let
-  tubslatex = super.callPackage ../pkgs/tubslatex.nix {};
-in {
+{
   # Based on https://gist.github.com/clefru/9ed1186bf0b76d27e0ad20cbd9966b87
-  texlive-tubs = super.lib.overrideDerivation (super.texlive.combine {
+  texlive-tubslatex = super.lib.overrideDerivation (super.texlive.combine {
     inherit (super.texlive) scheme-full;
-    tubslatex.pkgs = [ tubslatex ];
+    tubslatex.pkgs = [ super.tubslatex ];
   }) (oldAttrs: {
     postBuild = ''
        # Save the udpmap.cfg because texlive.combine removes it.
diff --git a/pkgs/tubslatex.nix b/pkgs/tubslatex.nix
deleted file mode 100644
index afa8422..0000000
--- a/pkgs/tubslatex.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  stdenv,
-  fetchzip,
-  pkgs,
-  lib,
-  ...
-}:
-stdenv.mkDerivation rec {
-  src = fetchzip {
-    url = https://gitlab.ibr.cs.tu-bs.de/tubslatex/tubslatex/-/jobs/116760/artifacts/raw/builds/tubslatex.tds.zip;
-    sha256 = "0vvgwwkd8y7nk1lkda6zsnfnzmvgda1g59yawsknmw246y8nw8ln";
-    stripRoot = false;
-  };
-  installPhase = ''
-      mkdir -p $out
-      cp -r * $out/
-  '';
-  pname = "tubslatex";
-  name = pname;
-  tlType = "run";
-}