Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c76a1ea594e8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7e89933127d4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 3, 2019

  1. 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]: 68ab37a
    @worldofpeace
    worldofpeace committed Oct 3, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fb7b158 View commit details

  2. Merge pull request #70296 from worldofpeace/targets-want-gsd 

    nixos/gnome-settings-daemon: move systemd config here
    @worldofpeace
    worldofpeace authored Oct 3, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7e89933 View commit details
Showing with 27 additions and 16 deletions.
  1. +26 −0 nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
  2. +1 −16 nixos/modules/services/x11/desktop-managers/gnome3.nix
26 changes: 26 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
];

};

}
17 changes: 1 addition & 16 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Original file line number Diff line number Diff line change
@@ -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;