From acaf08ec991f5b245f86b520631b724c017f9862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Wed, 29 May 2019 19:26:16 +0200
Subject: [PATCH] ~ syncthing

---
 configs/cloud.nix |  6 ++++--
 deploy.nix        | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/configs/cloud.nix b/configs/cloud.nix
index 874f8b9..0604aeb 100644
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -28,9 +28,11 @@
   krebs.syncthing = rec {
     enable = true;
     id = config.networking.hostName;
+    key = toString <secrets/syncthing-key.pem>;
+    cert = toString <secrets/syncthing-cert.pem>;
     peers = {
-      homeros.id = "TGVJKSM-5P7YP4E-OCYDB6S-LXQ3PNM-RP6BNBS-2UNYKKX-YJCMWAF-NGWQFA2";
-      scardanelli.id = "XEQUNNZ-FQ67ASA-4DWBKAO-RQD2PTK-B6J74TT-RQPBVDE-SRNOSMF-UUAUMAK";
+      homeros.id = "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA";
+      scardanelli.id = "7CZYHEX-3CSFDQU-PEEMYHG-6XGQ2ZD-KGVUWH5-GFRB2XK-FP57ERX-7APZUQU";
       rilke.id = "NYNNHXP-7JMSTXG-SVNOPWD-RWXCCCL-CBOVBEI-X4QPLF4-NJA5G2P-RSGYRQQ";
     };
     folders."${config.users.users.me.home}/cloud/syncthing/common".peers = [ "homeros" "scardanelli" ];
diff --git a/deploy.nix b/deploy.nix
index 59d6ef0..3b263ab 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -32,7 +32,7 @@ let
 
   minimal = path: other: lib.evalSource [(niveum path // other)];
 
-  regular = path: minimal path {
+  regular = path: name: minimal path {
     home-manager.git = {
       url = https://github.com/rycee/home-manager;
       ref = "2ccbf43";
@@ -41,15 +41,19 @@ let
       url = https://cgit.krebsco.de/stockholm;
       ref = "1340e3fb";
     };
+    secrets.pass = {
+      dir = toString ~/.password-store;
+      inherit name;
+    };
   };
 
   systems.scardanelli = pkgs.krops.writeDeploy "deploy-scardanelli" {
-    source = regular ./systems/scardanelli;
+    source = regular ./systems/scardanelli "scardanelli";
     target = scardanelli-ssh;
   };
 
   systems.homeros = pkgs.krops.writeDeploy "deploy-homeros" {
-    source = regular ./systems/homeros;
+    source = regular ./systems/homeros "homeros";
     target = homeros-ssh;
   };