git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67522 from worldofpeace/gnome3/harmonize-defaults

Harmonize Gnome3 Defaults

commit9b13731b72d643a4d8297488823c0ed115bf3c4f authorworldofpeace <worldofpeace@protonmail.ch> dateSun 1 Sep 2019, 18:33 (7 years ago) parent9db42e1266db08
5 files changed+137−48
nixos/doc/manual/release-notes/rl-1909.xml+58 nixos/modules/module-list.nix+1−1 nixos/modules/programs/seahorse.nix+44 nixos/modules/services/desktops/gnome3/seahorse.nix−38 nixos/modules/services/x11/desktop-managers/gnome3.nix+34−9
nixos/doc/manual/release-notes/rl-1909.xml+58
@@ -57,6 +57,64 @@
5757 and <option>services.xserver.desktopManager.xfce4-14</option> simultaneously or to downgrade from Xfce 4.14 after upgrading.
5858 </para>
5959 </listitem>
60+ <listitem>
61+ <para>
62+ The GNOME 3 desktop manager module sports an interface to enable/disable core services, applications, and optional GNOME packages
63+ like games.
64+ <itemizedlist>
65+ <para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para>
66+ <listitem><para><link linkend="opt-services.gnome3.core-os-services.enable"><literal>services.gnome3.core-os-services.enable</literal></link></para></listitem>
67+ <listitem><para><link linkend="opt-services.gnome3.core-shell.enable"><literal>services.gnome3.core-shell.enable</literal></link></para></listitem>
68+ <listitem><para><link linkend="opt-services.gnome3.core-utilities.enable"><literal>services.gnome3.core-utilities.enable</literal></link></para></listitem>
69+ <listitem><para><link linkend="opt-services.gnome3.games.enable"><literal>services.gnome3.games.enable</literal></link></para></listitem>
70+ </itemizedlist>
71+ With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
72+ disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications.
73+ <option>environment.gnome3.excludePackages</option> is now unguarded, it can exclude any package installed with <option>environment.systemPackages</option>
74+ in the GNOME 3 module.
75+ </para>
76+ </listitem>
77+ <listitem>
78+ <para>
79+ Orthogonal to the previous changes to the GNOME 3 desktop manager module, we've updated all default services and applications
80+ to match as close as possible to a default reference GNOME 3 experience.
81+ </para>
82+
83+ <bridgehead>The following changes were enacted in <option>services.gnome3.core-utilities.enable</option></bridgehead>
84+
85+ <itemizedlist>
86+ <title>Applications removed from defaults:</title>
87+ <listitem><para><literal>accerciser</literal></para></listitem>
88+ <listitem><para><literal>dconf-editor</literal></para></listitem>
89+ <listitem><para><literal>evolution</literal></para></listitem>
90+ <listitem><para><literal>gnome-documents</literal></para></listitem>
91+ <listitem><para><literal>gnome-nettool</literal></para></listitem>
92+ <listitem><para><literal>gnome-power-manager</literal></para></listitem>
93+ <listitem><para><literal>gnome-todo</literal></para></listitem>
94+ <listitem><para><literal>gnome-tweaks</literal></para></listitem>
95+ <listitem><para><literal>gnome-usage</literal></para></listitem>
96+ <listitem><para><literal>gucharmap</literal></para></listitem>
97+ <listitem><para><literal>nautilus-sendto</literal></para></listitem>
98+ <listitem><para><literal>vinagre</literal></para></listitem>
99+ </itemizedlist>
100+ <itemizedlist>
101+ <title>Applications added to defaults:</title>
102+ <listitem><para><literal>cheese</literal></para></listitem>
103+ <listitem><para><literal>geary</literal></para></listitem>
104+ </itemizedlist>
105+
106+ <bridgehead>The following changes were enacted in <option>services.gnome3.core-shell.enable</option></bridgehead>
107+
108+ <itemizedlist>
109+ <title>Applications added to defaults:</title>
110+ <listitem><para><literal>gnome-color-manager</literal></para></listitem>
111+ <listitem><para><literal>orca</literal></para></listitem>
112+ </itemizedlist>
113+ <itemizedlist>
114+ <title>Services enabled:</title>
115+ <listitem><para><option>services.avahi.enable</option></para></listitem>
116+ </itemizedlist>
117+ </listitem>
60118 </itemizedlist>
61119 </section>
62120
nixos/modules/module-list.nix+1−1
@@ -138,6 +138,7 @@
138138 ./programs/qt5ct.nix
139139 ./programs/screen.nix
140140 ./programs/sedutil.nix
141+ ./programs/seahorse.nix
141142 ./programs/slock.nix
142143 ./programs/shadow.nix
143144 ./programs/shell.nix
@@ -301,7 +302,6 @@
301302 ./services/desktops/gnome3/gnome-settings-daemon.nix
302303 ./services/desktops/gnome3/gnome-user-share.nix
303304 ./services/desktops/gnome3/rygel.nix
304− ./services/desktops/gnome3/seahorse.nix
305305 ./services/desktops/gnome3/sushi.nix
306306 ./services/desktops/gnome3/tracker.nix
307307 ./services/desktops/gnome3/tracker-miners.nix
nixos/modules/programs/seahorse.nixnew file+44
@@ -0,0 +1,44 @@
1+# Seahorse.
2+
3+{ config, pkgs, lib, ... }:
4+
5+with lib;
6+
7+{
8+
9+ # Added 2019-08-27
10+ imports = [
11+ (mkRenamedOptionModule
12+ [ "services" "gnome3" "seahorse" "enable" ]
13+ [ "programs" "seahorse" "enable" ])
14+ ];
15+
16+
17+ ###### interface
18+
19+ options = {
20+
21+ programs.seahorse = {
22+
23+ enable = mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring";
24+
25+ };
26+
27+ };
28+
29+
30+ ###### implementation
31+
32+ config = mkIf config.programs.seahorse.enable {
33+
34+ environment.systemPackages = [
35+ pkgs.gnome3.seahorse
36+ ];
37+
38+ services.dbus.packages = [
39+ pkgs.gnome3.seahorse
40+ ];
41+
42+ };
43+
44+}
nixos/modules/services/desktops/gnome3/seahorse.nixdeleted−38
@@ -1,38 +0,0 @@
1−# Seahorse daemon.
2−
3−{ config, pkgs, lib, ... }:
4−
5−with lib;
6−
7−{
8−
9− ###### interface
10−
11− options = {
12−
13− services.gnome3.seahorse = {
14−
15− enable = mkOption {
16− type = types.bool;
17− default = false;
18− description = ''
19− Whether to enable Seahorse search provider for the GNOME Shell activity search.
20− '';
21− };
22−
23− };
24−
25− };
26−
27−
28− ###### implementation
29−
30− config = mkIf config.services.gnome3.seahorse.enable {
31−
32− environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ];
33−
34− services.dbus.packages = [ pkgs.gnome3.seahorse ];
35−
36− };
37−
38−}
nixos/modules/services/x11/desktop-managers/gnome3.nix+34−9
@@ -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