From e082da2c23ebff82717df11d266ecfd22a70db56 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Fri, 24 Jul 2015 12:34:25 +0200
Subject: 3 tv retiolum: RIP

---
 1systems/tv/cd.nix            |  4 ++--
 1systems/tv/mkdir.nix         |  4 ++--
 1systems/tv/nomic.nix         |  4 ++--
 1systems/tv/rmdir.nix         |  4 ++--
 1systems/tv/wu.nix            |  4 ++--
 2configs/tv/exim-retiolum.nix |  4 ++--
 3modules/tv/retiolum.nix      | 29 -----------------------------
 7 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 3modules/tv/retiolum.nix

diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index 463d643a6..2f8cf8197 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.nix
@@ -86,8 +86,8 @@ in
       };
     }
     {
-      imports = [ ../../3modules/tv/retiolum.nix ];
-      tv.retiolum = {
+      imports = [ ../../3modules/krebs/retiolum.nix ];
+      krebs.retiolum = {
         enable = true;
         hosts = ../../Zhosts;
         connectTo = [
diff --git a/1systems/tv/mkdir.nix b/1systems/tv/mkdir.nix
index e0e057d63..05d76c4cb 100644
--- a/1systems/tv/mkdir.nix
+++ b/1systems/tv/mkdir.nix
@@ -29,8 +29,8 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/tv/retiolum.nix ];
-      tv.retiolum = {
+      imports = [ ../../3modules/krebs/retiolum.nix ];
+      krebs.retiolum = {
         enable = true;
         hosts = ../../Zhosts;
         connectTo = [
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index 8e6812e43..bae12d364 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -37,8 +37,8 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/tv/retiolum.nix ];
-      tv.retiolum = {
+      imports = [ ../../3modules/krebs/retiolum.nix ];
+      krebs.retiolum = {
         enable = true;
         hosts = ../../Zhosts;
         connectTo = [
diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix
index b77a1c39e..2cf9668c8 100644
--- a/1systems/tv/rmdir.nix
+++ b/1systems/tv/rmdir.nix
@@ -29,8 +29,8 @@ with lib;
       };
     }
     {
-      imports = [ ../../3modules/tv/retiolum.nix ];
-      tv.retiolum = {
+      imports = [ ../../3modules/krebs/retiolum.nix ];
+      krebs.retiolum = {
         enable = true;
         hosts = ../../Zhosts;
         connectTo = [
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 1d7bbe55b..c5678a193 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -145,8 +145,8 @@ in
       };
     }
     {
-      imports = [ ../../3modules/tv/retiolum.nix ];
-      tv.retiolum = {
+      imports = [ ../../3modules/krebs/retiolum.nix ];
+      krebs.retiolum = {
         enable = true;
         hosts = ../../Zhosts;
         connectTo = [
diff --git a/2configs/tv/exim-retiolum.nix b/2configs/tv/exim-retiolum.nix
index efab5cf32..851a0c625 100644
--- a/2configs/tv/exim-retiolum.nix
+++ b/2configs/tv/exim-retiolum.nix
@@ -4,9 +4,9 @@
   services.exim =
     # This configuration makes only sense for retiolum-enabled hosts.
     # TODO modular configuration
-    assert config.tv.retiolum.enable;
+    assert config.krebs.retiolum.enable;
     let
-      # TODO get the hostname from config.tv.retiolum.
+      # TODO get the hostname from config.krebs.retiolum.
       retiolumHostname = "${config.networking.hostName}.retiolum";
     in
       { enable = true;
diff --git a/3modules/tv/retiolum.nix b/3modules/tv/retiolum.nix
deleted file mode 100644
index d00377446..000000000
--- a/3modules/tv/retiolum.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-let
-  cfg = config.tv.retiolum;
-
-  out = {
-    imports = [ ../../3modules/krebs/retiolum.nix ];
-    options.tv.retiolum = api;
-    config = mkIf cfg.enable imp;
-  };
-
-  api = {
-    enable = mkEnableOption "tv.retiolum";
-
-    connectTo = mkOption {
-      type = with types; listOf str;
-    };
-
-    hosts = mkOption {
-      type = types.path;
-    };
-  };
-
-  imp = {
-    krebs.retiolum = cfg;
-  };
-
-in out
-- 
cgit v1.2.3