Merge branch 'tv' into master

57 files changed, 369 insertions, 329 deletions

diff --git a/0make/tv/cd.makefile b/0make/tv/cd.makefile
deleted file mode 100644
index e021423f4..000000000
--- a/0make/tv/cd.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@cd-global
-nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
-secrets_dir := /home/tv/secrets/cd
diff --git a/0make/tv/mkdir.makefile b/0make/tv/mkdir.makefile
deleted file mode 100644
index b10398a07..000000000
--- a/0make/tv/mkdir.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@mkdir
-nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
-secrets_dir := /home/tv/secrets/mkdir
diff --git a/0make/tv/nomic.makefile b/0make/tv/nomic.makefile
deleted file mode 100644
index 9e0b8671b..000000000
--- a/0make/tv/nomic.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@nomic.gg23
-nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 9d5508d85c33b8fb22d79dde6176792eac2c2696
-secrets_dir := /home/tv/secrets/nomic
diff --git a/0make/tv/rmdir.makefile b/0make/tv/rmdir.makefile
deleted file mode 100644
index 6075bd3d4..000000000
--- a/0make/tv/rmdir.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@rmdir
-nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
-secrets_dir := /home/tv/secrets/rmdir
diff --git a/0make/tv/wu.makefile b/0make/tv/wu.makefile
deleted file mode 100644
index ef7e51194..000000000
--- a/0make/tv/wu.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@wu
-nixpkgs_url := /home/tv/src/nixpkgs
-nixpkgs_rev := 7725eb1d3ed85fc34edde3c3a7907ab234933a68
-secrets_dir := /home/tv/secrets/wu
diff --git a/1systems/makefu/pnp.nix b/1systems/makefu/pnp.nix
index 7e4ccf2c1..1019c4d70 100644
--- a/1systems/makefu/pnp.nix
+++ b/1systems/makefu/pnp.nix
@@ -11,7 +11,8 @@
       ../../2configs/makefu/base.nix
       ../../2configs/makefu/cgit-retiolum.nix
     ];
-  krebs.enable = true;
+  krebs.build.host = config.krebs.hosts.pnp;
+
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/vda";
@@ -39,14 +40,8 @@
     ];
   };
 
-  nix.maxJobs = 2;
-  networking.hostName = "pnp"; # Define your hostname.
-
 # $ nix-env -qaP | grep wget
     environment.systemPackages = with pkgs; [
-      wget
-      git
-      gnumake
       jq
     ];
 }
