about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
Diffstat (limited to 'machines')
-rw-r--r--machines/profpatsch/shiki.nix19
1 files changed, 18 insertions, 1 deletions
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index 4352a69a..d2792bf8 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -363,9 +363,26 @@ in {
 
     services.printing = {
       enable = true;
-      drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.hplip ];
+      drivers = [
+        pkgs.gutenprint
+        pkgs.gutenprintBin
+        # pkgs.hplip
+        unfreeAndNonDistributablePkgs.canon-cups-ufr2
+        unfreeAndNonDistributablePkgs.dcp9020cdwlpr
+      ];
     };
 
+    # for discovering ddns printers.
+    services.avahi.enable = true;
+    # for being able to talk to ddns printers after finding them.
+    # disable v6 for mdns (argh)
+    services.avahi.nssmdns = false;
+    system.nssModules = [ pkgs.nssmdns ];
+    system.nssDatabases.hosts = (lib.mkMerge [
+      (lib.mkBefore [ "mdns4_minimal [NOTFOUND=return]" ]) # before resolve
+      (lib.mkAfter [ "mdns4" ]) # after dns
+    ]);
+
     ###########
     # Programs