From 68a968ac1b1a077494efb56e18c83e79fe0bae7f Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 22 Jun 2015 20:11:02 +0200
Subject: tv retiolum: split module into options and config

---
 modules/wu/default.nix | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'modules/wu/default.nix')

diff --git a/modules/wu/default.nix b/modules/wu/default.nix
index f7231469..54b8587c 100644
--- a/modules/wu/default.nix
+++ b/modules/wu/default.nix
@@ -14,7 +14,6 @@ in
     ../common/nixpkgs.nix
     ../tv/base.nix
     ../tv/exim-retiolum.nix
-    ../tv/retiolum.nix
     ../tv/sanitize.nix
     ../tv/smartd.nix
     ../tv/synaptics.nix
@@ -44,6 +43,17 @@ in
         ];
       };
     }
+    {
+      imports = [ ../tv/retiolum ];
+      tv.retiolum = {
+        enable = true;
+        hosts = <retiolum-hosts>;
+        connectTo = [
+          "gum"
+          "pigstarter"
+        ];
+      };
+    }
   ];
 
   nix.maxJobs = 8;
@@ -342,25 +352,6 @@ in
   #  '';
   #};
 
-  services.retiolum = {
-    enable = true;
-    hosts = <retiolum-hosts>;
-    connectTo = [
-      "gum"
-      "pigstarter"
-    ];
-  };
-
-  # TODO
-  #services.tinc = {
-  #  enable = true;
-  #  network = "retiolum";
-  #  hosts = /home/tv/krebs/hosts;
-  #  privateKeyFile = /etc/tinc/retiolum/rsa_key.priv;
-  #  connectTo = [ "fastpoke" "pigstarter" "kheurop" ];
-  #};
-
-
   security.rtkit.enable = false;
   services.nscd.enable = false;
   services.ntp.enable = false;
-- 
cgit v1.2.3