Merge remote-tracking branch 'gum/master'

12 files changed, 96 insertions, 12 deletions

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 934bfa685..2f288e708 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -40,7 +40,7 @@ in {
       # services
       <stockholm/makefu/2configs/share/gum.nix>
       <stockholm/makefu/2configs/sabnzbd.nix>
-      <stockholm/makefu/2configs/torrent.nix>
+      # <stockholm/makefu/2configs/torrent.nix>
       <stockholm/makefu/2configs/iodined.nix>
       <stockholm/makefu/2configs/vpn/openvpn-server.nix>
       <stockholm/makefu/2configs/dnscrypt/server.nix>
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 4c93a7a3e..32cd3f900 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -60,6 +60,7 @@ in {
       <stockholm/makefu/2configs/stats/nodisk-client.nix>
       # logs to influx
       <stockholm/makefu/2configs/stats/external/aralast.nix>
+      <stockholm/makefu/2configs/stats/telegraf>
 
       # services
       <stockholm/makefu/2configs/syncthing.nix>
@@ -77,6 +78,9 @@ in {
 
       ## as long as pyload is not in nixpkgs:
       # docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
+
+      # Temporary:
+      <stockholm/makefu/2configs/temp/rst-issue.nix>
     ];
   makefu.full-populate = true;
   makefu.server.primary-itf = primaryInterface;
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index faa29f3db..892eb1095 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -56,7 +56,6 @@ with import <stockholm/lib>;
       <stockholm/makefu/2configs/git/brain-retiolum.nix>
       <stockholm/makefu/2configs/tor.nix>
       <stockholm/makefu/2configs/vpn/vpngate.nix>
-      <stockholm/makefu/2configs/steam.nix>
       # <stockholm/makefu/2configs/buildbot-standalone.nix>
 
       # Hardware
diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix
index 0865a0841..51e69d8b7 100644
--- a/makefu/2configs/printer.nix
+++ b/makefu/2configs/printer.nix
@@ -14,17 +14,20 @@ in {
 
   # scanners are printers just in reverse anyway
   services.saned.enable = true;
-  users.users."${mainUser}".extraGroups = [ "scanner" ];
+  users.users."${mainUser}".extraGroups = [ "scanner" "lp" ];
 
   hardware.sane = {
     enable = true;
-    extraBackends = [ pkgs.samsungUnifiedLinuxDriver ];
+    extraBackends = [ ];
 
     # $ scanimage -p --format=jpg --mode=Gray --source="Automatic Document Feeder" -v --batch="lol%d.jpg" --resolution=150
 
     # requires 'sane-extra', scan via:
-    extraConfig."magicolor" = ''
-      net 10.42.20.30 0x2098
-    ''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf
+    #extraConfig."magicolor" = ''
+    #  net 10.42.20.30 0x2098
+    #''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf
+    extraConfig."xerox_mfp" = ''
+      tcp 192.168.1.5
+    ''; #home printer SCX-3205W
   };
 }
diff --git a/makefu/2configs/stats/telegraf/default.nix b/makefu/2configs/stats/telegraf/default.nix
new file mode 100644
index 000000000..4da6561d6
--- /dev/null
+++ b/makefu/2configs/stats/telegraf/default.nix
@@ -0,0 +1,20 @@
+{...}:
+let
+  url = "http://localhost:8086";
+in {
+  imports = [
+    ./europastats.nix
+  ];
+  services.telegraf = {
+    enable = true;
+    extraConfig = {
+      agent.debug = true;
+      outputs = {
+        influxdb = [{
+          urls = [ url ];
+          database = "telegraf";
+        }];
+      };
+    };
+  };
+}
diff --git a/makefu/2configs/stats/telegraf/europastats.nix b/makefu/2configs/stats/telegraf/europastats.nix
new file mode 100644
index 000000000..9249280c5
--- /dev/null
+++ b/makefu/2configs/stats/telegraf/europastats.nix
@@ -0,0 +1,43 @@
+{ pkgs, ...}:
+let
+  pkg = with pkgs.python3Packages;buildPythonPackage rec {
+    rev = "be31da7";
+    name = "europastats-${rev}";
+    propagatedBuildInputs = [
+      requests2
+      docopt
+    ];
+    src = pkgs.fetchgit {
+      url = "http://cgit.euer.krebsco.de/europastats";
+      inherit rev;
+      sha256 = "0qj18vgj9nm6aisyqhk3iz3rf8xp7mn5jc6sfylcaw588a9sjfvc";
+    };
+  };
+in {
+  services.telegraf.extraConfig.inputs.exec = [
+    {
+      commands = [ "${pkg}/bin/europa-attractions"];
+      timeout = "1m";
+      data_format = "json";
+      name_override = "europawaiting";
+      interval = "1m";
+      tag_keys = [
+        "status"
+        "type"
+        "name"
+      ];
+    }
+    {
+      commands = [ "${pkg}/bin/europa-weather"];
+      timeout = "20s";
+      data_format = "json";
+      name_override = "europaweather";
+      interval = "10m";
+      tag_keys = [
+        "type"
+        "name"
+        "offset"
+      ];
+    }
+  ];
+}
diff --git a/makefu/2configs/tools/all.nix b/makefu/2configs/tools/all.nix
index c7a116918..7755e2872 100644
--- a/makefu/2configs/tools/all.nix
+++ b/makefu/2configs/tools/all.nix
@@ -7,6 +7,7 @@
     ./extra-gui.nix
     ./games.nix
     ./media.nix
+    ./scanner-tools.nix
     ./sec.nix
     ./sec-gui.nix
     ./studio.nix
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 47f06287b..8e815da5e 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -1,8 +1,10 @@
 { pkgs, ... }:
 
 {
-  krebs.per-user.makefu.packages = with pkgs; [
-    steam
+  imports = [
+    ./steam.nix
+  ];
+  users.users.makefu.packages = with pkgs; [
     games-user-env
   ];
 }
diff --git a/makefu/2configs/tools/scanner-tools.nix b/makefu/2configs/tools/scanner-tools.nix
new file mode 100644
index 000000000..ef2e913e4
--- /dev/null
+++ b/makefu/2configs/tools/scanner-tools.nix
@@ -0,0 +1,7 @@
+{
+  # ln -s /run/current-system/sw/bin/xsane ~/.gimp-2.8/plug-ins/xsane
+  nixpkgs.config.packageOverrides = pkgs: {
+    xsaneGimp = pkgs.xsane.override { gimpSupport = true; };
+  };
+}
+
diff --git a/makefu/2configs/steam.nix b/makefu/2configs/tools/steam.nix
index d4ec84abf..dbe51270d 100644
--- a/makefu/2configs/steam.nix
+++ b/makefu/2configs/tools/steam.nix
@@ -1,6 +1,10 @@
 {pkgs, ...}:
 {
-  environment.systemPackages = [ pkgs.steam ];
+  environment.systemPackages = [ 
+    (pkgs.steam.override {
+      newStdcpp = true;
+    })
+  ];
   hardware.opengl.driSupport32Bit = true;
   hardware.pulseaudio.support32Bit = true;
 }
diff --git a/makefu/2configs/virtualisation/docker.nix b/makefu/2configs/virtualisation/docker.nix
index ddef9e371..951bdbf26 100644
--- a/makefu/2configs/virtualisation/docker.nix
+++ b/makefu/2configs/virtualisation/docker.nix
@@ -1,8 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   virtualisation.docker.enable = true;
   environment.systemPackages = with pkgs;[
     docker
     docker_compose
   ];
+  users.extraUsers.${config.krebs.build.user.name}.extraGroups = [ "docker" ];
 }
diff --git a/makefu/2configs/vncserver.nix b/makefu/2configs/vncserver.nix
index 3d1d9fe75..e62a3f748 100644
--- a/makefu/2configs/vncserver.nix
+++ b/makefu/2configs/vncserver.nix
@@ -33,7 +33,7 @@ in {
       serviceConfig = {
         User = "nobody";
         ExecStart = "${pkgs.novnc}/bin/launch-novnc.sh --listen ${toString web_port} --vnc localhost:${toString vnc_port}";
-				PrivateTmp = true;
+        PrivateTmp = true;
       };
     };
   };