diff --git a/2configs/makefu/base.nix b/2configs/makefu/base.nix
index 25b80930b..b052b13e4 100644
--- a/2configs/makefu/base.nix
+++ b/2configs/makefu/base.nix
@@ -3,6 +3,10 @@
 with lib;
 {
   imports = [ ];
+  krebs.enable = true;
+  krebs.search-domain = "retiolum";
+
+  networking.hostName = config.krebs.build.host.name;
   users.extraUsers = {
     root = {
         openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
@@ -37,6 +41,7 @@ with lib;
   environment.systemPackages = with pkgs; [
       git
       vim
+      gnumake
       rxvt_unicode.terminfo
   ];
 
diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix
index c71b70ab4..e14830fb8 100644
--- a/3modules/krebs/default.nix
+++ b/3modules/krebs/default.nix
@@ -20,7 +20,7 @@ let
     enable = mkEnableOption "krebs";
 
     build = mkOption {
-      type = types.submodule {
+      type = types.submodule ({ config, ... }: {
         options = {
           target = mkOption {
             type = with types; nullOr str;
@@ -129,11 +129,19 @@ let
             type = types.user;
           };
         };
-      };
+      });
       # Define defaul value, so unset values of the submodule get reported.
       default = {};
     };
 
+    dns = {
+      providers = mkOption {
+        # TODO with types; tree dns.label dns.provider, so we can merge.
+        # Currently providers can only be merged if aliases occur just once.
+        type = with types; attrsOf unspecified;
+      };
+    };
+
     hosts = mkOption {
       type = with types; attrsOf host;
     };
@@ -156,43 +164,31 @@ let
     { krebs = makefu-imp; }
     { krebs = tv-imp; }
     {
-      # XXX This overlaps with krebs.retiolum
-      networking.extraHosts =
-        let
-          # TODO move domain name providers to a dedicated module
-          # providers : tree label providername
-          providers = {
-            internet = "hosts";
-            retiolum = "hosts";
-            de.viljetic = "regfish";
-            de.krebsco = "ovh";
-            de.habsys = "hosts";
-            de.pixelpocket = "hosts";
-            de.karlaskop = "hosts";
-            de.ubikmedia = "hosts";
-            de.apanowicz = "hosts";
-          };
-
-          # splitByProvider : [alias] -> listset providername alias
-          splitByProvider = foldl (acc: alias: listset-insert (providerOf alias) alias acc) {};
+      krebs.dns.providers = {
+        de.krebsco = "ovh";
+        internet = "hosts";
+        retiolum = "hosts";
+        de.habsys = "hosts";
+        de.pixelpocket = "hosts";
+        de.karlaskop = "hosts";
+        de.ubikmedia = "hosts";
+        de.apanowicz = "hosts";
+      };
 
-          # providerOf : alias -> providername
-          providerOf = alias:
-            tree-get (splitString "." alias) providers;
-        in
-        concatStringsSep "\n" (flatten (
-          # TODO deepMap ["hosts" "nets"] (hostname: host: netname: net:
-          mapAttrsToList (hostname: host:
-            mapAttrsToList (netname: net:
-              let
-                aliases = toString (unique (longs ++ shorts));
-                longs = (splitByProvider net.aliases).hosts;
-                shorts = map (removeSuffix ".${cfg.search-domain}") longs;
-              in
-              map (addr: "${addr} ${aliases}") net.addrs
-            ) host.nets
-          ) config.krebs.hosts
-        ));
+      # XXX This overlaps with krebs.retiolum
+      networking.extraHosts = concatStringsSep "\n" (flatten (
+        mapAttrsToList (hostname: host:
+          mapAttrsToList (netname: net:
+            let
+              aliases = toString (unique (longs ++ shorts));
+              providers = dns.split-by-provider net.aliases cfg.dns.providers;
+              longs = providers.hosts;
+              shorts = map (removeSuffix ".${cfg.search-domain}") longs;
+            in
+            map (addr: "${addr} ${aliases}") net.addrs
+          ) host.nets
+        ) cfg.hosts
+      ));
     }
   ];
 
@@ -330,6 +326,9 @@ let
   };
 
   tv-imp = {
+    dns.providers = {
+      de.viljetic = "regfish";
+    };
     hosts = addNames {
       cd = {
         cores = 2;
diff --git a/3modules/krebs/urlwatch.nix b/3modules/krebs/urlwatch.nix
index 58de72fc6..39d9fec54 100644
--- a/3modules/krebs/urlwatch.nix
+++ b/3modules/krebs/urlwatch.nix
@@ -35,20 +35,22 @@ let
     };
     mailto = mkOption {
       type = types.str;
+      default = config.krebs.build.user.mail;
       description = ''
         Content of the To: header of the generated mails. [AKA recipient :)]
       '';
     };
     onCalendar = mkOption {
       type = types.str;
+      default = "04:23";
       description = ''
         Run urlwatch at this interval.
         The format is described in systemd.time(7), CALENDAR EVENTS.
       '';
-      example = "04:23";
     };
     urls = mkOption {
       type = with types; listOf str;
+      default = [];
       description = "URL to watch.";
       example = [
         https://nixos.org/channels/nixos-unstable/git-revision
diff --git a/4lib/krebs/default.nix b/4lib/krebs/default.nix
index 0c42a5de3..b67585335 100644
--- a/4lib/krebs/default.nix
+++ b/4lib/krebs/default.nix
@@ -12,22 +12,7 @@ builtins // lib // rec {
 
   types = import ./types.nix { inherit lib; };
 
-
-  # listset k v = set k [v]
-
-  # listset-insert : k -> v -> listset k v -> listset k v
-  listset-insert = name: value: set:
-    set // { ${name} = set.${name} or [] ++ [value]; };
-
-  # tree k v = set k (either v (tree k v))
-
-  # tree-get : [k] -> tree k v -> v
-  tree-get = path: x:
-    let
-      y = x.${last path};
-    in
-    if typeOf y != "set"
-      then y
-      else tree-get (init path) y;
-
+  dns = import ./dns.nix { inherit lib; };
+  listset = import ./listset.nix { inherit lib; };
+  tree = import ./tree.nix { inherit lib; };
 }
diff --git a/4lib/krebs/dns.nix b/4lib/krebs/dns.nix
new file mode 100644
index 000000000..b2cf3c24c
--- /dev/null
+++ b/4lib/krebs/dns.nix
@@ -0,0 +1,31 @@
+{ lib, ... }:
+
+let
+  listset = import ./listset.nix { inherit lib; };
+in
+
+with builtins;
+with lib;
+
+rec {
+  # label = string
+
+  # TODO does it make sense to have alias = list label?
+
+  # split-by-provider :
+  #   [[label]] -> tree label provider -> listset provider alias
+  split-by-provider = as: providers:
+    foldl (m: a: listset.insert (provider-of a providers) a m) {} as;
+
+  # provider-of : alias -> tree label provider -> provider
+  # Note that we cannot use tree.get here, because path can be longer
+  # than the tree depth.
+  provider-of = a:
+    let
+      go = path: tree:
+        if typeOf tree == "string"
+          then tree
+          else go (tail path) tree.${head path};
+    in
+    go (reverseList (splitString "." a));
+}
diff --git a/4lib/krebs/listset.nix b/4lib/krebs/listset.nix
new file mode 100644
index 000000000..3aae22f20
--- /dev/null
+++ b/4lib/krebs/listset.nix
@@ -0,0 +1,11 @@
+{ lib, ... }:
+
+with lib;
+
+rec {
+  # listset k v = set k [v]
+
+  # insert : k -> v -> listset k v -> listset k v
+  insert = name: value: set:
+    set // { ${name} = set.${name} or [] ++ [value]; };
+}
diff --git a/4lib/krebs/tree.nix b/4lib/krebs/tree.nix
new file mode 100644
index 000000000..1cd83b3f6
--- /dev/null
+++ b/4lib/krebs/tree.nix
@@ -0,0 +1,13 @@
+{ lib, ... }:
+
+with lib;
+
+rec {
+  # tree k v = set k (either v (tree k v))
+
+  # get : [k] -> tree k v -> v
+  get = path: tree:
+    if length path > 0
+      then get (tail path) tree.${head path} # TODO check if elem exists
+      else tree;
+}
diff --git a/4lib/krebs/types.nix b/4lib/krebs/types.nix
index 3d3d75a65..970ef2f8e 100644
--- a/4lib/krebs/types.nix
+++ b/4lib/krebs/types.nix
@@ -55,7 +55,7 @@ types // rec {
         type = listOf hostname;
       };
       tinc = mkOption {
-        type = let net-config = config; in submodule ({ config, ... }: {
+        type = let net-config = config; in nullOr (submodule ({ config, ... }: {
           options = {
             config = mkOption {
               type = str;
@@ -70,7 +70,8 @@ types // rec {
               type = str;
             };
           };
-        });
+        }));
+        default = null;
       };
     };
   });
