Merge remote-tracking branch 'lass/master'

10 files changed, 1 insertions, 10 deletions

diff --git a/kartei/tv/default.nix b/kartei/tv/default.nix
index 2f23324cc..e81bdd32b 100644
--- a/kartei/tv/default.nix
+++ b/kartei/tv/default.nix
@@ -43,7 +43,7 @@ in {
         })
         (host: mkIf (host.config.ssh.pubkey != null) {
           ssh.privkey = mapAttrs (const mkDefault) {
-            path = config.krebs.secret.file "ssh.id_${host.config.ssh.privkey.type}";
+            path = "${config.krebs.secret.directory}/ssh.id_${host.config.ssh.privkey.type}";
             type = head (toList (builtins.match "ssh-([^ ]+) .*" host.config.ssh.pubkey));
           };
         })
diff --git a/kartei/tv/hosts/alnus.nix b/kartei/tv/hosts/alnus.nix
index e66236f1f..099f3c741 100644
--- a/kartei/tv/hosts/alnus.nix
+++ b/kartei/tv/hosts/alnus.nix
@@ -1,5 +1,4 @@
 {
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.21.1";
diff --git a/kartei/tv/hosts/au.nix b/kartei/tv/hosts/au.nix
index 44279b687..c897f9cb1 100644
--- a/kartei/tv/hosts/au.nix
+++ b/kartei/tv/hosts/au.nix
@@ -1,5 +1,4 @@
 {
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.13.39";
diff --git a/kartei/tv/hosts/bu.nix b/kartei/tv/hosts/bu.nix
index cbdf5af22..ca544c912 100644
--- a/kartei/tv/hosts/bu.nix
+++ b/kartei/tv/hosts/bu.nix
@@ -1,5 +1,4 @@
 {
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.13.36";
diff --git a/kartei/tv/hosts/mu.nix b/kartei/tv/hosts/mu.nix
index e10694ec1..4fb7165f6 100644
--- a/kartei/tv/hosts/mu.nix
+++ b/kartei/tv/hosts/mu.nix
@@ -1,5 +1,4 @@
 {
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.20.1";
diff --git a/kartei/tv/hosts/nomic.nix b/kartei/tv/hosts/nomic.nix
index 7c46dc40a..ebb0edcf5 100644
--- a/kartei/tv/hosts/nomic.nix
+++ b/kartei/tv/hosts/nomic.nix
@@ -1,5 +1,4 @@
 {
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.0.110";
diff --git a/kartei/tv/hosts/querel.nix b/kartei/tv/hosts/querel.nix
index 6b9b9881b..805eeab94 100644
--- a/kartei/tv/hosts/querel.nix
+++ b/kartei/tv/hosts/querel.nix
@@ -1,5 +1,4 @@
 {
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.22.22";
diff --git a/kartei/tv/hosts/ru.nix b/kartei/tv/hosts/ru.nix
index 334df5d07..d1a2be276 100644
--- a/kartei/tv/hosts/ru.nix
+++ b/kartei/tv/hosts/ru.nix
@@ -1,5 +1,4 @@
 {
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.13.42";
diff --git a/kartei/tv/hosts/xu.nix b/kartei/tv/hosts/xu.nix
index e943915e4..7361092b7 100644
--- a/kartei/tv/hosts/xu.nix
+++ b/kartei/tv/hosts/xu.nix
@@ -2,7 +2,6 @@
   binary-cache = {
     pubkey = "xu-1:pYRENvaxZqGeImwLA9qHmRwHV4jfKaYx4u1VcZ31x0s=";
   };
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.13.38";
diff --git a/kartei/tv/hosts/zu.nix b/kartei/tv/hosts/zu.nix
index 91270d57e..c40de32a1 100644
--- a/kartei/tv/hosts/zu.nix
+++ b/kartei/tv/hosts/zu.nix
@@ -1,5 +1,4 @@
 {
-  ci = true;
   nets = {
     retiolum = {
       ip4.addr = "10.243.13.40";