From c0cee07a0d5ad4287f138d492f21c9df4ba1912b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Sat, 13 Apr 2019 23:26:01 +0200
Subject: [PATCH] catullus: fix deploy

---
 deploy.nix                      | 26 +++++++++++++-------------
 systems/catullus/containers.nix | 18 +++++++++---------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/deploy.nix b/deploy.nix
index 714c8dc..694f381 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -10,15 +10,11 @@ let
   pkgs = import "${krops}/pkgs" {};
   importJson = (import <nixpkgs> {}).lib.importJSON;
 
-  source = name: path: lib.evalSource [{
+  source = {path, other ? {}}: lib.evalSource [({
     nixpkgs.git = {
       url = https://github.com/NixOS/nixpkgs-channels;
       ref = (importJson ./nixpkgs.json).rev;
     };
-    nix-writers.git = {
-      url = https://cgit.krebsco.de/nix-writers/;
-      ref = "4d0829328e885a6d7163b513998a975e60dd0a72";
-    };
     # stockholm.git = {
     #   url = https://cgit.krebsco.de/stockholm;
     #   ref = "7e1b197dab13d024ba491c96dc959306324943c0";
@@ -33,24 +29,28 @@ let
     modules.file = toString ./modules;
 
     nixos-config.symlink = "system/configuration.nix";
-    # secrets.pass = {
-    #   dir = toString ~/.password-store;
-    #   name = name;
-    # };
-  }];
+  } // other)];
 
   systems.scardanelli = pkgs.krops.writeDeploy "deploy-scardanelli" {
-    source = source "scardanelli" ./systems/scardanelli;
+    source = source { path = ./systems/scardanelli; };
     target = scardanelli-ssh;
   };
 
   systems.homeros = pkgs.krops.writeDeploy "deploy-homeros" {
-    source = source "homeros" ./systems/homeros;
+    source = source { path = ./systems/homeros; };
     target = homeros-ssh;
   };
 
   systems.catullus = pkgs.krops.writeDeploy "deploy-catullus" {
-    source = source "catullus" ./systems/catullus;
+    source = source {
+      path = ./systems/catullus;
+      other = {
+        secrets.pass = {
+          dir = toString ~/.password-store;
+          name = "catullus";
+        };
+      };
+    };
     target = catullus-ssh;
   };
 in systems // {
diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix
index b7da59e..dee87c3 100644
--- a/systems/catullus/containers.nix
+++ b/systems/catullus/containers.nix
@@ -23,15 +23,15 @@ in {
         script = ''${telegram-betacode}/bin/telegram-betacode'';
         serviceConfig.Restart = "always";
       };
-      systemd.services.telegram-horoscope = {
-        wantedBy = [ "multi-user.target" ];
-        description = "Telegram bot for generating horoscope charts";
-        environment.TELEGRAM_HOROSCOPE_TOKEN = builtins.readFile <secrets/telegram-horoscope.token>;
-        environment.GOOGLE_MAPS_API_KEY = builtins.readFile <secrets/google-maps.api-key>;
-        enable = true;
-        script = ''${telegram-horoscope}/bin/telegram-horoscope'';
-        serviceConfig.Restart = "always";
-      };
+      # systemd.services.telegram-horoscope = {
+      #   wantedBy = [ "multi-user.target" ];
+      #   description = "Telegram bot for generating horoscope charts";
+      #   environment.TELEGRAM_HOROSCOPE_TOKEN = builtins.readFile <secrets/telegram-horoscope.token>;
+      #   environment.GOOGLE_MAPS_API_KEY = builtins.readFile <secrets/google-maps.api-key>;
+      #   enable = true;
+      #   script = ''${telegram-horoscope}/bin/telegram-horoscope'';
+      #   serviceConfig.Restart = "always";
+      # };
     };
   };
 }