From ae98d6c2e5ed5d1c1e8e3a331069ac06e55ec677 Mon Sep 17 00:00:00 2001
From: Scott Scoble <sscoble@scobleclaw.dev>
Date: Sun, 17 May 2026 10:02:27 -0700
Subject: [PATCH] Add discord, slack, zapzap, printing module, fix dup SSH

---
 home/desktop.nix     |  3 +++
 home/hyprland.conf   |  2 +-
 modules/laptop.nix   | 13 +++----------
 modules/printing.nix | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 modules/printing.nix

diff --git a/home/desktop.nix b/home/desktop.nix
index 29937f6..822382e 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -47,6 +47,9 @@
     docker
     dive
     beeper
+    discord
+    slack
+    zapzap
     nmap
     tcpdump
     speedtest-cli
diff --git a/home/hyprland.conf b/home/hyprland.conf
index a63a583..b9908cd 100644
--- a/home/hyprland.conf
+++ b/home/hyprland.conf
@@ -137,5 +137,5 @@ windowrule = match:title ^(Authentication Required)$, float on
 windowrule = match:class ^(pavucontrol)$, size 75% 75%
 windowrule = match:class ^(code-oss|Code|jetbrains-.*|nvim)$, workspace 2
 windowrule = match:class ^(firefox|chromium-browser|google-chrome)$, workspace 3
-windowrule = match:class ^(discord|Slack|TelegramDesktop)$, workspace 4
+windowrule = match:class ^(discord|Slack|TelegramDesktop|zapzap)$, workspace 4
 windowrule = match:class ghostty, workspace 1
diff --git a/modules/laptop.nix b/modules/laptop.nix
index e8c50ff..99ac97b 100644
--- a/modules/laptop.nix
+++ b/modules/laptop.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ../hardware-configuration.nix ./emulation.nix ];
+  imports = [ ../hardware-configuration.nix ./emulation.nix ./printing.nix ];
 
   # === System Packages ===
   environment.systemPackages = with pkgs; [
@@ -187,7 +187,7 @@
   users.users.sscoble = {
     isNormalUser = true;
     description = "Scott Scoble";
-    extraGroups = [ "networkmanager" "wheel" "docker" ];
+    extraGroups = [ "networkmanager" "wheel" "docker" "lp" ];
     shell = pkgs.zsh;
     packages = with pkgs; [
       neovim
@@ -204,17 +204,10 @@
   time.timeZone = "America/Los_Angeles";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  # === SSH Server ===
-  services.openssh = {
-    enable = true;
-    settings.PasswordAuthentication = false;
-    openFirewall = true;
-  };
-
   # === Boot ===
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  
+
   # === SSH Server ===
   services.openssh = {
     enable = true;
diff --git a/modules/printing.nix b/modules/printing.nix
new file mode 100644
index 0000000..5531626
--- /dev/null
+++ b/modules/printing.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, ... }:
+
+{
+  # === Network Printing ===
+  services.printing = {
+    enable = true;
+    drivers = with pkgs; [
+      gutenprint        # Generic printer drivers
+      gutenprintBin     # Binary firmware for some models
+      hplip             # HP printer drivers + utilities
+      splix             # Samsung printer drivers
+      brlaser           # Brother laser printer drivers
+      brgenml1lpr       # Brother generic LPR driver
+      brgenml1cupswrapper # Brother CUPS wrapper
+      canon-cups-ufr2   # Canon UFR2 drivers
+      cups-bjnp         # Canon BJNP network backend
+    ];
+  };
+
+  # Enable network printer discovery via mDNS/Bonjour
+  services.avahi = {
+    enable = true;
+    nssmdns = true;
+    publish = {
+      enable = true;
+      addresses = true;
+      workstation = true;
+    };
+  };
+
+  # Allow sscoble to admin printers without root
+  users.users.sscoble.extraGroups = [ "lp" ];
+}