Merge remote-tracking branch 'cd/master'

4 files changed, 30 insertions, 23 deletions

diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 7c95e0f87..5235c25e5 100644
--- a/lass/1systems/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -25,14 +25,15 @@
 
   krebs.build = {
     user = config.krebs.users.lass;
-    target = "root@cloudkrebs";
     host = config.krebs.hosts.cloudkrebs;
-    deps = {
-      secrets = {
-        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+    source = {
+      dir.secrets = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
-      stockholm = {
-        url = toString ../..;
+      dir.stockholm = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/dev/stockholm";
       };
     };
   };
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 92976366f..d1a3f34f7 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -28,14 +28,15 @@ in {
 
   krebs.build = {
     user = config.krebs.users.lass;
-    target = "root@${ip}";
     host = config.krebs.hosts.echelon;
-    deps = {
-      secrets = {
-        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+    source = {
+      dir.secrets = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
-      stockholm = {
-        url = toString ../..;
+      dir.stockholm = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/dev/stockholm";
       };
     };
   };
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 4724fd3e3..b7291a8f2 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -22,18 +22,20 @@
     ../2configs/retiolum.nix
     ../2configs/wordpress.nix
     ../2configs/bitlbee.nix
+    ../2configs/firefoxPatched.nix
   ];
 
   krebs.build = {
     user = config.krebs.users.lass;
-    target = "root@mors";
     host = config.krebs.hosts.mors;
-    deps = {
-      secrets = {
-        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+    source = {
+      dir.secrets = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
-      stockholm = {
-        url = toString ../..;
+      dir.stockholm = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/dev/stockholm";
       };
     };
   };
@@ -172,6 +174,7 @@
 
   environment.systemPackages = with pkgs; [
     cac
+    get
   ];
 
   #TODO: fix this shit
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index bb98975e4..9d96e7814 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -27,12 +27,14 @@ with builtins;
     user = config.krebs.users.lass;
     target = "root@uriel";
     host = config.krebs.hosts.uriel;
-    deps = {
-      secrets = {
-        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+    source = {
+      dir.secrets = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/secrets/${config.krebs.build.host.name}";
       };
-      stockholm = {
-        url = toString ../..;
+      dir.stockholm = {
+        host = config.krebs.hosts.mors;
+        path = "/home/lass/dev/stockholm";
       };
     };
   };