Merge branch 'main' of gh:greg-hellings/nixos-config

hosts/exodus/default.nix

@@ -3,7 +3,6 @@
 {
 	imports = [
 		./hardware-configuration.nix
-		../jude/printing.nix
 	];
 
 	boot.loader = {
@@ -15,6 +14,7 @@
 	greg = {
 		home = true;
 		gnome.enable = true;
+		print.enable = true;
 		tailscale.enable = true;
 		vmdev = {
 			enable = true;

hosts/jude/default.nix

@@ -5,7 +5,6 @@
 		./boot.nix
 		./hardware-configuration.nix
 		./podman.nix
-		./printing.nix
 		./virt.nix
 	];
 	programs = {
@@ -34,6 +33,7 @@
 		sway.enable = false;
 		gnome.enable = true;
 		kde.enable = false;
+		print.enable = true;
 	};
 
 	boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];

hosts/jude/printing.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
-	# ipp://printer.thehellings.lan:631/ - generic postscript printer
-	services.printing = {
-		enable = true;
-		drivers = with pkgs; [
-			gutenprint
-			gutenprintBin
-		];
-	};
-}

modules/nixos/default.nix

@@ -16,6 +16,7 @@ in {
 		./kde.nix
 		./kiwix-serve.nix
 		./linode.nix
+		./print.nix
 		./proxy.nix
 		./router.nix
 		./rpi4.nix

modules/nixos/print.nix

@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+let
+	cfg = config.greg.print;
+
+in with lib;
+{
+	options.greg.print.enable = mkOption {
+		type = types.bool;
+		default = true;
+		description = "Configures the system to print with my home printer";
+	};
+
+	config = mkIf cfg.enable {
+		# ipp://printer.thehellings.lan:631/ - generic postscript printer
+		services.printing = {
+			enable = true;
+			drivers = with pkgs; [
+				gutenprint
+			] ++ (lib.optional pkgs.stdenv.isx86_64 gutenprintBin);
+		};
+
+		hardware.printers.ensurePrinters = [ {
+			name = "HomeLexmarkColorPrinter";
+			location = "Home office";
+			deviceUri = "ipp://printer.thehellings.lan:631/";
+			model = "drv:///sample.drv/generic.ppd";
+			ppdOptions = {
+				PageSize = "Letter";
+			};
+		} ];
+	};
+}