Merge remote-tracking branch '3nprob/fix-sys-print-scan'

* 3nprob/fix-sys-print-scan:
  feat: sys-print.install: install fonts
  feat: sys-print: arch and fedora support
  feat: sys-print: enable avahi service

salt/sys-print/create.sls

@@ -46,6 +46,7 @@ prefs:
 features:
 - enable:
   - servicevm
+  - service.avahi
   - service.cups
   - appmenus-dispvm
 - disable:
@@ -115,6 +116,7 @@ prefs:
 features:
 - enable:
   - servicevm
+  - service.avahi
   - service.cups
 - disable:
   - service.cups-browsed

salt/sys-print/install-driver-all.sls

@@ -9,6 +9,32 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 include:
   - sys-print.install
 
+{% set pkg = {
+    'Arch': {
+      'pkg': [
+        'foomatic-db-gutenprint-ppds',
+      ],
+    },
+    'Debian': {
+      'pkg': [
+        'printer-driver-all-enforce',
+      ],
+    },
+    'RedHat': {
+      'pkg': [
+        'c2esp',
+        'dymo-cups-drivers',
+        'epson-inkjet-printer-escpr',
+        'epson-inkjet-printer-escpr2',
+        'foomatic',
+        'foomatic-db',
+        'foomatic-db-ppds',
+        'printer-driver-brlaser',
+        'ptouch-driver',
+      ],
+    },
+}.get(grains.os_family) -%}
+
 "{{ slsdotpath }}-installed-driver-all":
   pkg.installed:
     - require:
@@ -16,7 +42,5 @@ include:
     - install_recommends: False
     - skip_suggestions: True
     - setopt: "install_weak_deps=False"
-    - pkgs:
-      - printer-driver-all-enforce
-
+    - pkgs: {{ pkg.pkg|sequence|yaml }}
 {% endif -%}

salt/sys-print/install.sls

@@ -23,20 +23,61 @@ include:
     - setopt: "install_weak_deps=False"
     - pkgs:
       ## Discovery
-      - qubes-core-agent-networking
       - cups
       - ipp-usb
       - man-db
       ## Print
-      - printer-driver-cups-pdf
       - system-config-printer
       ## Scan
-      ## TODO: simple-scan did not detect my scanner, but detected printer.
       - simple-scan
-      - sane
-      - sane-utils
       - sane-airscan
 
+{% set pkg = {
+    'Arch': {
+      'pkg': [
+        'cups-filters',
+        'gnu-free-fonts',
+        'gutenprint',
+        'noto-fonts',
+        'qubes-vm-networking',
+        'ttf-dejavu',
+        'ttf-liberation',
+      ],
+    },
+    'Debian': {
+      'pkg': [
+        'cups-filters-core-drivers',
+        'cups-ipp-utils',
+        'fontconfig-config',
+        'fonts-recommended',
+        'printer-driver-cups-pdf',
+        'printer-driver-gutenprint',
+        'qubes-core-agent-networking',
+        'sane',
+        'sane-utils',
+      ],
+    },
+    'RedHat': {
+      'pkg': [
+        'cups-filters-driverless',
+        'cups-ipptool',
+        'cups-pdf',
+        'default-fonts',
+        'gutenprint-cups',
+        'liberation-fonts-all',
+        'open-sans-fonts',
+        'qubes-core-agent-networking',
+        'sane-backends',
+      ],
+    },
+}.get(grains.os_family) -%}
+
+"{{ slsdotpath }}-installed-os-specific":
+  pkg.installed:
+    - setopt: "install_weak_deps=False"
+    - skip_suggestions: True
+    - pkgs: {{ pkg.pkg|sequence|yaml }}
+
 "{{ slsdotpath }}-add-user-to-lpadmin-group":
   group.present:
     - name: lpadmin