Merge remote-tracking branch 'ni/master'

6 files changed, 5 insertions, 99 deletions

diff --git a/kartei/tv/hosts/pi.nix b/kartei/tv/hosts/pi.nix
new file mode 100644
index 00000000..991bc008
--- /dev/null
+++ b/kartei/tv/hosts/pi.nix
@@ -0,0 +1,4 @@
+{
+  nets.wiregrill.ip4.addr = "10.244.3.102";
+  syncthing.id = "NLR6FLV-2MJQSZ6-4M5QBBB-X2UM225-YGB6IYW-F2EGFV6-D7ZDCWY-27EQAAM";
+}
diff --git a/kartei/tv/wiregrill/pi.pub b/kartei/tv/wiregrill/pi.pub
new file mode 100644
index 00000000..8d5b3f10
--- /dev/null
+++ b/kartei/tv/wiregrill/pi.pub
@@ -0,0 +1 @@
+HlKTr86mTywYtRIQNhxs8jeSw5hwVTeKFiSUYglc4T8=
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 8df29f75..7ba7d162 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -3,7 +3,6 @@ with import ./lib;
   imports = [
     <stockholm/tv>
     <stockholm/tv/2configs/retiolum.nix>
-    <stockholm/tv/2configs/xp-332.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.querel;
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index b83d01f0..80d16e68 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -17,7 +17,6 @@ with import ./lib;
     <stockholm/tv/2configs/retiolum.nix>
     <stockholm/tv/2configs/binary-cache>
     <stockholm/tv/2configs/br.nix>
-    <stockholm/tv/2configs/xp-332.nix>
     <stockholm/tv/2configs/xserver>
     <stockholm/tv/2configs/xsessions>
     <stockholm/tv/2configs/xserver/xkiller.nix>
diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix
deleted file mode 100644
index 51fd1ae8..00000000
--- a/tv/2configs/xp-332.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-with import ./lib;
-{ config, pkgs, ... }: {
-
-  environment.etc."utsushi.conf".text = ''
-    [devices]
-    dev1.udi = esci:networkscan://ep.hkw:1865
-    dev1.model = XP-332
-    dev1.vendor = EPSON
-  '';
-
-  hardware.sane = {
-    enable = true;
-    extraBackends = [
-      pkgs.utsushi-customized
-    ];
-  };
-
-  krebs.nixpkgs.allowUnfreePredicate = pkg:
-    packageName pkg == "imagescan-plugin-networkscan";
-
-  nixpkgs.overlays = singleton (self: super: {
-    utsushi-customized = self.utsushi.overrideAttrs (old: {
-      postInstall = ''
-        ${old.postInstall or ""}
-        ln -s /etc/utsushi.conf $out/etc/utsushi/utsushi.conf
-        ln -s ${pkgs.imagescan-plugin-networkscan}/lib/utsushi/networkscan \
-          $out/libexec/utsushi/
-      '';
-    });
-  });
-
-  services = {
-    printing = {
-      drivers = [
-        pkgs.epson-escpr
-      ];
-      enable = true;
-    };
-    saned.enable = true;
-  };
-
-}
diff --git a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix b/tv/5pkgs/simple/imagescan-plugin-networkscan.nix
deleted file mode 100644
index 4f9b84b2..00000000
--- a/tv/5pkgs/simple/imagescan-plugin-networkscan.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ fetchurl, lib, pkgs, stdenv }:
-
-stdenv.mkDerivation rec {
-  pname = "imagescan-plugin-networkscan";
-  version = "1.1.3";
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/imagescanv3/debian/latest1/deb/x64/imagescan-bundle-debian-10-3.63.0.x64.deb.tar.gz"
-          "http://ni.r/~tv/mirrors/epson/imagescan-bundle-debian-10-3.63.0.x64.deb.tar.gz"
-        ];
-        hash = "sha256:1rbz6mjfinag7c2vnyl7lls3gpn8n91sv0p18ilnbw0vaddssn4j";
-      }
-    else throw "${pname} is not supported on ${stdenv.system}; supported systems: x86_64-linux";
-
-  dontBuild = true;
-
-  nativeBuildInputs = [
-    pkgs.dpkg
-  ];
-
-  installPhase = ''
-    # Wildcard * stand for either i386 or amd64
-    dpkg -x \
-        plugins/imagescan-plugin-networkscan_${version}-1epson4debian10_*.deb \
-        tmp
-
-    mv tmp/usr $out
-  '';
-
-  preFixup = ''
-    patchelf --set-interpreter \
-        ${pkgs.pkgsi686Linux.glibc}/lib/ld-linux-x86-64.so.2 \
-        $out/lib/utsushi/networkscan
-
-    # libstdc++.so.6
-    patchelf --set-rpath \
-        ${stdenv.cc.cc.lib}/lib \
-        $out/lib/utsushi/networkscan
-  '';
-
-  meta = {
-    description = "Epson Image Scan v3 networkscan plugin";
-    longDescription = ''
-      This package provides the unfree networkscan plugin from the Epson
-      Image Scan v3 scanner driver bundle, which can be used by Utsushi.
-    '';
-    homepage = "http://support.epson.net/linux/en/imagescanv3.php?version=${version}";
-    license = lib.licenses.eapl;
-    maintainers = [ lib.maintainers.tv ];
-    platforms = lib.platforms.linux;
-  };
-}