diff --git a/nixos/fuchsia/services/printer/default.nix b/nixos/fuchsia/services/printer/default.nix index 86a3958..be3795d 100644 --- a/nixos/fuchsia/services/printer/default.nix +++ b/nixos/fuchsia/services/printer/default.nix @@ -1,17 +1,26 @@ {pkgs, ...}: { hardware.printers = { ensurePrinters = [ + { + name = "HP_DeskJet_2800_series_276B08"; + description = "HP DeskJet 2800 series"; + location = "Local Printer"; + deviceUri = "dnssd://HP%20DeskJet%202800%20series%20%5B276B08%5D._ipp._tcp.local/?uuid=5e8778d6-018e-48ec-8838-c8cf40170b95"; + model = "drv:///hp/hpcups.drv/hp-Deskjet_2800_series.ppd"; + } + { name = "DYMO_Label_Writer_5XL_on_DYMOLW5XL315c26E"; description = "DYMO LabelWriter 5XL"; + location = "Local Printer"; deviceUri = "dnssd://DYMO%20Label%20Writer%205XL%20on%20DYMOLW5XL315c26E._pdl-datastream._tcp.local/"; - model = "lw5xl.ppd"; + model = "53hwxkc5kmnm06xvkx8f6w3dcsh7jlhg-lw5xl.ppd"; ppdOptions = { DymoPrintQuality = "Graphics"; }; } ]; - ensureDefaultPrinter = "DYMO_Label_Writer_5XL_on_DYMOLW5XL315c26E"; + ensureDefaultPrinter = "HP_DeskJet_2800_series_276B08"; }; services.avahi = { @@ -23,8 +32,8 @@ services.printing = { enable = true; drivers = [ - pkgs.cups-dymo - (pkgs.writeTextDir "share/cups/model/lw5xl.ppd" (builtins.readFile ./lw5xl.ppd)) + pkgs.hplipWithPlugin + (pkgs.callPackage ./lw5xl.nix {}) ]; }; } diff --git a/nixos/fuchsia/services/printer/lw5xl.nix b/nixos/fuchsia/services/printer/lw5xl.nix new file mode 100644 index 0000000..66a4d4f --- /dev/null +++ b/nixos/fuchsia/services/printer/lw5xl.nix @@ -0,0 +1,18 @@ +{stdenv}: let + lw5xl = ./lw5xl.ppd; + raster2dymolw_v2 = ./raster2dymolw_v2; +in + stdenv.mkDerivation rec { + name = "lw5xw-${version}"; + version = "1.0"; + + src = ./.; + + installPhase = '' + mkdir -p $out/share/cups/model/ + cp ${lw5xl} $out/share/cups/model/ + + mkdir -p $out/lib/cups/filter/ + cp ${raster2dymolw_v2} $out/lib/cups/filter/raster2dymolw_v2 + ''; + } diff --git a/overlays/raster2dymolw_v2 b/nixos/fuchsia/services/printer/raster2dymolw_v2 similarity index 100% rename from overlays/raster2dymolw_v2 rename to nixos/fuchsia/services/printer/raster2dymolw_v2 diff --git a/overlays/default.nix b/overlays/default.nix index 833f629..7bfcb4c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,5 @@ # This file defines overlays -{inputs, ...}: let - raster2dymolw_v2 = ./raster2dymolw_v2; -in { +{inputs, ...}: { # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../pkgs final.pkgs; @@ -12,12 +10,6 @@ in { # example = prev.example.overrideAttrs (oldAttrs: rec { # ... # }); - cups-dymo = prev.cups-dymo.overrideAttrs (oldAttrs: { - installPhase = '' - installPhase - cp ${raster2dymolw_v2} $out/lib/cups/filter/raster2dymolw_v2 - ''; - }); }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will