diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-02 21:39:24 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-02 22:51:11 -0400 |
commit | fb7b158ddaea7d57dcaf012bea3673f5c6d02d87 (patch) | |
tree | d113871fcac22a0d03c69c5fe2cfbddd6db27c29 | |
parent | 5edb20533d1bfcf002582193459df2150d19769a (diff) | |
download | nixlib-fb7b158ddaea7d57dcaf012bea3673f5c6d02d87.tar nixlib-fb7b158ddaea7d57dcaf012bea3673f5c6d02d87.tar.gz nixlib-fb7b158ddaea7d57dcaf012bea3673f5c6d02d87.tar.bz2 nixlib-fb7b158ddaea7d57dcaf012bea3673f5c6d02d87.tar.lz nixlib-fb7b158ddaea7d57dcaf012bea3673f5c6d02d87.tar.xz nixlib-fb7b158ddaea7d57dcaf012bea3673f5c6d02d87.tar.zst nixlib-fb7b158ddaea7d57dcaf012bea3673f5c6d02d87.zip |
nixos/gnome-settings-daemon: move systemd config here
As I've decided that it doesn't make sense for the module to be shared [0] we can move this config here. [0]: 68ab37aa4491c8f870483c9eff888dc5fc88d2c8
-rw-r--r-- | nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix | 26 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 17 |
2 files changed, 27 insertions, 16 deletions
diff --git a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix index 9d080acb2aaf..2f83fd653bde 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix @@ -43,6 +43,32 @@ in pkgs.gnome3.gnome-settings-daemon ]; + systemd.packages = [ + pkgs.gnome3.gnome-settings-daemon + ]; + + systemd.user.targets."gnome-session-initialized".wants = [ + "gsd-color.target" + "gsd-datetime.target" + "gsd-keyboard.target" + "gsd-media-keys.target" + "gsd-print-notifications.target" + "gsd-rfkill.target" + "gsd-screensaver-proxy.target" + "gsd-sharing.target" + "gsd-smartcard.target" + "gsd-sound.target" + "gsd-wacom.target" + "gsd-wwan.target" + "gsd-a11y-settings.target" + "gsd-housekeeping.target" + "gsd-power.target" + ]; + + systemd.user.targets."gnome-session-x11-services".wants = [ + "gsd-xsettings.target" + ]; + }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c0cee95bdcb2..9b0c8d752cee 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -230,22 +230,7 @@ in services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.telepathy.enable = mkDefault true; - systemd.packages = with pkgs.gnome3; [ vino gnome-session gnome-settings-daemon ]; - - # gnome-settings-daemon.nix is shared between several desktop - # environments (eg. mate and pantheon) so specify these gnome-shell specific - # service dependencies here instead. - systemd.user.targets."gnome-session-initialized".wants = [ - "gsd-a11y-settings.target" "gsd-housekeeping.target" "gsd-power.target" - "gsd-color.target" "gsd-keyboard.target" "gsd-print-notifications.target" - "gsd-datetime.target" "gsd-media-keys.target" "gsd-rfkill.target" - "gsd-screensaver-proxy.target" "gsd-sound.target" "gsd-smartcard.target" - "gsd-sharing.target" "gsd-wacom.target" "gsd-wwan.target" - ]; - - systemd.user.targets."gnome-session-x11-services".wants = [ - "gsd-xsettings.target" - ]; + systemd.packages = with pkgs.gnome3; [ vino gnome-session ]; services.avahi.enable = mkDefault true; |