summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-07-18 01:30:37 +0200
committermakefu <github@syntax-fehler.de>2018-07-18 01:30:37 +0200
commite00a76d30e4514cb5164fb658552fc1589e749e4 (patch)
tree9c9f7d41b8dca41b4d6aa3b95ce04067e85b9ce8 /makefu
parentecbfc932794aa5f1301e121876f244be7edcd133 (diff)
ma wbob.r: use mceusb
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/wbob/config.nix7
-rw-r--r--makefu/2configs/hw/mceusb.nix18
2 files changed, 22 insertions, 3 deletions
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index df317a016..7c81a2015 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -43,16 +43,18 @@ in {
<stockholm/makefu/2configs/stats/external/aralast.nix>
<stockholm/makefu/2configs/stats/telegraf/airsensor.nix>
# <stockholm/makefu/2configs/stats/telegraf/bamstats.nix>
+ <stockholm/makefu/2configs/hw/mceusb.nix>
<stockholm/makefu/2configs/deployment/bureautomation>
(let
collectd-port = 25826;
influx-port = 8086;
+ admin-port = 8083;
grafana-port = 3000; # TODO nginx forward
db = "collectd_db";
logging-interface = "enp0s25";
in {
- networking.firewall.allowedTCPPorts = [ 3000 ];
+ networking.firewall.allowedTCPPorts = [ 3000 influx-port admin-port ];
services.grafana.enable = true;
services.grafana.addr = "0.0.0.0";
@@ -61,7 +63,7 @@ in {
meta.hostname = config.krebs.build.host.name;
# meta.logging-enabled = true;
http.bind-address = ":${toString influx-port}";
- admin.bind-address = ":8083";
+ admin.bind-address = ":${toString admin-port}";
collectd = [{
enabled = true;
typesdb = "${pkgs.collectd}/share/collectd/types.db";
@@ -125,7 +127,6 @@ in {
networking.firewall.allowedTCPPorts = [
655
8081 #smokeping
- 8086 #influx
49152
];
networking.firewall.trustedInterfaces = [ "enp0s25" ];
diff --git a/makefu/2configs/hw/mceusb.nix b/makefu/2configs/hw/mceusb.nix
new file mode 100644
index 000000000..c1d6f5651
--- /dev/null
+++ b/makefu/2configs/hw/mceusb.nix
@@ -0,0 +1,18 @@
+{pkgs,...}:{
+ # Disable the MCE remote from acting like a keyboard. (We use lirc instead.)
+ services.xserver.inputClassSections = [''
+ Identifier "MCE USB Keyboard mimic blacklist"
+ Driver "mceusb"
+ MatchProduct "Media Center Ed. eHome Infrared Remote Transceiver (1934:5168)"
+ Option "Ignore" "on"
+ ''];
+ boot.kernelPackages = builtins.trace "Using linux kernel 4.16, not latest" pkgs.linuxPackages_4_16;
+ nixpkgs.config.packageOverrides = pkgs: {
+ linux_4_16 = pkgs.linux_4_16.override {
+ extraConfig = ''
+ LIRC y
+ '';
+ };
+ };
+
+}