Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse Source
This commit is contained in:
lassulus 2016-08-04 19:55:51 +02:00
commit 8d209efd0a
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tv/1systems/alnus.nix
View File

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

3
tv/1systems/mu.nix
View File

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

2
tv/1systems/wu.nix
View File

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

2
tv/1systems/xu.nix
View File

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

2
tv/1systems/zu.nix
View File

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

1
tv/3modules/default.nix
View File

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

12
tv/3modules/hosts.nix Normal file
View File

@ -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;
};
}