Merge remote-tracking branch 'cd/master'

tv/1systems/alnus.nix

@@ -69,8 +69,6 @@ with config.krebs.lib;
 
   nixpkgs.config = {
     allowUnfree = true;
-    chromium.enablePepperFlash = true;
-    firefox.enableAdobeFlash = true;
   };
 
   services.xserver = {

tv/1systems/mu.nix

@@ -59,9 +59,6 @@ with config.krebs.lib;
 
   swapDevices =[ ];
 
-  nixpkgs.config.firefox.enableAdobeFlash = true;
-  nixpkgs.config.chromium.enablePepperFlash = true;
-
   nixpkgs.config.allowUnfree = true;
   hardware.opengl.driSupport32Bit = true;
 

tv/1systems/wu.nix

@@ -142,8 +142,6 @@ with config.krebs.lib;
     };
   };
 
-  nixpkgs.config.chromium.enablePepperFlash = true;
-
   krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "nvidia-x11-" pkg.name;
   hardware.bumblebee.enable = true;
   hardware.bumblebee.group = "video";

tv/1systems/xu.nix

@@ -153,8 +153,6 @@ with config.krebs.lib;
     };
   };
 
-  nixpkgs.config.chromium.enablePepperFlash = true;
-
   environment.systemPackages = with pkgs; [
     ethtool
     tinc_pre

tv/1systems/zu.nix

@@ -159,8 +159,6 @@ with config.krebs.lib;
     };
   };
 
-  nixpkgs.config.chromium.enablePepperFlash = true;
-
   environment.systemPackages = with pkgs; [
     ethtool
     tinc_pre

tv/3modules/default.nix

@@ -4,6 +4,7 @@ _:
   imports = [
     ./charybdis
     ./ejabberd
+    ./hosts.nix
     ./iptables.nix
   ];
 }

tv/3modules/hosts.nix

@@ -0,0 +1,12 @@
+{ config, ... }:
+
+with config.krebs.lib;
+
+{
+  options.tv.hosts = mkOption {
+    type = types.attrsOf types.host;
+    default =
+      filterAttrs (_: host: host.owner.name == "tv")
+      config.krebs.hosts;
+  };
+}