Merge branch '21.05'

4 files changed, 11 insertions, 14 deletions

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 07e7ff11d..19e191b7b 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -38,7 +38,6 @@ with import <stockholm/lib>;
     }
     {
       i18n.defaultLocale = mkDefault "C.UTF-8";
-      security.hideProcessInformation = true;
       security.sudo.extraConfig = ''
         Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE"
         Defaults mailto="${config.krebs.users.tv.mail}"
diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 2e73640ff..1586f3b33 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -33,7 +33,7 @@ let {
       cgit = {
         settings = {
           about-filter = pkgs.exec "krebs.cgit.about-filter" rec {
-            filename = "${pkgs.pythonPackages.markdown2}/bin/markdown2";
+            filename = "${pkgs.python3Packages.markdown2}/bin/markdown2";
             argv = [
               filename
               "--extras=fenced-code-blocks"
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index 79c31e9ec..f720ad473 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/2configs/pulse.nix
@@ -116,6 +116,7 @@ in
       group = "pulse";
       extraGroups = [ "audio" ];
       home = "${runDir}/home";
+      isSystemUser = true;
     };
   };
 }
diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix
index a66b884c8..a97fb3679 100644
--- a/tv/2configs/xp-332.nix
+++ b/tv/2configs/xp-332.nix
@@ -3,7 +3,7 @@ with import <stockholm/lib>;
 
   environment.etc."utsushi.conf".text = ''
     [devices]
-    dev1.udi = esci:networkscan://EPSON79678C.fritz.box:1865
+    dev1.udi = esci:networkscan://ep.hkw:1865
     dev1.model = XP-332
     dev1.vendor = EPSON
   '';
@@ -19,17 +19,14 @@ with import <stockholm/lib>;
     packageName pkg == "imagescan-plugin-networkscan";
 
   nixpkgs.overlays = singleton (self: super: {
-    utsushi-customized = self.utsushi.override {
-      guiSupport = false;
-      jpegSupport = false;
-      networkSupport = true;
-      ocrSupport = false;
-      saneSupport = true;
-      tiffSupport = true;
-
-      logCategory = "ALL";
-      logLevel = "BRIEF";
-    };
+    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 = {