From 906ef601d3ada9eefffaa8d44bd791a71290f69e Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 22 Mar 2021 16:22:57 +0100
Subject: [PATCH] mucbot: flakify

---
 flake.lock                                    | 25 ++++++++++++++++---
 flake.nix                                     | 17 ++++++++++++-
 host-registry.nix                             |  5 ++++
 .../mucbot/{configuration.nix => default.nix} | 18 +++----------
 overlay/default.nix                           |  2 ++
 5 files changed, 48 insertions(+), 19 deletions(-)
 rename hosts/containers/mucbot/{configuration.nix => default.nix} (68%)

diff --git a/flake.lock b/flake.lock
index 8754713d..f9ff6675 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,6 +36,7 @@
         "nixpkgs": "nixpkgs",
         "scrapers": "scrapers",
         "secrets": "secrets",
+        "tigger": "tigger",
         "yammat": "yammat"
       }
     },
@@ -57,11 +58,11 @@
     },
     "secrets": {
       "locked": {
-        "lastModified": 1615587539,
-        "narHash": "sha256-5v3azueR83Sxf0XBgJXc0v8keZPA1yocMJgpgtKRdl4=",
+        "lastModified": 1616412180,
+        "narHash": "sha256-NIZ7+4hDOF8i+aUeDW0scXnE90b1FbvXuwD8eyx3XLo=",
         "ref": "master",
-        "rev": "621eae36dd5c117454dea90604b220e7a4f0c7d8",
-        "revCount": 95,
+        "rev": "0185c43bf98d7c47b0e83c6f88ffcc2aa7d97b0d",
+        "revCount": 96,
         "type": "git",
         "url": "ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git"
       },
@@ -70,6 +71,22 @@
         "url": "ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git"
       }
     },
+    "tigger": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1592956241,
+        "narHash": "sha256-ghJ8gD9O7VYBXCnEf1XgqH1CYLfo7yFh4nLLUWUn5mc=",
+        "owner": "astro",
+        "repo": "tigger",
+        "rev": "963619d33cf918cabc379b50ef99399d2be1980b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "astro",
+        "repo": "tigger",
+        "type": "github"
+      }
+    },
     "yammat": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index e5e3125c..961137fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,9 +8,11 @@
     yammat.inputs.nixpkgs.follows = "nixpkgs";
     scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git";
     scrapers.flake = false;
+    tigger.url = "github:astro/tigger";
+    tigger.flake = false;
   };
 
-  outputs = { self, nixpkgs, secrets, nixos-hardware, yammat, scrapers }:
+  outputs = { self, nixpkgs, secrets, nixos-hardware, yammat, scrapers, tigger }:
     let
       forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
 
@@ -77,6 +79,8 @@
           grafana-nixos-rebuild = mkDeploy "grafana" "grafana.hq.c3d2.de";
 
           hydra-nixos-rebuild = mkDeploy "hydra" hostRegistry.hosts.hydra.ip4;
+
+          mucbot-nixos-rebuild = mkDeploy "mucbot" hostRegistry.hosts.mucbot.ip4;
         });
 
       nixosConfigurations = let
@@ -200,6 +204,17 @@
           system = "x86_64-linux";
         };
 
+        mucbot = nixosSystem' {
+          modules = [
+            ./lib/lxc-container.nix
+            "${tigger}/module.nix"
+            { nixpkgs.overlays = [ secrets.overlays.mucbot ]; }
+            ./hosts/containers/mucbot
+          ];
+          extraArgs = { inherit tigger; };
+          system = "x86_64-linux";
+        };
+
       };
 
       nixosModules.c3d2 = import ./lib;
diff --git a/host-registry.nix b/host-registry.nix
index f39116a8..1ca9c75d 100644
--- a/host-registry.nix
+++ b/host-registry.nix
@@ -105,6 +105,11 @@ rec {
       ip4 = "172.20.73.49";
       ip6 = "2a02:8106:208:5282:e03c:d7ff:fe8e:fe16";
     };
+
+    mucbot = {
+      ip4 = "172.20.73.27";
+      ip6 = "2a02:8106:208:5282:28db:dff:fe6b:e89a";
+    };
   };
 
   hqGlobal = builtins.attrNames hosts;
diff --git a/hosts/containers/mucbot/configuration.nix b/hosts/containers/mucbot/default.nix
similarity index 68%
rename from hosts/containers/mucbot/configuration.nix
rename to hosts/containers/mucbot/default.nix
index 0aa29266..18fac577 100644
--- a/hosts/containers/mucbot/configuration.nix
+++ b/hosts/containers/mucbot/default.nix
@@ -1,16 +1,6 @@
-{ config, pkgs, lib, ... }:
-
-let
-  tiggerGit = builtins.fetchTarball
-    "https://github.com/astro/tigger/archive/master.tar.gz";
-in {
-  imports = [
-    ../../../lib/lxc-container.nix
-    ../../../lib/shared.nix
-    ../../../lib/admins.nix
-    "${tiggerGit}/module.nix"
-  ];
+{ config, pkgs, lib, tigger, ... }:
 
+{
   networking.hostName = "mucbot";
   networking.interfaces.eth0.ipv4.addresses = [{
     address = "172.20.73.27";
@@ -30,8 +20,8 @@ in {
     enable = true;
     user = "tigger";
     group = "tigger";
-    jid = import ../../../secrets/hosts/mucbot/jabber-jid.nix;
-    password = import ../../../secrets/hosts/mucbot/jabber-password.nix;
+    jid = pkgs.mucbot.jid;
+    password = pkgs.mucbot.password;
     mucs =
       [ "c3d2@chat.c3d2.de/Astrobot" "international@chat.c3d2.de/Astrobot" ];
   };
diff --git a/overlay/default.nix b/overlay/default.nix
index c3e03dd6..4d530172 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -6,4 +6,6 @@ final: prev:
 
   pile = prev.callPackage ./pile.nix { };
 
+  # Cut down build time of a Nix-2.4 dependency
+  mdbook = prev.mdbook.overrideAttrs (oa: { doCheck = false; });
 }