don't try to mimic nixpkgs

9 files changed, 17 insertions, 3 deletions

diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 3f804ba1..9b638260 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
   krebs.build.host = config.krebs.hosts.cd;
 
   imports = [
+    ../.
     ../2configs/hw/CAC-Developer-2.nix
     ../2configs/fs/CAC-CentOS-7-64bit.nix
     ../2configs/exim-smarthost.nix
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index 4b1fcde3..58a8fdcb 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -19,6 +19,7 @@ in
   krebs.build.host = config.krebs.hosts.mkdir;
 
   imports = [
+    ../.
     ../2configs/hw/CAC-Developer-1.nix
     ../2configs/fs/CAC-CentOS-7-64bit.nix
     ../2configs/exim-smarthost.nix
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 610434f0..2c9775da 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
   krebs.build.host = config.krebs.hosts.nomic;
 
   imports = [
+    ../.
     ../2configs/hw/AO753.nix
     ../2configs/exim-retiolum.nix
     ../2configs/git.nix
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index 942e55e5..c54caa64 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -19,6 +19,7 @@ in
   krebs.build.host = config.krebs.hosts.rmdir;
 
   imports = [
+    ../.
     ../2configs/hw/CAC-Developer-1.nix
     ../2configs/fs/CAC-CentOS-7-64bit.nix
     ../2configs/exim-smarthost.nix
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 4b979917..6154e4df 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
   krebs.build.host = config.krebs.hosts.wu;
 
   imports = [
+    ../.
     ../2configs/hw/w110er.nix
     ../2configs/exim-retiolum.nix
     ../2configs/git.nix
diff --git a/tv/1systems/xu-qemu0.nix b/tv/1systems/xu-qemu0.nix
index 03ac19cf..8945c190 100644
--- a/tv/1systems/xu-qemu0.nix
+++ b/tv/1systems/xu-qemu0.nix
@@ -10,6 +10,7 @@
   krebs.build.host = config.krebs.hosts.xu-qemu0;
 
   imports = [
+    ../.
     <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
   ];
 
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 6d300f18..5ec1fe52 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -6,6 +6,7 @@ with config.krebs.lib;
   krebs.build.host = config.krebs.hosts.xu;
 
   imports = [
+    ../.
     ../2configs/hw/x220.nix
     ../2configs/exim-retiolum.nix
     ../2configs/git.nix
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 9694e7b5..c4a2d6ba 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -9,12 +9,10 @@ with config.krebs.lib;
     user = config.krebs.users.tv;
     source = mapAttrs (_: mkDefault) ({
       nixos-config = "symlink:stockholm/tv/1systems/${config.krebs.build.host.name}.nix";
-      nixpkgs = symlink:stockholm/nixpkgs;
       secrets = "/home/tv/secrets/${config.krebs.build.host.name}";
       secrets-common = "/home/tv/secrets/common";
       stockholm = "/home/tv/stockholm";
-      stockholm-user = "symlink:stockholm/tv";
-      upstream-nixpkgs = {
+      nixpkgs = {
         url = https://github.com/NixOS/nixpkgs;
         rev = "77f8f35d57618c1ba456d968524f2fb2c3448295";
         dev = "/home/tv/nixpkgs";
diff --git a/tv/default.nix b/tv/default.nix
new file mode 100644
index 00000000..b1c7c1be
--- /dev/null
+++ b/tv/default.nix
@@ -0,0 +1,9 @@
+_:
+{
+  imports = [
+    ../krebs
+    ./2configs
+    ./3modules
+    ./5pkgs
+  ];
+}