Merge remote-tracking branch 'ni/master'

krebs/3modules/tinc.nix

@@ -110,8 +110,12 @@ let
         hostsArchive = mkOption {
           type = types.package;
           default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} ''
-            ${pkgs.coreutils}/bin/ln -s ${tinc.config.hostsPackage} hosts
-            ${pkgs.gnutar}/bin/tar -hcjf $out hosts
+            cp \
+                --no-preserve=mode \
+                --recursive \
+                ${tinc.config.hostsPackage} \
+                hosts
+            ${pkgs.gnutar}/bin/tar -cjf $out hosts
           '';
           readOnly = true;
         };

tv/3modules/default.nix

@@ -3,6 +3,7 @@
     ./charybdis
     ./dnsmasq.nix
     ./ejabberd
+    ./focus.nix
     ./hosts.nix
     ./iptables.nix
     ./slock.nix

tv/3modules/focus.nix

@@ -0,0 +1,4 @@
+with import <stockholm/lib>;
+{
+  options.tv.focus.enable = mkEnableOption "tv.focus";
+}