From 1a67a3eeaac68a15516b36ddecdde83c76c99a52 Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Wed, 8 Oct 2025 14:28:19 -0700
Subject: Modularize printer configuration

---
 hosts/arrakis/hardware-configuration.nix | 14 --------------
 hosts/caladan/default.nix                |  7 +------
 hosts/caladan/hardware-configuration.nix | 24 ------------------------
 hosts/common/optional/printer.nix        | 21 +++++++++++++++++++++
 4 files changed, 22 insertions(+), 44 deletions(-)
 create mode 100644 hosts/common/optional/printer.nix

(limited to 'hosts')

diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix
index 1948809..0d24c12 100644
--- a/hosts/arrakis/hardware-configuration.nix
+++ b/hosts/arrakis/hardware-configuration.nix
@@ -84,19 +84,5 @@
       open = true;
       package = if finalPkg == betaPkg then betaPkg else finalPkg;
     };
-
-    printers = let
-      brother = "Brother_HL-L2340D";
-      ip = "192.168.1.20";
-    in {
-      ensureDefaultPrinter = brother;
-      ensurePrinters = [{
-        name = brother;
-        deviceUri = "ipp://${ip}/ipp";
-        model = "everywhere";
-        description = lib.replaceStrings [ "_" ] [ " " ] brother;
-        location = "home";
-      }];
-    };
   };
 }
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index c3aac81..3c8d962 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -74,6 +74,7 @@
     ../common/optional/misc.nix
     ../common/optional/multimedia.nix
     ../common/optional/pipewire.nix
+    ../common/optional/printer.nix
     ../common/optional/sdr.nix
     ../common/optional/services/chrony.nix
     ../common/optional/services/openssh.nix
@@ -178,12 +179,6 @@
 
   systemd.services = {
 
-    "ensure-printers" = {
-      after = [ "network-online.target" ];
-      preStart = "sleep 5";
-      wants = [ "network-online.target" ];
-    };
-
     "nftables-extra" = let rules_script = ''
         ${pkgs.nftables}/bin/nft insert rule inet nixos-fw input 'iifname "enp6s0" udp dport { 2456, 2457 } counter accept # Valheim dedicated server'
         ${pkgs.nftables}/bin/nft insert rule inet nixos-fw input 'iifname "enp6s0" udp dport 5121 counter accept # Neverwinter Nights Server'
diff --git a/hosts/caladan/hardware-configuration.nix b/hosts/caladan/hardware-configuration.nix
index 302606c..9325e99 100644
--- a/hosts/caladan/hardware-configuration.nix
+++ b/hosts/caladan/hardware-configuration.nix
@@ -47,29 +47,5 @@
       #package = pkgs.master.mesa;
       #package32 = pkgs.master.pkgsi686Linux.mesa;
     };
-
-    #nvidia = let
-    #  betaPkg = config.boot.kernelPackages.nvidiaPackages.beta;
-    #  pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg;
-    #  finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc;
-    #in {
-    #  modesetting.enable = true;
-    #  open = true;
-    #  package = if finalPkg == betaPkg then betaPkg else finalPkg;
-    #};
-
-    printers = let
-      brother = "Brother_HL-L2340D";
-      ip = "192.168.1.20";
-    in {
-      ensureDefaultPrinter = brother;
-      ensurePrinters = [{
-        name = brother;
-        deviceUri = "ipp://${ip}/ipp";
-        model = "everywhere";
-        description = lib.replaceStrings [ "_" ] [ " " ] brother;
-        location = "home";
-      }];
-    };
   };
 }
diff --git a/hosts/common/optional/printer.nix b/hosts/common/optional/printer.nix
new file mode 100644
index 0000000..e3109fc
--- /dev/null
+++ b/hosts/common/optional/printer.nix
@@ -0,0 +1,21 @@
+{
+  hardware.printers = let
+    brother = "Brother_HL-L2340D";
+    ip = "192.168.1.20";
+  in {
+    ensureDefaultPrinter = brother;
+    ensurePrinters = [{
+      name = brother;
+      deviceUri = "ipp://${ip}/ipp";
+      model = "everywhere";
+      description = lib.replaceStrings [ "_" ] [ " " ] brother;
+      location = "home";
+    }];
+  };
+
+  systemd.services."ensure-printers" = {
+    after = [ "network-online.target" ];
+    preStart = "sleep 5";
+    wants = [ "network-online.target" ];
+  };
+}
-- 
cgit v1.2.3