From 1eb98b60ca0e9f2a2ce15b0f8d569e525bd99f8f Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 10 Mar 2021 01:54:28 +0100
Subject: [PATCH] flake.nix: use flakified yammat

---
 flake.lock | 14 +++++++++-----
 flake.nix  |  5 +++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9f54e891..37cb8b1c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -71,13 +71,17 @@
       }
     },
     "yammat": {
-      "flake": false,
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1615141664,
-        "narHash": "sha256-ezUUug0rovNVZEREQdIBtW+IB+CETUamuClrcD8T82E=",
+        "lastModified": 1615337615,
+        "narHash": "sha256-/3mai5komZ2YpKRQajuo5WXPbRg0iNm37btqY77A9HU=",
         "ref": "nix",
-        "rev": "f476e773df3ba4976151d3e2fef44c5ea48bac85",
-        "revCount": 390,
+        "rev": "d91c4563aaa2d8718412b65b15fc6103b82a5a5d",
+        "revCount": 398,
         "type": "git",
         "url": "https://gitea.c3d2.de/astro/yammat.git"
       },
diff --git a/flake.nix b/flake.nix
index 627ae67d..c11e2811 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/release-20.09";
     secrets.url = "git+ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git";
     yammat.url = "git+https://gitea.c3d2.de/astro/yammat.git?ref=nix";
-    yammat.flake = false;
+    yammat.inputs.nixpkgs.follows = "nixpkgs";
     scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git";
     scrapers.flake = false;
   };
@@ -145,7 +145,8 @@
           modules = [
             ./lib/lxc-container.nix
             ./hosts/containers/matemat
-            "${yammat}/nixos-module.nix"
+            secrets.nixosModules.admins
+            yammat.nixosModule
             secrets.nixosModules.admins
             ({ ... }: {
               nixpkgs.overlays = [ secrets.overlays.matemat ];