summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-06 09:44:06 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-06 12:06:32 -0400
commit6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3 (patch)
tree2c31e7fc94cb30225dc5b2cf7f21da4d38841f3f /nixos/modules/services
parent4c722b33512e01cf9bd0c7cc53707667fc960e9e (diff)
downloadnixpkgs-6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3.tar
nixpkgs-6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3.tar.gz
nixpkgs-6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3.tar.bz2
nixpkgs-6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3.tar.lz
nixpkgs-6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3.tar.xz
nixpkgs-6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3.tar.zst
nixpkgs-6b99ec2dbe4d7573ebdbf0f0824f3d9d999847b3.zip
nixos/pantheon: use system-config-printer module
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix6
1 files changed, 3 insertions, 3 deletions
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;