mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 03:34:58 +00:00
d93fb1bd10
Commit a52e27d4f6
changed the `ensurePrinter` mechanism such that it uses
`lib.cli.toGNUCommandLineShell` to assemble the
`lpadmin` command line that creates the required printer.
Before that commit, the command line contained
single quotes (')to protect certain options from being
(mis-)interpreted by the shell.
The new mechanism no longer needs those quotes as
`lib.cli.toGNUCommandLineShell` takes care of quoting/escaping.
Unfortunatelly, the commit missed the
quotes around the `-o` command line part.
`lib.cli.toGNUCommandLineShell` now properly escapes
those quotes, thereby including them in the effective
command line arguments that are passed to `lpadmin`.
The result is that no option is applied anymore.
The commit at hand simply removes the superfluous quotes.
With this change, options are again properly applied as before.
141 lines
4.9 KiB
Nix
141 lines
4.9 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
with lib;
|
|
let
|
|
cfg = config.hardware.printers;
|
|
|
|
ensurePrinter = p: let
|
|
args = cli.toGNUCommandLineShell {} ({
|
|
p = p.name;
|
|
v = p.deviceUri;
|
|
m = p.model;
|
|
} // optionalAttrs (p.location != null) {
|
|
L = p.location;
|
|
} // optionalAttrs (p.description != null) {
|
|
D = p.description;
|
|
} // optionalAttrs (p.ppdOptions != {}) {
|
|
o = mapAttrsToList (name: value: "${name}=${value}") p.ppdOptions;
|
|
});
|
|
in ''
|
|
${pkgs.cups}/bin/lpadmin ${args} -E
|
|
'';
|
|
|
|
ensureDefaultPrinter = name: ''
|
|
${pkgs.cups}/bin/lpadmin -d '${name}'
|
|
'';
|
|
|
|
# "graph but not # or /" can't be implemented as regex alone due to missing lookahead support
|
|
noInvalidChars = str: all (c: c != "#" && c != "/") (stringToCharacters str);
|
|
printerName = (types.addCheck (types.strMatching "[[:graph:]]+") noInvalidChars)
|
|
// { description = "printable string without spaces, # and /"; };
|
|
|
|
|
|
in {
|
|
options = {
|
|
hardware.printers = {
|
|
ensureDefaultPrinter = mkOption {
|
|
type = types.nullOr printerName;
|
|
default = null;
|
|
description = ''
|
|
Ensures the named printer is the default CUPS printer / printer queue.
|
|
'';
|
|
};
|
|
ensurePrinters = mkOption {
|
|
description = ''
|
|
Will regularly ensure that the given CUPS printers are configured as declared here.
|
|
If a printer's options are manually changed afterwards, they will be overwritten eventually.
|
|
This option will never delete any printer, even if removed from this list.
|
|
You can check existing printers with {command}`lpstat -s`
|
|
and remove printers with {command}`lpadmin -x <printer-name>`.
|
|
Printers not listed here can still be manually configured.
|
|
'';
|
|
default = [];
|
|
type = types.listOf (types.submodule {
|
|
options = {
|
|
name = mkOption {
|
|
type = printerName;
|
|
example = "BrotherHL_Workroom";
|
|
description = ''
|
|
Name of the printer / printer queue.
|
|
May contain any printable characters except "/", "#", and space.
|
|
'';
|
|
};
|
|
location = mkOption {
|
|
type = types.nullOr types.str;
|
|
default = null;
|
|
example = "Workroom";
|
|
description = ''
|
|
Optional human-readable location.
|
|
'';
|
|
};
|
|
description = mkOption {
|
|
type = types.nullOr types.str;
|
|
default = null;
|
|
example = "Brother HL-5140";
|
|
description = ''
|
|
Optional human-readable description.
|
|
'';
|
|
};
|
|
deviceUri = mkOption {
|
|
type = types.str;
|
|
example = literalExpression ''
|
|
"ipp://printserver.local/printers/BrotherHL_Workroom"
|
|
"usb://HP/DESKJET%20940C?serial=CN16E6C364BH"
|
|
'';
|
|
description = ''
|
|
How to reach the printer.
|
|
{command}`lpinfo -v` shows a list of supported device URIs and schemes.
|
|
'';
|
|
};
|
|
model = mkOption {
|
|
type = types.str;
|
|
example = literalExpression ''
|
|
"gutenprint.''${lib.versions.majorMinor (lib.getVersion pkgs.gutenprint)}://brother-hl-5140/expert"
|
|
'';
|
|
description = ''
|
|
Location of the ppd driver file for the printer.
|
|
{command}`lpinfo -m` shows a list of supported models.
|
|
'';
|
|
};
|
|
ppdOptions = mkOption {
|
|
type = types.attrsOf types.str;
|
|
example = {
|
|
PageSize = "A4";
|
|
Duplex = "DuplexNoTumble";
|
|
};
|
|
default = {};
|
|
description = ''
|
|
Sets PPD options for the printer.
|
|
{command}`lpoptions [-p printername] -l` shows supported PPD options for the given printer.
|
|
'';
|
|
};
|
|
};
|
|
});
|
|
};
|
|
};
|
|
};
|
|
|
|
config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) {
|
|
systemd.services.ensure-printers = {
|
|
description = "Ensure NixOS-configured CUPS printers";
|
|
wantedBy = [ "multi-user.target" ];
|
|
wants = [ "cups.service" ];
|
|
after = [ "cups.service" ];
|
|
|
|
serviceConfig = {
|
|
Type = "oneshot";
|
|
RemainAfterExit = true;
|
|
};
|
|
|
|
script = concatStringsSep "\n" [
|
|
(concatMapStrings ensurePrinter cfg.ensurePrinters)
|
|
(optionalString (cfg.ensureDefaultPrinter != null)
|
|
(ensureDefaultPrinter cfg.ensureDefaultPrinter))
|
|
# Note: if cupsd is "stateless" the service can't be stopped,
|
|
# otherwise the configuration will be wiped on the next start.
|
|
(optionalString (with config.services.printing; startWhenNeeded && !stateless)
|
|
"systemctl stop cups.service")
|
|
];
|
|
};
|
|
};
|
|
}
|