diff options
-rw-r--r-- | nixos/modules/services/desktops/gnome3/gnome-user-share.nix | 20 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix index 1f6ce2ae968e..f83962877700 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix @@ -12,14 +12,7 @@ with lib; services.gnome3.gnome-user-share = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable GNOME User Share, a service that exports the - contents of the Public folder in your home directory on the local network. - ''; - }; + enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME"; }; @@ -30,12 +23,13 @@ with lib; config = mkIf config.services.gnome3.gnome-user-share.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-user-share ]; + environment.systemPackages = [ + pkgs.gnome3.gnome-user-share + ]; - services.xserver.displayManager.sessionCommands = with pkgs.gnome3; '' - # Don't let gnome-control-center depend upon gnome-user-share - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name} - ''; + systemd.packages = [ + pkgs.gnome3.gnome-user-share + ]; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 6f137cc65d5f..04730f2370f5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -60,6 +60,8 @@ , udisks2 , upower , vino +, gnome-user-share +, gnome-remote-desktop , wrapGAppsHook }: @@ -99,7 +101,9 @@ stdenv.mkDerivation rec { gnome-bluetooth gnome-desktop gnome-online-accounts + gnome-remote-desktop # optional, sharing panel gnome-settings-daemon + gnome-user-share # optional, sharing panel grilo grilo-plugins # for setting wallpaper from Flickr gsettings-desktop-schemas |