From 52df3a8e317e30d27639970542f5efe37ecdbdd6 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Fri, 25 Oct 2019 08:17:56 +0200
Subject: [PATCH] syncthing fixes for workout

---
 system/all/sshd-known-hosts-public.nix |  4 ++++
 system/all/syncthing.nix               | 13 +------------
 system/desktop/home-manager/ssh.nix    |  5 +++++
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/system/all/sshd-known-hosts-public.nix b/system/all/sshd-known-hosts-public.nix
index 5d00b11..bcb77eb 100644
--- a/system/all/sshd-known-hosts-public.nix
+++ b/system/all/sshd-known-hosts-public.nix
@@ -53,6 +53,10 @@ with lib;
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsANFdMi825qWQXQbWLYuNZ6/fARt3lnh1KStQHQQMD";
     };
     renoise = {
+      hostNames = [ "*.renoise.com" "renoise.com" "94.130.128.97" ];
+      publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLXxhBlYQJxgcLqKywpl1tI1N/+B5bkptAnR2a3tsRybq0IHZnIkSRGUYcu5zPwJT+bitVw8BvIaGzxI+Zm2ivE=";
+    };
+    git-renoise = {
       hostNames = [ "[git.renoise.com]:2229" "[94.130.128.97]:2229" ];
       publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmIOTjQsD1TaD9MiECcRqwfAXfRdbI+2pkuF+zhBUkrX41NA4LzifPY4Iw3PlklE0YGIOzYyNitzkdgxIWkeqa0Y9iL3gGZBuLFORj5YXWlDKB2RrPAsZRL8y69y4H6RWPpL6DHHsf9eT+HgRzWzzn5nUFLfkCsuM96BqjIKN1pinIBcE6gst1UUSwSTjK8XZA5d4BiSrLF4HiNXnDm+qniYGbGkzZcjn1ua+l0GdGbfg9TotFnSK/QXgN3MeHHDZKnIjOIkOXCY+L5URe0RHo6pBFdj+BLr211AJhB52MrDNudQcY6eSQiJ08LeE6SkcrsQO/VZ/JnOkHxHd2mOyH";
     };
diff --git a/system/all/syncthing.nix b/system/all/syncthing.nix
index 9c7dd01..1ce1d19 100644
--- a/system/all/syncthing.nix
+++ b/system/all/syncthing.nix
@@ -67,17 +67,6 @@ with lib;
           watch = false;
           devices = [ "workout" "workhorse" "pepe" "sterni" "porani" ];
         };
-        #desktop-encrypted = {
-        #  id = "ebnth-pfven";
-        #  watch = false;
-        #  devices = [ "workout" "workhorse" "pepe" "sterni" ];
-        #};
-        #finance-encrypted = {
-        #  id = "gl7rx-sdsnx";
-        #  watch = false;
-        #  devices = [ "workout" "workhorse" "pepe" "sterni" ];
-        #};
-
         movies = {
           id = "vatmy-c2qf4";
           watch = false;
@@ -146,7 +135,7 @@ with lib;
         windows-sync = {
           id = "hcity-p5ikc";
           watch = false;
-          devices = [ "schasch" "bumba" "workout" "kruck" ];
+          devices = [ "bumba" "workout" ];
         };
         workout-pepe = {
           devices = [ "pepe" "workout" ];
diff --git a/system/desktop/home-manager/ssh.nix b/system/desktop/home-manager/ssh.nix
index 2653331..d9a3a0e 100644
--- a/system/desktop/home-manager/ssh.nix
+++ b/system/desktop/home-manager/ssh.nix
@@ -23,6 +23,11 @@ with lib;
         extraOptions.HostKeyAlgorithms = "ssh-rsa";
         user = "root";
       };
+      "git.renoise.com" = {
+        identityFile = "~/.ssh/card_rsa.pub";
+        identitiesOnly = true;
+        extraOptions.HostKeyAlgorithms = "ssh-rsa";
+      };
       "*.renoise.com" = {
         identityFile = "~/.ssh/card_rsa.pub";
         identitiesOnly = true;