From f1ce41d78e002b47fa3f57dbcde61e77b0cf61f0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 27 Aug 2019 01:06:35 -0400
Subject: [PATCH 1/2] gnome3.gnome-control-center: add optional sharing deps

It appears that if gnome-control-center isn't wrapped with their
schemas they won't be added to the panel.
---
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

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

From 8a24bc2e08b2433bbb94626725e377965e244e9a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 27 Aug 2019 03:07:57 -0400
Subject: [PATCH 2/2] nixos/gnome-user-share: cleanup

* No sessionPath!

* add to systemd.packages
  This is for the gnome-user-share-webdav.service.

* Update option description
---
 .../desktops/gnome3/gnome-user-share.nix      | 20 +++++++------------
 1 file changed, 7 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
+    ];
 
   };