From 4915bff563c0069bd4c2914854b9a276be9170e2 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Wed, 2 Mar 2022 20:55:24 +0100
Subject: [PATCH] [Services] Improve printing support

---
 desktop.nix  |  3 ---
 services.nix | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/desktop.nix b/desktop.nix
index 64710c1..f52b1f3 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -140,9 +140,6 @@ in {
     boot.initrd.verbose = false;
     boot.consoleLogLevel = 1;
 
-    # Enable CUPS to print documents.
-    services.printing.enable = true;
-
     # Enable sound.
     sound.enable = false;
     services.pipewire = {
diff --git a/services.nix b/services.nix
index b580a4a..b968a18 100644
--- a/services.nix
+++ b/services.nix
@@ -59,7 +59,18 @@ in {
 
     services.irqbalance.enable = true;
 
-    services.printing.enable = desktopCfg.enable;
+    services.printing = mkIf desktopCfg.enable {
+      enable = true;
+      defaultShared = mkDefault true;
+      browsing = mkDefault true;
+      drivers = with pkgs; [
+        hplipWithPlugin
+        gutenprint
+        splix
+      ];
+      webInterface = mkDefault false;
+    };
+    aviallon.programs.allowUnfreeList = [ "hplip" "hplipWithPlugin" ];
 
     services.fwupd.enable = true;