summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/alnus.nix2
-rw-r--r--tv/1systems/mu.nix3
-rw-r--r--tv/1systems/wu.nix2
-rw-r--r--tv/1systems/xu.nix2
-rw-r--r--tv/1systems/zu.nix2
-rw-r--r--tv/3modules/default.nix1
-rw-r--r--tv/3modules/hosts.nix12
7 files changed, 13 insertions, 11 deletions
diff --git a/tv/1systems/alnus.nix b/tv/1systems/alnus.nix
index a9646b588..d3de8bdfa 100644
--- a/tv/1systems/alnus.nix
+++ b/tv/1systems/alnus.nix
@@ -69,8 +69,6 @@ with config.krebs.lib;
nixpkgs.config = {
allowUnfree = true;
- chromium.enablePepperFlash = true;
- firefox.enableAdobeFlash = true;
};
services.xserver = {
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index e7908e299..55f18326d 100644
--- a/tv/1systems/mu.nix
+++ b/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;
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index a2e113e18..c2a624a91 100644
--- a/tv/1systems/wu.nix
+++ b/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";
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index fec0a02c5..642593fc4 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -153,8 +153,6 @@ with config.krebs.lib;
};
};
- nixpkgs.config.chromium.enablePepperFlash = true;
-
environment.systemPackages = with pkgs; [
ethtool
tinc_pre
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index c0d51436a..0503021d4 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -159,8 +159,6 @@ with config.krebs.lib;
};
};
- nixpkgs.config.chromium.enablePepperFlash = true;
-
environment.systemPackages = with pkgs; [
ethtool
tinc_pre
diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix
index 0b0bccab9..397ee8e85 100644
--- a/tv/3modules/default.nix
+++ b/tv/3modules/default.nix
@@ -4,6 +4,7 @@ _:
imports = [
./charybdis
./ejabberd
+ ./hosts.nix
./iptables.nix
];
}
diff --git a/tv/3modules/hosts.nix b/tv/3modules/hosts.nix
new file mode 100644
index 000000000..7bf3267c7
--- /dev/null
+++ b/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;
+ };
+}