From 792444af8402cacb94d7ec4c58adba9e36ef8cb2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 27 Aug 2019 15:39:48 -0400 Subject: nixos/system-config-printer: init --- nixos/modules/module-list.nix | 2 ++ nixos/modules/programs/system-config-printer.nix | 32 ++++++++++++++++++ .../services/desktops/system-config-printer.nix | 38 ++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 nixos/modules/programs/system-config-printer.nix create mode 100644 nixos/modules/services/desktops/system-config-printer.nix (limited to 'nixos') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fe28cf7fa49..c21973faa89 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -151,6 +151,7 @@ ./programs/sysdig.nix ./programs/systemtap.nix ./programs/sway.nix + ./programs/system-config-printer.nix ./programs/thefuck.nix ./programs/tmux.nix ./programs/tsm-client.nix @@ -309,6 +310,7 @@ ./services/desktops/gnome3/tracker.nix ./services/desktops/gnome3/tracker-miners.nix ./services/desktops/profile-sync-daemon.nix + ./services/desktops/system-config-printer.nix ./services/desktops/telepathy.nix ./services/desktops/tumbler.nix ./services/desktops/zeitgeist.nix diff --git a/nixos/modules/programs/system-config-printer.nix b/nixos/modules/programs/system-config-printer.nix new file mode 100644 index 00000000000..34592dd7064 --- /dev/null +++ b/nixos/modules/programs/system-config-printer.nix @@ -0,0 +1,32 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + programs.system-config-printer = { + + enable = mkEnableOption "system-config-printer, a Graphical user interface for CUPS administration"; + + }; + + }; + + + ###### implementation + + config = mkIf config.programs.system-config-printer.enable { + + environment.systemPackages = [ + pkgs.system-config-printer + ]; + + services.system-config-printer.enable = true; + + }; + +} diff --git a/nixos/modules/services/desktops/system-config-printer.nix b/nixos/modules/services/desktops/system-config-printer.nix new file mode 100644 index 00000000000..8a80be266b2 --- /dev/null +++ b/nixos/modules/services/desktops/system-config-printer.nix @@ -0,0 +1,38 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.system-config-printer = { + + enable = mkEnableOption "system-config-printer, a service for CUPS administration used by printing interfaces"; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.system-config-printer.enable { + + services.dbus.packages = [ + pkgs.system-config-printer + ]; + + systemd.packages = [ + pkgs.system-config-printer + ]; + + services.udev.packages = [ + pkgs.system-config-printer + ]; + + }; + +} -- cgit 1.4.1 From c6abb697852514a3bec2f63aa9694dab1dcf3cd4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 27 Aug 2019 16:00:26 -0400 Subject: rl-1909: note about system-config-printer --- nixos/doc/manual/release-notes/rl-1909.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'nixos') diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index ff1bd628ad2..1dc59bf9004 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -144,6 +144,32 @@ but will make sure that the given printers are configured as declared. + + + There is a new and module + for the program of the same name. If you previously had system-config-printer enabled through some other + means you should migrate to using one of these modules. + + + If you're a user of the following desktopManager modules no action is needed: + + + + + + + + + + + + + Note Mate uses programs.system-config-printer as it doesn't + use it as a service, but its graphical interface directly. + + + + -- cgit 1.4.1 From 6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 6 Sep 2019 09:44:06 -0400 Subject: nixos/pantheon: use system-config-printer module --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 5b82cb1f026..e313a194c34 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -113,9 +113,9 @@ in services.colord.enable = mkDefault true; services.pantheon.files.enable = mkDefault true; services.tumbler.enable = mkDefault true; - services.dbus.packages = mkMerge [ - ([ pkgs.pantheon.switchboard-plug-power ]) - (mkIf config.services.printing.enable ([pkgs.system-config-printer]) ) + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.dbus.packages = [ + pkgs.pantheon.switchboard-plug-power ]; services.pantheon.contractor.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; -- cgit 1.4.1 From 2fe7bd3ab359383cba9014629687541d64962f91 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 6 Sep 2019 09:45:49 -0400 Subject: nixos/gnome3: use system-config-printer module --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 6f344f4121b..09095294fb5 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -233,10 +233,9 @@ in services.gnome3.gnome-user-share.enable = mkDefault true; services.gnome3.rygel.enable = mkDefault true; services.gvfs.enable = true; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.telepathy.enable = mkDefault true; systemd.packages = [ pkgs.gnome3.vino ]; - services.dbus.packages = - optional config.services.printing.enable pkgs.system-config-printer; services.avahi.enable = mkDefault true; -- cgit 1.4.1 From 146532b27233e7ee895ab29c3b48fcb111082eeb Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 6 Sep 2019 09:46:48 -0400 Subject: nixos/xfce4-14: use system-config-printer module --- nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index 55c88223e78..57d1268d655 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -137,8 +137,7 @@ in services.gvfs.enable = true; services.gvfs.package = pkgs.xfce.gvfs; services.tumbler.enable = true; - services.dbus.packages = - optional config.services.printing.enable pkgs.system-config-printer; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager # Enable default programs -- cgit 1.4.1 From 335b8c65c7d71c1c4ea9cc6c78aa3399daa4b707 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 6 Sep 2019 09:47:24 -0400 Subject: nixos/plasma5: use system-config-printer module --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 94a307ae100..640eab6c769 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -210,8 +210,7 @@ in # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.dbus.packages = - mkIf config.services.printing.enable [ pkgs.system-config-printer ]; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); # Extra UDEV rules used by Solid services.udev.packages = [ -- cgit 1.4.1 From 998f59ccda684ffbebb724647f914eff8a1d3afd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 6 Sep 2019 09:49:17 -0400 Subject: nixos/mate: enable system-config-printer After some research this should be installed as a program in Mate or Cinnamon. --- nixos/modules/services/x11/desktop-managers/mate.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index e3fbfc390cd..83c60a8ad4f 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -98,6 +98,9 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; + # Mate uses this for printing + programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.gnome3.at-spi2-core.enable = true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-settings-daemon.enable = true; -- cgit 1.4.1