From 092585ca2b05f6a4e4e7dcdd3834a54fafab143e Mon Sep 17 00:00:00 2001
From: servostar <sven.vogel123@web.de>
Date: Fri, 1 Dec 2023 20:55:20 +0100
Subject: [PATCH] moved printing to core/

---
 core/printing.nix        | 13 +++++++++++++
 users/servostar/user.nix | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 core/printing.nix

diff --git a/core/printing.nix b/core/printing.nix
new file mode 100644
index 0000000..6bda1c3
--- /dev/null
+++ b/core/printing.nix
@@ -0,0 +1,13 @@
+{ pkgs, config, ... }: {
+    services.printing.enable = true;
+    services.avahi.enable = true;
+    # for a WiFi printer
+    services.avahi.openFirewall = true;
+    services.avahi.nssmdns = false; # Use the settings from below
+    # settings from avahi-daemon.nix where mdns is replaced with mdns4
+    system.nssModules = pkgs.lib.optional (!config.services.avahi.nssmdns) pkgs.nssmdns;
+    system.nssDatabases.hosts = with pkgs.lib; optionals (!config.services.avahi.nssmdns) (mkMerge [
+        (mkBefore [ "mdns4_minimal [NOTFOUND=return]" ]) # before resolve
+        (mkAfter [ "mdns4" ]) # after dns
+    ]);
+}
diff --git a/users/servostar/user.nix b/users/servostar/user.nix
index 8aa3d7f..c1a2891 100644
--- a/users/servostar/user.nix
+++ b/users/servostar/user.nix
@@ -9,18 +9,6 @@
   #
   # Configuration for user servostar
 
-  services.printing.enable = true;
-  services.avahi.enable = true;
-  # for a WiFi printer
-  services.avahi.openFirewall = true;
-  services.avahi.nssmdns = false; # Use the settings from below
-  # settings from avahi-daemon.nix where mdns is replaced with mdns4
-  system.nssModules = pkgs.lib.optional (!config.services.avahi.nssmdns) pkgs.nssmdns;
-  system.nssDatabases.hosts = with pkgs.lib; optionals (!config.services.avahi.nssmdns) (mkMerge [
-    (mkBefore [ "mdns4_minimal [NOTFOUND=return]" ]) # before resolve
-    (mkAfter [ "mdns4" ]) # after dns
-  ]);
-
   # Define a user account. Don't forget to set a password with passwd.
   users.users.servostar = {
     isNormalUser = true;