From eb76eae1fcea16bc17fd8d2b3606ebff23412e5a Mon Sep 17 00:00:00 2001
From: Jacob Bachmann <jacob.bachmann@posteo.de>
Date: Mon, 8 Jan 2024 18:14:53 +0100
Subject: [PATCH] feat: move system-config-printer to user space

---
 hosts/W530/default.nix                         | 1 +
 modules/default.nix                            | 4 ++++
 modules/openssh.nix                            | 2 +-
 modules/printing.nix                           | 7 +------
 users/gandalf/modules/gui/programs/default.nix | 4 +++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hosts/W530/default.nix b/hosts/W530/default.nix
index afc0860..8bd8e10 100644
--- a/hosts/W530/default.nix
+++ b/hosts/W530/default.nix
@@ -13,6 +13,7 @@
     nvidia.enable = false;
     audio.enable = true;
     bluetooth.enable = true;
+    printing.enable = true;
     vpn.enable = true;
 
     devenv.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index 33aa3ab..113f718 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -27,6 +27,10 @@
       enable = mkEnableOption "bluetooth";
     };
 
+    printing = {
+      enable = mkEnableOption "printing";
+    };
+
     vpn = {
       enable = mkEnableOption "vpn";
     };
diff --git a/modules/openssh.nix b/modules/openssh.nix
index 3b294bc..6c73afa 100644
--- a/modules/openssh.nix
+++ b/modules/openssh.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  
+
   services.openssh = {
     enable = true;
     openFirewall = true;
diff --git a/modules/printing.nix b/modules/printing.nix
index 23b6f15..d2f9b5d 100644
--- a/modules/printing.nix
+++ b/modules/printing.nix
@@ -1,5 +1,4 @@
-{ pkgs, config, ... }: {
-  # Enable CUPS to print documents.
+{ pkgs, lib, config, ... }: lib.mkIf config.bchmnn.printing.enable {
   services.printing = {
     enable = true;
     drivers = [
@@ -24,8 +23,4 @@
     ];
     ensureDefaultPrinter = "Brother-MFC-L3750CDW-series";
   };
-
-  environment.systemPackages = with pkgs; with config.bchmnn; lib.optionals (gui.enable) [
-    system-config-printer
-  ];
 }
diff --git a/users/gandalf/modules/gui/programs/default.nix b/users/gandalf/modules/gui/programs/default.nix
index cd74946..e20e138 100644
--- a/users/gandalf/modules/gui/programs/default.nix
+++ b/users/gandalf/modules/gui/programs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, lib, nixosConfig, ... }: {
 
   imports = [
     ./alacritty.nix
@@ -19,6 +19,8 @@
     gnome.simple-scan
     telegram-desktop
     signal-desktop
+  ] ++ lib.optionals nixosConfig.bchmnn.printing.enable [
+    system-config-printer
   ];
 
 }