[flake] update zineshop

flake.lock

@@ -450,11 +450,11 @@
         "utils": "utils_4"
       },
       "locked": {
-        "lastModified": 1744407738,
-        "narHash": "sha256-dIFaDlezDfAdl9oE0L/3pXqQ5kxH9A3YbqpkQDbKbLE=",
+        "lastModified": 1744417522,
+        "narHash": "sha256-vB0U0OuLWmJimbyykNzoSttJqSo5sHOzMz1nFWuvUos=",
         "ref": "refs/heads/master",
-        "rev": "0b4439647aeb13b2f0f2cfb44a372b1d78db1387",
-        "revCount": 73,
+        "rev": "a8cb853c92dfde5c611641afb987309fe99f00bd",
+        "revCount": 74,
         "type": "git",
         "url": "https://git.dynamicdiscord.de/kalipso/zineshop"
       },

machines/louise/configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   imports =
@@ -9,6 +9,7 @@
       ../modules/sshd.nix
       ../modules/minimal_tools.nix
       ../modules/autoupdate.nix
+      inputs.self.nixosModules.malobeo.printing
     ];
 
   malobeo.autoUpdate = {
@@ -50,9 +51,10 @@
   };
 
   services.printing.enable = true;
+  services.malobeo.printing.enable = true;
+
   services.printing.drivers = [
     (pkgs.writeTextDir "share/cups/model/brother5350.ppd" (builtins.readFile ../modules/BR5350_2_GPL.ppd))
-    (pkgs.writeTextDir "share/cups/model/konicaminoltac258.ppd" (builtins.readFile ../modules/KOC658UX.ppd))
     pkgs.gutenprint
     pkgs.gutenprintBin
     pkgs.brlaser

machines/modules/malobeo/printing.nix

@@ -0,0 +1,51 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let 
+  cfg = config.services.malobeo.printing;
+  driverFile = pkgs.writeTextDir "share/cups/model/konicaminoltac258.ppd" (builtins.readFile ../KOC658UX.ppd);
+
+  defaultPpdOptions = {
+    PageSize = "A4";
+    SelectColor = "Grayscale";
+    Finisher = "FS534";
+    SaddleUnit = "SD511";
+    Model = "C258";
+    InputSlot = "Tray1";
+  };
+
+in
+{
+  options.services.malobeo.printing = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Setup malobeo printers";
+    };
+  };
+  
+  config = mkIf (cfg.enable) {
+    services.printing.enable = true;
+    services.printing.drivers = [
+      driverFile
+    ];
+
+    hardware.printers.ensurePrinters = [ {
+      name = "KonicaDefault";
+      model = "konicaminoltac258.ppd";
+      location = "Zine Workshop";
+      deviceUri = "ipp://192.168.1.42/ipp";
+      ppdOptions = defaultPpdOptions;
+    }
+    {
+      name = "KonicaBooklet";
+      model = "konicaminoltac258.ppd";
+      location = "Zine Workshop";
+      deviceUri = "ipp://192.168.1.42/ipp";
+      ppdOptions = defaultPpdOptions // {
+        Fold = "Stitch";
+        Staple = "None";
+      };
+    }
+  ];
+  };
+}

machines/zineshop/configuration.nix

@@ -10,6 +10,7 @@ with lib;
 
   imports = [
     inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.printing
     inputs.zineshop.nixosModules.zineshop
     ../modules/malobeo_user.nix
     ../modules/sshd.nix
@@ -22,6 +23,9 @@ with lib;
     lokiHost = "10.0.0.14";
   };
 
+  services.printing.enable = true;
+  services.malobeo.printing.enable = true;
+
   services.zineshop.enable = true;
   networking.firewall.allowedTCPPorts = [ 8080 ];
 

outputs.nix

@@ -117,6 +117,7 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
       disko.imports = [ ./machines/modules/disko ];
       users.imports = [ ./machines/modules/malobeo/users.nix ];
       backup.imports = [ ./machines/modules/malobeo/backup.nix ];
+      printing.imports = [ ./machines/modules/malobeo/printing.nix ];
     };
 
     hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) (