makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ma wbob.r: use mceusb

Browse source
This commit is contained in:
makefu 2018-07-18 01:30:37 +02:00
parent b4ffb2f931
commit f37cd71f13
2 changed files with 22 additions and 3 deletions
1systems/wbob
config.nix
2configs/hw
mceusb.nix

7
1systems/wbob/config.nix
View file

@ -43,16 +43,18 @@ in {
<stockholm/makefu/2configs/stats/external/aralast.nix> <stockholm/makefu/2configs/stats/external/aralast.nix>
<stockholm/makefu/2configs/stats/telegraf/airsensor.nix> <stockholm/makefu/2configs/stats/telegraf/airsensor.nix>
# <stockholm/makefu/2configs/stats/telegraf/bamstats.nix> # <stockholm/makefu/2configs/stats/telegraf/bamstats.nix>
<stockholm/makefu/2configs/hw/mceusb.nix>
<stockholm/makefu/2configs/deployment/bureautomation> <stockholm/makefu/2configs/deployment/bureautomation>
(let (let
collectd-port = 25826; collectd-port = 25826;
influx-port = 8086; influx-port = 8086;
admin-port = 8083;
grafana-port = 3000; # TODO nginx forward grafana-port = 3000; # TODO nginx forward
db = "collectd_db"; db = "collectd_db";
logging-interface = "enp0s25"; logging-interface = "enp0s25";
in { in {
networking.firewall.allowedTCPPorts = [ 3000 ]; networking.firewall.allowedTCPPorts = [ 3000 influx-port admin-port ];
services.grafana.enable = true; services.grafana.enable = true;
services.grafana.addr = "0.0.0.0"; services.grafana.addr = "0.0.0.0";
@ -61,7 +63,7 @@ in {
meta.hostname = config.krebs.build.host.name; meta.hostname = config.krebs.build.host.name;
# meta.logging-enabled = true; # meta.logging-enabled = true;
http.bind-address = ":${toString influx-port}"; http.bind-address = ":${toString influx-port}";
admin.bind-address = ":8083"; admin.bind-address = ":${toString admin-port}";
collectd = [{ collectd = [{
enabled = true; enabled = true;
typesdb = "${pkgs.collectd}/share/collectd/types.db"; typesdb = "${pkgs.collectd}/share/collectd/types.db";
@ -125,7 +127,6 @@ in {
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
655 655
8081 #smokeping 8081 #smokeping
8086 #influx
49152 49152
]; ];
networking.firewall.trustedInterfaces = [ "enp0s25" ]; networking.firewall.trustedInterfaces = [ "enp0s25" ];

18
2configs/hw/mceusb.nix Normal file
View file

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