diff --git a/4lib/tv/default.nix b/4lib/tv/default.nix
deleted file mode 100644
index 16888c214..000000000
--- a/4lib/tv/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, pkgs, ... }:
-
-let
-  krebs = import ../../4lib/krebs { inherit lib; };
-in
-
-with krebs;
-
-krebs // rec {
-
-  git = import ./git.nix {
-    lib = lib // {
-      inherit addNames;
-    };
-    inherit pkgs;
-  };
-
-  # "7.4.335" -> "74"
-  majmin = with lib; x : concatStrings (take 2 (splitString "." x));
-
-  concat = xs :
-    if xs == []
-      then ""
-      else head xs + concat (tail xs)
-    ;
-
-  flip = f : x : y : f y x;
-
-  # isSuffixOf :: String -> String -> Bool
-  isSuffixOf =
-    s : xs :
-      let
-        sn = stringLength s;
-        xsn = stringLength xs;
-      in
-        xsn >= sn && substring (xsn - sn) sn xs == s ;
-
-  # setMap :: (String -> a -> b) -> Set String a -> [b]
-  #setMap = f: xs: map (k : f k (getAttr k xs)) (attrNames xs);
-
-  # setToList :: Set k a -> [a]
-  #setToList = setMap (_: v: v);
-
-  shell-escape =
-    let
-      isSafeChar = c: match "[-./0-9_a-zA-Z]" c != null;
-    in
-    stringAsChars (c:
-      if isSafeChar c then c
-      else if c == "\n" then "'\n'"
-      else "\\${c}");
-}
diff --git a/2configs/tv/AO753.nix b/tv/configs/AO753.nix
index 70eae1786..c103ce2d7 100644
--- a/2configs/tv/AO753.nix
+++ b/tv/configs/AO753.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../2configs/tv/smartd.nix
+    ../configs/smartd.nix
   ];
 
   boot.loader.grub = {
diff --git a/2configs/tv/CAC-CentOS-7-64bit.nix b/tv/configs/CAC-CentOS-7-64bit.nix
index 95c6e815c..168d1d97b 100644
--- a/2configs/tv/CAC-CentOS-7-64bit.nix
+++ b/tv/configs/CAC-CentOS-7-64bit.nix
@@ -33,7 +33,7 @@ _:
     #            man:systemd-tmpfiles(8)
     #   Process: 19272 ExecStart=/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/bin/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev (code=exited, status=1/FAILURE)
     #  Main PID: 19272 (code=exited, status=1/FAILURE)
-    # 
+    #
     # Mar 16 10:29:17 cd systemd-tmpfiles[19272]: [/usr/lib/tmpfiles.d/legacy.conf:26] Unknown group 'lock'.
     # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal configured, ignoring.
     # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal/7b35116927d74ea58785e00b47ac0f0d configured, ignoring.
diff --git a/2configs/tv/CAC-Developer-1.nix b/tv/configs/CAC-Developer-1.nix
index 37bc32afb..37bc32afb 100644
--- a/2configs/tv/CAC-Developer-1.nix
+++ b/tv/configs/CAC-Developer-1.nix
diff --git a/2configs/tv/CAC-Developer-2.nix b/tv/configs/CAC-Developer-2.nix
index fedb808df..fedb808df 100644
--- a/2configs/tv/CAC-Developer-2.nix
+++ b/tv/configs/CAC-Developer-2.nix
diff --git a/2configs/tv/base.nix b/tv/configs/base.nix
index 06f83ea9e..06f83ea9e 100644
--- a/2configs/tv/base.nix
+++ b/tv/configs/base.nix
diff --git a/2configs/tv/bash_completion.sh b/tv/configs/bash_completion.sh
index 537484fb9..537484fb9 100644
--- a/2configs/tv/bash_completion.sh
+++ b/tv/configs/bash_completion.sh
diff --git a/2configs/tv/charybdis.nix b/tv/configs/charybdis.nix
index d78e162cb..977626d27 100644
--- a/2configs/tv/charybdis.nix
+++ b/tv/configs/charybdis.nix
@@ -1,5 +1,9 @@
 { config, lib, pkgs, ... }:
 
+let
+  tvpkgs = import ../pkgs { inherit pkgs; };
+in
+
 with builtins;
 with lib;
 let
@@ -59,7 +63,7 @@ let
         ExecStart = pkgs.writeScript "charybdis-service" ''
           #! /bin/sh
           set -euf
-          exec ${Zpkgs.charybdis}/bin/charybdis-ircd \
+          exec ${tvpkgs.charybdis}/bin/charybdis-ircd \
             -foreground \
             -logfile /dev/stderr \
             -configfile ${configFile}
@@ -88,7 +92,7 @@ let
      *
      * See reference.conf for more information.
      */
-    
+
     /* Extensions */
     #loadmodule "extensions/chm_operonly_compat.so";
     #loadmodule "extensions/chm_quietunreg_compat.so";
@@ -111,17 +115,17 @@ let
     #loadmodule "extensions/sno_globaloper.so";
     #loadmodule "extensions/sno_whois.so";
     loadmodule "extensions/override.so";
-    
+
     /*
      * IP cloaking extensions: use ip_cloaking_4.0
      * if you're linking 3.2 and later, otherwise use
      * ip_cloaking.so, for compatibility with older 3.x
      * releases.
      */
-    
+
     #loadmodule "extensions/ip_cloaking_4.0.so";
     #loadmodule "extensions/ip_cloaking.so";
-    
+
     serverinfo {
       name = ${toJSON (head config.krebs.build.host.nets.retiolum.aliases)};
       sid = "4z3";
@@ -129,23 +133,23 @@ let
       network_name = "irc.retiolum";
       #network_desc = "Retiolum IRC Network";
       hub = yes;
-    
+
       /* On multi-homed hosts you may need the following. These define
        * the addresses we connect from to other servers. */
       /* for IPv4 */
       vhost = ${concatMapStringsSep ", " toJSON config.krebs.build.host.nets.retiolum.addrs4};
       /* for IPv6 */
       vhost6 = ${concatMapStringsSep ", " toJSON config.krebs.build.host.nets.retiolum.addrs6};
-      
+
       /* ssl_private_key: our ssl private key */