Merge branch 'master' into 20.09

1systems/omo/config.nix

@@ -47,6 +47,7 @@ in {
       # <stockholm/makefu/2configs/legacy_only.nix>
 
       <stockholm/makefu/2configs/share/omo.nix>
+      <stockholm/makefu/2configs/share/gum-client.nix>
       <stockholm/makefu/2configs/dcpp/airdcpp.nix>
       { krebs.airdcpp.dcpp.shares = let
           d = path: "/media/cryptX/${path}";

2configs/bureautomation/kalauerbot.nix

@@ -12,6 +12,9 @@
       WorkingDirectory = "/var/lib/kalauerbot";
       ExecStart = "${pkgs.kalauerbot}/bin/kalauerbot";
       PrivateTmp = true;
+
+      Restart = "always";
+      RuntimeMaxSec = "12h";
     };
   };
 }

2configs/hw/droidcam.nix

@@ -0,0 +1,7 @@
+{ pkgs, config, ... }: 
+{
+  boot.extraModprobeConfig = "options v4l2loopback_dc width=640 height=480";
+  boot.extraModulePackages = [
+    (pkgs.callPackage  ../../5pkgs/v4l2loopback-dc { kernel = config.boot.kernelPackages.kernel; })
+  ];
+}

2configs/minimal.nix

@@ -81,4 +81,5 @@
     "net.ipv6.conf.all.use_tempaddr" = 2;
     "net.ipv6.conf.default.use_tempaddr" = 2;
   };
+
 }

2configs/printer.nix

@@ -21,16 +21,20 @@ in {
   hardware.sane = {
     enable = true;
     extraBackends = [ ];
+    netConf =
+      # drucker.lan SCX-3205W
+      ''
+        192.168.1.6''
+      # uhrenkind.shack magicolor 1690mf
+    + ''
+        10.42.20.30'';
 
     # $ 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."xerox_mfp" = ''
-      tcp 192.168.1.5
-    ''; #home printer SCX-3205W
+    extraConfig."magicolor" = ''
+      net 10.42.20.30 0x2098
+    ''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf
   };
   state = [ "/var/lib/cups" ];
 }

2configs/remote-build/gum.nix

@@ -10,6 +10,14 @@
         system = "x86_64-linux";
         supportedFeatures = [ ];
       }
+      {
+        hostName = "gum.krebsco.de";
+        maxJobs = 8;
+        sshKey = toString <secrets/id_nixBuild>;
+        sshUser = "nixBuild";
+        system = "armv6l-linux";
+        supportedFeatures = [ ];
+      }
     ];
   };
 }

2configs/share/omo.nix

@@ -82,6 +82,9 @@ in {
       printing = bsd
       printcap name = /dev/null
       disable spoolss = yes
+      workgroup = WORKGROUP
+      server string = ${config.networking.hostName}
+      netbios name = ${config.networking.hostName}
     '';
   };
 }

2configs/urlwatch/default.nix

@@ -34,6 +34,9 @@ in {
       https://pypi.python.org/simple/pyserial/
       https://pypi.python.org/simple/semantic_version/
       # weird shit
+      { url = "https://www.zigbee2mqtt.io/information/supported_adapters.html";
+        filter = "html2text";
+      }
       http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/
       https://erdgeist.org/gitweb/opentracker/info/refs?service=git-upload-pack
 

2configs/wireguard/server.nix

@@ -54,4 +54,10 @@ in { # wireguard server
     }
     ];
   };
+  # TODO: this issue is related to the router which connects to the host but is
+  # unable to re-connect once restarted
+  systemd.services.wireguard-wg0.serviceConfig = {
+    Restart = "always";
+    RuntimeMaxSec = "12h";
+  };
 }

5pkgs/droidcam/default.nix

@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitHub
+, pkg-config
+, alsaLib
+, libjpeg_turbo
+, ffmpeg
+, libusbmuxd
+, speex
+, gtk3
+, libappindicator-gtk3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "droidcam";
+  version = "1.6";
+
+  src = fetchFromGitHub {
+    owner = "aramg";
+    repo = "droidcam";
+    rev = "v${version}";
+    sha256 = "1d9qpnmqa3pfwsrpjnxdz76ipk4w37bbxyrazchh4vslnfc886fx";
+  };
+
+  sourceRoot = "source/linux";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    alsaLib
+    libjpeg_turbo
+    ffmpeg
+    libusbmuxd
+    speex
+    gtk3
+    libappindicator-gtk3
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    make JPEG_DIR="" JPEG_INCLUDE="" JPEG_LIB="" JPEG="$(pkg-config --libs --cflags libturbojpeg)"
+  '';
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 "droidcam" "$out/bin/droidcam"
+    install -Dm755 "droidcam-cli" "$out/bin/droidcam-cli"
+    install -Dm644 icon2.png "$out/share/pixmaps/droidcam.png"
+    install -Dm644 README.md "$out/share/licenses/droidcam/LICENSE"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A kernel module to create V4L2 loopback devices";
+    homepage = "https://github.com/aramg/droidcam";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.makefu ];
+    platforms = platforms.linux;
+  };
+}

5pkgs/kalauerbot/badsync.patch

@@ -0,0 +1,14 @@
+diff --git a/matrix_client/client.py b/matrix_client/client.py
+index af0e08f..f848c4f 100644
+--- a/matrix_client/client.py
++++ b/matrix_client/client.py
+@@ -471,7 +471,7 @@ class MatrixClient(object):
+         self._sync(timeout_ms)
+ 
+     def listen_forever(self, timeout_ms=30000, exception_handler=None,
+-                       bad_sync_timeout=5):
++                       bad_sync_timeout=61):
+         """ Keep listening for events forever.
+ 
+         Args:
+

5pkgs/kalauerbot/default.nix

@@ -8,7 +8,12 @@ rev = "08d98aa";
     sha256 = "017hh61smgq4zsxd10brgwmykwgwabgllxjs31xayvs1hnqmkv2v";
   };
   propagatedBuildInputs = with python3.pkgs;[
-    (callPackage ./python-matrixbot.nix {})
+     (callPackage ./python-matrixbot.nix {
+      matrix-client = (stdenv.lib.overrideDerivation matrix-client (self: {
+      patches = [ ./badsync.patch ];
+    }));
+    })
+
     (stdenv.lib.overrideDerivation googletrans (self: {
       patches = [ ./translate.patch ];
     }))

5pkgs/v4l2loopback-dc/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, kernel, kmod }:
+
+stdenv.mkDerivation rec {
+  name = "v4l2loopback-dc-${version}-${kernel.version}";
+  version = "1.6";
+
+  src = fetchFromGitHub {
+    owner = "aramg";
+    repo = "droidcam";
+    rev = "v${version}";
+    sha256 = "1d9qpnmqa3pfwsrpjnxdz76ipk4w37bbxyrazchh4vslnfc886fx";
+  };
+
+  sourceRoot = "source/linux/v4l2loopback";
+
+  buildTargets = "v4l2loopback-dc";
+  hardeningDisable = [ "pic" ];
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+  buildInputs = [ kmod ];
+
+
+  makeFlags = [
+    "KERNELRELEASE=${kernel.modDirVersion}"
+    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "INSTALL_MOD_PATH=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A kernel module to create V4L2 loopback devices";
+    homepage = "https://github.com/aramg/droidcam";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.makefu ];
+    platforms = platforms.linux;
+  };
+}