34 files changed, 53 insertions, 8 deletions
diff --git a/1systems/lass/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix
index 2c755d8cb..30a7fb51c 100644
--- a/1systems/lass/cloudkrebs.nix
+++ b/lass/1systems/cloudkrebs.nix
@@ -23,8 +23,23 @@
     }
   ];
 
-  krebs.enable = true;
-  krebs.build.host = config.krebs.hosts.cloudkrebs;
+  krebs.build = {
+    target = "root@cloudkrebs";
+    host = config.krebs.hosts.cloudkrebs;
+    deps = {
+      nixpkgs = {
+        url = https://github.com/Lassulus/nixpkgs;
+        rev = "1879a011925c561f0a7fd4043da0768bbff41d0b";
+      };
+      secrets = {
+        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+      };
+      stockholm = {
+        url = toString ../..;
+      };
+    };
+  };
+
   networking.hostName = "cloudkrebs";
 
 }
diff --git a/1systems/lass/mors.nix b/lass/1systems/mors.nix
index 8cda1eac3..3519bff66 100644
--- a/1systems/lass/mors.nix
+++ b/lass/1systems/mors.nix
@@ -18,11 +18,26 @@
     ../../2configs/lass/ircd.nix
     ../../2configs/lass/chromium-patched.nix
     ../../2configs/lass/new-repos.nix
-    ../../2configs/tv/synaptics.nix
+    #../../2configs/tv/synaptics.nix
     ../../2configs/lass/retiolum.nix
   ];
 
-  krebs.build.host = config.krebs.hosts.mors;
+  krebs.build = {
+    target = "root@mors";
+    host = config.krebs.hosts.mors;
+    deps = {
+      nixpkgs = {
+        url = https://github.com/Lassulus/nixpkgs;
+        rev = "1879a011925c561f0a7fd4043da0768bbff41d0b";
+      };
+      secrets = {
+        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+      };
+      stockholm = {
+        url = toString ../..;
+      };
+    };
+  };
 
   networking.hostName = "mors";
   networking.wireless.enable = true;
diff --git a/1systems/lass/uriel.nix b/lass/1systems/uriel.nix
index 4fe8cf21a..8984004e1 100644
--- a/1systems/lass/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -23,8 +23,23 @@ with builtins;
     }
   ];
 
-  krebs.enable = true;
-  krebs.build.host = config.krebs.hosts.uriel;
+  krebs.build = {
+    target = "root@uriel";
+    host = config.krebs.hosts.uriel;
+    deps = {
+      nixpkgs = {
+        url = https://github.com/Lassulus/nixpkgs;
+        rev = "961fcbabd7643171ea74bd550fee1ce5c13c2e90";
+      };
+      secrets = {
+        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+      };
+      stockholm = {
+        url = toString ../..;
+      };
+    };
+  };
+
   networking.hostName = "uriel";
 
   networking.wireless.enable = true;
