Merge remote-tracking branch 'tv/master'

7 files changed, 21 insertions, 18 deletions

diff --git a/tv/2configs/br.nix b/tv/2configs/br.nix
index d660ebc35..e6a46e903 100644
--- a/tv/2configs/br.nix
+++ b/tv/2configs/br.nix
@@ -5,10 +5,11 @@ with import <stockholm/lib>;
     <nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix>
   ];
 
-  krebs.nixpkgs.allowUnfreePredicate = pkg: any (flip hasPrefix pkg.name) [
-    "brother-udev-rule-type1-"
-    "brscan4-"
-    "mfcl2700dnlpr-"
+  krebs.nixpkgs.allowUnfreePredicate = pkg: any (eq (packageName pkg)) [
+    "brother-udev-rule-type1"
+    "brscan4"
+    "brscan4-etc-files"
+    "mfcl2700dnlpr"
   ];
 
   hardware.sane = {
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 4fc755c43..72c48da2c 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -120,6 +120,7 @@ with import <stockholm/lib>;
 
     {
       environment.systemPackages = [
+        pkgs.field
         pkgs.get
         pkgs.git
         pkgs.git-crypt
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index 4df5e097a..d5b755cef 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -39,5 +39,5 @@ with import <stockholm/lib>;
     HandleSuspendKey=ignore
   '';
 
-  krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "broadcom-sta-" pkg.name;
+  krebs.nixpkgs.allowUnfreePredicate = pkg: packageName pkg == "broadcom-sta";
 }
diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix
index 55e9482d4..7d837eabc 100644
--- a/tv/2configs/hw/w110er.nix
+++ b/tv/2configs/hw/w110er.nix
@@ -10,10 +10,11 @@ with import <stockholm/lib>;
       #hardware.bumblebee.enable = true;
       #hardware.bumblebee.group = "video";
       #hardware.enableRedistributableFirmware= true;
-      #krebs.nixpkgs.allowUnfreePredicate = pkg:
-      #  hasPrefix "nvidia-x11-" pkg.name ||
-      #  hasPrefix "nvidia-persistenced-" pkg.name ||
-      #  hasPrefix "nvidia-settings-" pkg.name;
+      #krebs.nixpkgs.allowUnfreePredicate = pkg: any (eq (packageName pkg)) [
+      #  "nvidia-x11"
+      #  "nvidia-persistenced"
+      #  "nvidia-settings"
+      #];
     }
   ];
 
diff --git a/tv/2configs/sshd.nix b/tv/2configs/sshd.nix
index 1749b552d..25468f23e 100644
--- a/tv/2configs/sshd.nix
+++ b/tv/2configs/sshd.nix
@@ -5,12 +5,6 @@ with import <stockholm/lib>;
 {
   services.openssh = {
     enable = true;
-    hostKeys = [
-      {
-        type = "ed25519";
-        path = "/etc/ssh/ssh_host_ed25519_key";
-      }
-    ];
   };
   tv.iptables.input-internet-accept-tcp = singleton "ssh";
 }
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 40dc7d237..378b5d167 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -1,9 +1,15 @@
 with import <stockholm/lib>;
 { config, pkgs, ... }: let
-  json = url: {
+  exec = filename: args: url: {
     inherit url;
-    filter = "system:${pkgs.jq}/bin/jq .";
+    filter = "system:${
+      concatMapStringsSep " " shell.escape ([filename] ++ toList args)
+    }";
   };
+  json = json' ["."];
+  json' = exec "${pkgs.jq}/bin/jq";
+  xml = xml' ["--format" "-"];
+  xml' = exec "${pkgs.libxml2}/bin/xmllint";
 in {
   krebs.urlwatch = {
     enable = true;
diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix
index 4a0b0ae16..a66b884c8 100644
--- a/tv/2configs/xp-332.nix
+++ b/tv/2configs/xp-332.nix
@@ -16,7 +16,7 @@ with import <stockholm/lib>;
   };
 
   krebs.nixpkgs.allowUnfreePredicate = pkg:
-    elem (parseDrvName pkg.name).name [ "imagescan-plugin-networkscan" ];
+    packageName pkg == "imagescan-plugin-networkscan";
 
   nixpkgs.overlays = singleton (self: super: {
     utsushi-customized = self.utsushi.override {