diff --git a/hosts/Swordsmachine/default.nix b/hosts/Swordsmachine/default.nix index d9b3367..230ea79 100755 --- a/hosts/Swordsmachine/default.nix +++ b/hosts/Swordsmachine/default.nix @@ -22,6 +22,7 @@ ../../modules/nixos/system/fonts.nix ../../modules/nixos/system/home-manager.nix ../../modules/nixos/system/laptop.nix + ../../modules/nixos/system/printing.nix ../../modules/nixos/system/scx.nix ../../modules/nixos/system/swap.nix ../../modules/nixos/system/yubikey.nix @@ -45,11 +46,6 @@ # necessary to make the camera not look like the sun environment.systemPackages = [ pkgs.cameractrls ]; - services.printing = { - enable = true; - drivers = [ pkgs.cups-brother-hll2375dw ]; - }; - home-manager.users.wo2w = { imports = [ ../../modules/home diff --git a/modules/nixos/system/desktop.nix b/modules/nixos/system/desktop.nix index ef6753e..ebd2728 100755 --- a/modules/nixos/system/desktop.nix +++ b/modules/nixos/system/desktop.nix @@ -15,9 +15,6 @@ }; security.rtkit.enable = true; - # CUPS - services.printing.enable = true; - # enable native wayland in chromium/electron environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/modules/nixos/system/printing.nix b/modules/nixos/system/printing.nix new file mode 100644 index 0000000..03d8ee1 --- /dev/null +++ b/modules/nixos/system/printing.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: + +{ + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; + + services.printing = { + enable = true; + drivers = [ + pkgs.cups-filters + pkgs.cups-browsed + + pkgs.epson-escpr + pkgs.cups-brother-hll2375dw + ]; + }; +} \ No newline at end of file