diff --git a/2configs/lass/base.nix b/lass/2configs/base.nix
index 8d4a9c896..8d4a9c896 100644
--- a/2configs/lass/base.nix
+++ b/lass/2configs/base.nix
diff --git a/2configs/lass/binary-caches.nix b/lass/2configs/binary-caches.nix
index c2727520d..c2727520d 100644
--- a/2configs/lass/binary-caches.nix
+++ b/lass/2configs/binary-caches.nix
diff --git a/2configs/lass/bird.nix b/lass/2configs/bird.nix
index 3fc265cd7..3fc265cd7 100644
--- a/2configs/lass/bird.nix
+++ b/lass/2configs/bird.nix
diff --git a/2configs/lass/bitcoin.nix b/lass/2configs/bitcoin.nix
index d3bccbf5c..d3bccbf5c 100644
--- a/2configs/lass/bitcoin.nix
+++ b/lass/2configs/bitcoin.nix
diff --git a/2configs/lass/browsers.nix b/lass/2configs/browsers.nix
index 8aecea925..8aecea925 100644
--- a/2configs/lass/browsers.nix
+++ b/lass/2configs/browsers.nix
diff --git a/2configs/lass/chromium-patched.nix b/lass/2configs/chromium-patched.nix
index 715181778..715181778 100644
--- a/2configs/lass/chromium-patched.nix
+++ b/lass/2configs/chromium-patched.nix
diff --git a/2configs/lass/desktop-base.nix b/lass/2configs/desktop-base.nix
index 9b98e4a8b..9b98e4a8b 100644
--- a/2configs/lass/desktop-base.nix
+++ b/lass/2configs/desktop-base.nix
diff --git a/2configs/lass/elster.nix b/lass/2configs/elster.nix
index 1edd01896..1edd01896 100644
--- a/2configs/lass/elster.nix
+++ b/lass/2configs/elster.nix
diff --git a/2configs/lass/fastpoke-pages.nix b/lass/2configs/fastpoke-pages.nix
index 74e92ccc3..74e92ccc3 100644
--- a/2configs/lass/fastpoke-pages.nix
+++ b/lass/2configs/fastpoke-pages.nix
diff --git a/2configs/lass/games.nix b/lass/2configs/games.nix
index 6043a8759..6043a8759 100644
--- a/2configs/lass/games.nix
+++ b/lass/2configs/games.nix
diff --git a/2configs/lass/gitolite-base.nix b/lass/2configs/gitolite-base.nix
index b47629956..b47629956 100644
--- a/2configs/lass/gitolite-base.nix
+++ b/lass/2configs/gitolite-base.nix
diff --git a/2configs/lass/identity.nix b/lass/2configs/identity.nix
index bfaad14d2..bfaad14d2 100644
--- a/2configs/lass/identity.nix
+++ b/lass/2configs/identity.nix
diff --git a/2configs/lass/ircd.nix b/lass/2configs/ircd.nix
index f71b769fd..f71b769fd 100644
--- a/2configs/lass/ircd.nix
+++ b/lass/2configs/ircd.nix
diff --git a/2configs/lass/mors/repos.nix b/lass/2configs/mors/repos.nix
index 1f7f33456..1f7f33456 100644
--- a/2configs/lass/mors/repos.nix
+++ b/lass/2configs/mors/repos.nix
diff --git a/2configs/lass/mors/retiolum.nix b/lass/2configs/mors/retiolum.nix
index 1148bee9c..1148bee9c 100644
--- a/2configs/lass/mors/retiolum.nix
+++ b/lass/2configs/mors/retiolum.nix
diff --git a/2configs/lass/new-repos.nix b/lass/2configs/new-repos.nix
index 2c73f9509..809091b32 100644
--- a/2configs/lass/new-repos.nix
+++ b/lass/2configs/new-repos.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import ../../4lib/tv { inherit lib pkgs; };
+with import ../../tv/lib { inherit lib pkgs; };
 let
 
   out = {
diff --git a/2configs/lass/pass.nix b/lass/2configs/pass.nix
index 33eca0a17..33eca0a17 100644
--- a/2configs/lass/pass.nix
+++ b/lass/2configs/pass.nix
diff --git a/2configs/lass/programs.nix b/lass/2configs/programs.nix
index 41d241bac..41d241bac 100644
--- a/2configs/lass/programs.nix
+++ b/lass/2configs/programs.nix
diff --git a/2configs/lass/retiolum.nix b/lass/2configs/retiolum.nix
index 767a1ce83..95890f70e 100644
--- a/2configs/lass/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../../3modules/lass/iptables.nix
-    ../../2configs/tv/exim-retiolum.nix
+    ../../tv/configs/exim-retiolum.nix
   ];
 
   lass.iptables = {
diff --git a/2configs/lass/sshkeys.nix b/lass/2configs/sshkeys.nix
index 114a2596b..114a2596b 100644
--- a/2configs/lass/sshkeys.nix
+++ b/lass/2configs/sshkeys.nix
diff --git a/2configs/lass/steam.nix b/lass/2configs/steam.nix
index 7d088fc6a..7d088fc6a 100644
--- a/2configs/lass/steam.nix
+++ b/lass/2configs/steam.nix
diff --git a/2configs/lass/texlive.nix b/lass/2configs/texlive.nix
index 295df31cd..295df31cd 100644
--- a/2configs/lass/texlive.nix
+++ b/lass/2configs/texlive.nix
diff --git a/2configs/lass/urxvt.nix b/lass/2configs/urxvt.nix
index a2074ba02..a2074ba02 100644
--- a/2configs/lass/urxvt.nix
+++ b/lass/2configs/urxvt.nix
diff --git a/2configs/lass/vim.nix b/lass/2configs/vim.nix
index 3fe45e1d1..3fe45e1d1 100644
--- a/2configs/lass/vim.nix
+++ b/lass/2configs/vim.nix
diff --git a/2configs/lass/virtualbox.nix b/lass/2configs/virtualbox.nix
index 026203124..026203124 100644
--- a/2configs/lass/virtualbox.nix
+++ b/lass/2configs/virtualbox.nix
diff --git a/2configs/lass/wine.nix b/lass/2configs/wine.nix
index 8d55da7fd..8d55da7fd 100644
--- a/2configs/lass/wine.nix
+++ b/lass/2configs/wine.nix
diff --git a/3modules/lass/default.nix b/lass/3modules/default.nix
index d4e231ec7..d4e231ec7 100644
--- a/3modules/lass/default.nix
+++ b/lass/3modules/default.nix
diff --git a/3modules/lass/iptables.nix b/lass/3modules/iptables.nix
index 8c6ad3fa1..8c6ad3fa1 100644
--- a/3modules/lass/iptables.nix
+++ b/lass/3modules/iptables.nix
diff --git a/3modules/lass/sshkeys.nix b/lass/3modules/sshkeys.nix
index 5f1c60668..5f1c60668 100644
--- a/3modules/lass/sshkeys.nix
+++ b/lass/3modules/sshkeys.nix
diff --git a/3modules/lass/urxvtd.nix b/lass/3modules/urxvtd.nix
index 469616a9f..469616a9f 100644
--- a/3modules/lass/urxvtd.nix
+++ b/lass/3modules/urxvtd.nix
diff --git a/3modules/lass/xresources.nix b/lass/3modules/xresources.nix
index 15c5b8b74..15c5b8b74 100644
--- a/3modules/lass/xresources.nix
+++ b/lass/3modules/xresources.nix