@@ -37,7 +37,7 @@ let
3737 picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png'
3838
3939 [org.gnome.shell]
40− favorite-apps=[ 'org.gnome.Epiphany.desktop', 'evolution.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
40+ favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]
4141
4242 ${cfg.extraGSettingsOverrides}
4343 EOF
@@ -238,6 +238,8 @@ in
238238 services.dbus.packages =
239239 optional config.services.printing.enable pkgs.system-config-printer;
240240
241+ services.avahi.enable = mkDefault true;
242+
241243 services.geoclue2.enable = mkDefault true;
242244 services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
243245
@@ -261,16 +263,19 @@ in
261263 source-sans-pro
262264 ];
263265
266+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst
264267 environment.systemPackages = with pkgs.gnome3; [
265268 adwaita-icon-theme
266269 gnome-backgrounds
267270 gnome-bluetooth
271+ gnome-color-manager
268272 gnome-control-center
269273 gnome-getting-started-docs
270274 gnome-shell
271275 gnome-shell-extensions
272276 gnome-themes-extra
273277 gnome-user-docs
278+ pkgs.orca
274279 pkgs.glib # for gsettings
275280 pkgs.gnome-menus
276281 pkgs.gtk3.out # for gtk-launch
@@ -281,23 +286,43 @@ in
281286 ];
282287 })
283288
289+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-utilities.bst
284290 (mkIf serviceCfg.core-utilities.enable {
285291 environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
286− baobab eog epiphany evince gucharmap nautilus totem yelp gnome-calculator
287− gnome-contacts gnome-font-viewer gnome-screenshot gnome-system-monitor simple-scan
288− gnome-terminal evolution file-roller gedit gnome-clocks gnome-music gnome-tweaks
289− pkgs.gnome-photos nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
290− gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool gnome-packagekit
291− gnome-software gnome-power-manager gnome-todo pkgs.gnome-usage
292+ baobab
293+ cheese
294+ eog
295+ epiphany
296+ geary
297+ gedit
298+ gnome-calculator
299+ gnome-calendar
300+ gnome-characters
301+ gnome-clocks
302+ gnome-contacts
303+ gnome-font-viewer
304+ gnome-logs
305+ gnome-maps
306+ gnome-music
307+ gnome-photos
308+ gnome-screenshot
309+ gnome-software
310+ gnome-system-monitor
311+ gnome-weather
312+ nautilus
313+ simple-scan
314+ totem
315+ yelp
316+ # Unsure if sensible for NixOS
317+ /* gnome-boxes */
292318 ] config.environment.gnome3.excludePackages);
293319
294320 # Enable default programs
295321 programs.evince.enable = mkDefault true;
296322 programs.file-roller.enable = mkDefault true;
297323 programs.gnome-disks.enable = mkDefault true;
298− programs.gnome-documents.enable = mkDefault true;
299324 programs.gnome-terminal.enable = mkDefault true;
300− services.gnome3.seahorse.enable = mkDefault true;
325+ programs.seahorse.enable = mkDefault true;
301326 services.gnome3.sushi.enable = mkDefault true;
302327
303328 # Let nautilus find extensions