Browse Source

gnome: rename from gnome3

Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
nsd-state-dir
Jan Tojnar 2 years ago
parent
commit
468cb5980b
  1. 4
      doc/languages-frameworks/gnome.section.md
  2. 4
      maintainers/scripts/update.nix
  3. 2
      nixos/doc/manual/configuration/x-windows.xml
  4. 8
      nixos/doc/manual/release-notes/rl-1909.xml
  5. 4
      nixos/doc/manual/release-notes/rl-2105.xml
  6. 2
      nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
  7. 2
      nixos/modules/installer/virtualbox-demo.nix
  8. 30
      nixos/modules/module-list.nix
  9. 4
      nixos/modules/programs/file-roller.nix
  10. 6
      nixos/modules/programs/geary.nix
  11. 4
      nixos/modules/programs/gnome-disks.nix
  12. 10
      nixos/modules/programs/gnome-documents.nix
  13. 6
      nixos/modules/programs/gnome-terminal.nix
  14. 8
      nixos/modules/programs/gpaste.nix
  15. 4
      nixos/modules/programs/phosh.nix
  16. 6
      nixos/modules/programs/seahorse.nix
  17. 6
      nixos/modules/security/pam.nix
  18. 2
      nixos/modules/services/desktops/flatpak.nix
  19. 14
      nixos/modules/services/desktops/gnome/at-spi2-core.nix
  20. 12
      nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix
  21. 22
      nixos/modules/services/desktops/gnome/evolution-data-server.nix
  22. 12
      nixos/modules/services/desktops/gnome/glib-networking.nix
  23. 16
      nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
  24. 20
      nixos/modules/services/desktops/gnome/gnome-keyring.nix
  25. 12
      nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
  26. 16
      nixos/modules/services/desktops/gnome/gnome-online-miners.nix
  27. 32
      nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
  28. 16
      nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
  29. 16
      nixos/modules/services/desktops/gnome/gnome-user-share.nix
  30. 20
      nixos/modules/services/desktops/gnome/rygel.nix
  31. 16
      nixos/modules/services/desktops/gnome/sushi.nix
  32. 12
      nixos/modules/services/desktops/gnome/tracker-miners.nix
  33. 12
      nixos/modules/services/desktops/gnome/tracker.nix
  34. 24
      nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
  35. 2
      nixos/modules/services/desktops/gvfs.nix
  36. 2
      nixos/modules/services/desktops/telepathy.nix
  37. 18
      nixos/modules/services/x11/desktop-managers/cinnamon.nix
  38. 2
      nixos/modules/services/x11/desktop-managers/default.nix
  39. 176
      nixos/modules/services/x11/desktop-managers/gnome.nix
  40. 2
      nixos/modules/services/x11/desktop-managers/lxqt.nix
  41. 6
      nixos/modules/services/x11/desktop-managers/mate.nix
  42. 24
      nixos/modules/services/x11/desktop-managers/pantheon.nix
  43. 6
      nixos/modules/services/x11/desktop-managers/xfce.nix
  44. 10
      nixos/modules/services/x11/display-managers/gdm.nix
  45. 4
      nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
  46. 12
      nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
  47. 6
      nixos/modules/services/x11/window-managers/metacity.nix
  48. 4
      nixos/release-combined.nix
  49. 4
      nixos/release.nix
  50. 4
      nixos/tests/all-tests.nix
  51. 6
      nixos/tests/gnome-xorg.nix
  52. 8
      nixos/tests/gnome.nix
  53. 2
      nixos/tests/installed-tests/gnome-photos.nix
  54. 2
      nixos/tests/installed-tests/libgdata.nix
  55. 4
      nixos/tests/nixos-generate-config.nix
  56. 2
      nixos/tests/plotinus.nix
  57. 4
      pkgs/applications/accessibility/mousetweaks/default.nix
  58. 4
      pkgs/applications/accessibility/squeekboard/default.nix
  59. 4
      pkgs/applications/audio/cozy-audiobooks/default.nix
  60. 6
      pkgs/applications/audio/easytag/default.nix
  61. 4
      pkgs/applications/audio/gpodder/default.nix
  62. 4
      pkgs/applications/audio/gtkpod/default.nix
  63. 4
      pkgs/applications/audio/guitarix/default.nix
  64. 6
      pkgs/applications/audio/helio-workstation/default.nix
  65. 2
      pkgs/applications/audio/kapitonov-plugins-pack/default.nix
  66. 4
      pkgs/applications/audio/pavucontrol/default.nix
  67. 4
      pkgs/applications/audio/pithos/default.nix
  68. 4
      pkgs/applications/audio/quodlibet/default.nix
  69. 6
      pkgs/applications/audio/rhythmbox/default.nix
  70. 6
      pkgs/applications/audio/sfizz/default.nix
  71. 4
      pkgs/applications/audio/sonata/default.nix
  72. 6
      pkgs/applications/audio/sound-juicer/default.nix
  73. 4
      pkgs/applications/audio/spotify/default.nix
  74. 4
      pkgs/applications/display-managers/lightdm/default.nix
  75. 4
      pkgs/applications/editors/apostrophe/default.nix
  76. 4
      pkgs/applications/editors/bluefish/default.nix
  77. 6
      pkgs/applications/editors/gnome-builder/default.nix
  78. 6
      pkgs/applications/editors/gnome-latex/default.nix
  79. 2
      pkgs/applications/editors/gobby/default.nix
  80. 4
      pkgs/applications/graphics/avocode/default.nix
  81. 4
      pkgs/applications/graphics/darktable/default.nix
  82. 4
      pkgs/applications/graphics/gimp/wrapper.nix
  83. 6
      pkgs/applications/graphics/glabels/default.nix
  84. 4
      pkgs/applications/graphics/glimpse/wrapper.nix
  85. 6
      pkgs/applications/graphics/gnome-photos/default.nix
  86. 6
      pkgs/applications/graphics/gthumb/default.nix
  87. 4
      pkgs/applications/graphics/megapixels/default.nix
  88. 2
      pkgs/applications/graphics/ocrfeeder/default.nix
  89. 6
      pkgs/applications/graphics/shotwell/default.nix
  90. 4
      pkgs/applications/graphics/synfigstudio/default.nix
  91. 4
      pkgs/applications/graphics/tev/default.nix
  92. 4
      pkgs/applications/graphics/vimiv/default.nix
  93. 4
      pkgs/applications/misc/almanah/default.nix
  94. 4
      pkgs/applications/misc/font-manager/default.nix
  95. 4
      pkgs/applications/misc/gksu/default.nix
  96. 4
      pkgs/applications/misc/gnome-multi-writer/default.nix
  97. 4
      pkgs/applications/misc/gnome-recipes/default.nix
  98. 6
      pkgs/applications/misc/gnome-usage/default.nix
  99. 4
      pkgs/applications/misc/gpx-viewer/default.nix
  100. 2
      pkgs/applications/misc/gummi/default.nix

4
doc/languages-frameworks/gnome.section.md

@ -88,7 +88,7 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti
The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`.
:::
- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `gnome3.grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`.
- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`.
You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook:
@ -105,7 +105,7 @@ preFixup = ''
## Updating GNOME packages {#ssec-gnome-updating}
Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome3`. Read the package’s `NEWS` file to see what changed.
Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed.
## Frequently encountered issues {#ssec-gnome-common-issues}

4
maintainers/scripts/update.nix

@ -143,7 +143,7 @@ let
to run all update scripts for all packages that lists \`garbas\` as a maintainer
and have \`updateScript\` defined, or:
% nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus
% nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus
to run update script for specific package, or
@ -151,7 +151,7 @@ let
to run update script for all packages matching given predicate, or
% nix-shell maintainers/scripts/update.nix --argstr path gnome3
% nix-shell maintainers/scripts/update.nix --argstr path gnome
to run update script for all package under an attribute path.

2
nixos/doc/manual/configuration/x-windows.xml

@ -25,7 +25,7 @@
<programlisting>
<xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
<xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
<xref linkend="opt-services.xserver.desktopManager.gnome3.enable"/> = true;
<xref linkend="opt-services.xserver.desktopManager.gnome.enable"/> = true;
<xref linkend="opt-services.xserver.desktopManager.mate.enable"/> = true;
<xref linkend="opt-services.xserver.windowManager.xmonad.enable"/> = true;
<xref linkend="opt-services.xserver.windowManager.twm.enable"/> = true;

8
nixos/doc/manual/release-notes/rl-1909.xml

@ -83,10 +83,10 @@
like games.
<itemizedlist>
<para>This can be achieved with the following options which the desktop manager default enables, excluding <literal>games</literal>.</para>
<listitem><para><xref linkend="opt-services.gnome3.core-os-services.enable"/></para></listitem>
<listitem><para><xref linkend="opt-services.gnome3.core-shell.enable"/></para></listitem>
<listitem><para><xref linkend="opt-services.gnome3.core-utilities.enable"/></para></listitem>
<listitem><para><xref linkend="opt-services.gnome3.games.enable"/></para></listitem>
<listitem><para><option>services.gnome3.core-os-services.enable</option></para></listitem>
<listitem><para><option>services.gnome3.core-shell.enable</option></para></listitem>
<listitem><para><option>services.gnome3.core-utilities.enable</option></para></listitem>
<listitem><para><option>services.gnome3.games.enable</option></para></listitem>
</itemizedlist>
With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually
disable options or use <option>environment.gnome3.excludePackages</option> which only excluded the optional applications.

4
nixos/doc/manual/release-notes/rl-2105.xml

@ -27,7 +27,7 @@
<para>The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series.</para>
</listitem>
<listitem>
<para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>.</para>
<para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>. The <code>gnome3</code> attribute set has been renamed to <code>gnome</code> and so have been the NixOS options.</para>
</listitem>
<listitem>
<para>
@ -911,7 +911,7 @@ environment.systemPackages = [
</listitem>
<listitem>
<para>
The GNOME desktop manager once again installs <package>gnome3.epiphany</package> by default.
The GNOME desktop manager once again installs <package>gnome.epiphany</package> by default.
</para>
</listitem>
<listitem>

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix

@ -9,7 +9,7 @@ with lib;
isoImage.edition = "gnome";
services.xserver.desktopManager.gnome3 = {
services.xserver.desktopManager.gnome = {
# Add firefox to favorite-apps
favoriteAppsOverride = ''
[org.gnome.shell]

2
nixos/modules/installer/virtualbox-demo.nix

@ -44,7 +44,7 @@ with lib;
# Enable GDM/GNOME by uncommenting above two lines and two lines below.
# services.xserver.displayManager.gdm.enable = true;
# services.xserver.desktopManager.gnome3.enable = true;
# services.xserver.desktopManager.gnome.enable = true;
# Set your time zone.
# time.timeZone = "Europe/Amsterdam";

30
nixos/modules/module-list.nix

@ -339,21 +339,21 @@
./services/desktops/malcontent.nix
./services/desktops/pipewire/pipewire.nix
./services/desktops/pipewire/pipewire-media-session.nix
./services/desktops/gnome3/at-spi2-core.nix
./services/desktops/gnome3/chrome-gnome-shell.nix
./services/desktops/gnome3/evolution-data-server.nix
./services/desktops/gnome3/glib-networking.nix
./services/desktops/gnome3/gnome-initial-setup.nix
./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix
./services/desktops/gnome3/gnome-online-miners.nix
./services/desktops/gnome3/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-settings-daemon.nix
./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/rygel.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
./services/desktops/gnome3/tracker-miners.nix
./services/desktops/gnome/at-spi2-core.nix
./services/desktops/gnome/chrome-gnome-shell.nix
./services/desktops/gnome/evolution-data-server.nix
./services/desktops/gnome/glib-networking.nix
./services/desktops/gnome/gnome-initial-setup.nix
./services/desktops/gnome/gnome-keyring.nix
./services/desktops/gnome/gnome-online-accounts.nix
./services/desktops/gnome/gnome-online-miners.nix
./services/desktops/gnome/gnome-remote-desktop.nix
./services/desktops/gnome/gnome-settings-daemon.nix
./services/desktops/gnome/gnome-user-share.nix
./services/desktops/gnome/rygel.nix
./services/desktops/gnome/sushi.nix
./services/desktops/gnome/tracker.nix
./services/desktops/gnome/tracker-miners.nix
./services/desktops/neard.nix
./services/desktops/profile-sync-daemon.nix
./services/desktops/system-config-printer.nix

4
nixos/modules/programs/file-roller.nix

@ -30,9 +30,9 @@ with lib;
config = mkIf config.programs.file-roller.enable {
environment.systemPackages = [ pkgs.gnome3.file-roller ];
environment.systemPackages = [ pkgs.gnome.file-roller ];
services.dbus.packages = [ pkgs.gnome3.file-roller ];
services.dbus.packages = [ pkgs.gnome.file-roller ];
};

6
nixos/modules/programs/geary.nix

@ -15,10 +15,10 @@ in {
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome3.geary ];
environment.systemPackages = [ pkgs.gnome.geary ];
programs.dconf.enable = true;
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gnome.gnome-online-accounts.enable = true;
};
}

4
nixos/modules/programs/gnome-disks.nix

@ -41,9 +41,9 @@ with lib;
config = mkIf config.programs.gnome-disks.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ];
environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ];
services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ];
services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ];
};

10
nixos/modules/programs/gnome-documents.nix

@ -13,7 +13,7 @@ with lib;
# Added 2019-08-09
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-documents" "enable" ]
[ "services" "gnome" "gnome-documents" "enable" ]
[ "programs" "gnome-documents" "enable" ])
];
@ -41,13 +41,13 @@ with lib;
config = mkIf config.programs.gnome-documents.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-documents ];
environment.systemPackages = [ pkgs.gnome.gnome-documents ];
services.dbus.packages = [ pkgs.gnome3.gnome-documents ];
services.dbus.packages = [ pkgs.gnome.gnome-documents ];
services.gnome3.gnome-online-accounts.enable = true;
services.gnome.gnome-online-accounts.enable = true;
services.gnome3.gnome-online-miners.enable = true;
services.gnome.gnome-online-miners.enable = true;
};

6
nixos/modules/programs/gnome-terminal.nix

@ -28,9 +28,9 @@ in
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];
systemd.packages = [ pkgs.gnome3.gnome-terminal ];
environment.systemPackages = [ pkgs.gnome.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome.gnome-terminal ];
systemd.packages = [ pkgs.gnome.gnome-terminal ];
programs.bash.vteIntegration = true;
programs.zsh.vteIntegration = true;

8
nixos/modules/programs/gpaste.nix

@ -27,10 +27,10 @@ with lib;
###### implementation
config = mkIf config.programs.gpaste.enable {
environment.systemPackages = [ pkgs.gnome3.gpaste ];
services.dbus.packages = [ pkgs.gnome3.gpaste ];
systemd.packages = [ pkgs.gnome3.gpaste ];
environment.systemPackages = [ pkgs.gnome.gpaste ];
services.dbus.packages = [ pkgs.gnome.gpaste ];
systemd.packages = [ pkgs.gnome.gpaste ];
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ];
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
};
}

4
nixos/modules/programs/phosh.nix

@ -155,8 +155,8 @@ in {
'';
};
services.gnome3.core-shell.enable = true;
services.gnome3.core-os-services.enable = true;
services.gnome.core-shell.enable = true;
services.gnome.core-os-services.enable = true;
services.xserver.displayManager.sessionPackages = [ pkgs.phosh ];
environment.etc."phosh/phoc.ini".source =

6
nixos/modules/programs/seahorse.nix

@ -31,14 +31,14 @@ with lib;
config = mkIf config.programs.seahorse.enable {
programs.ssh.askPassword = mkDefault "${pkgs.gnome3.seahorse}/libexec/seahorse/ssh-askpass";
programs.ssh.askPassword = mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass";
environment.systemPackages = [
pkgs.gnome3.seahorse
pkgs.gnome.seahorse
];
services.dbus.packages = [
pkgs.gnome3.seahorse
pkgs.gnome.seahorse
];
};

6
nixos/modules/security/pam.nix

@ -433,7 +433,7 @@ let
("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}
${optionalString cfg.enableGnomeKeyring
"auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"}
"auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"}
${optionalString cfg.gnupg.enable
"auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"
+ optionalString cfg.gnupg.storeOnly " store-only"
@ -471,7 +471,7 @@ let
${optionalString config.krb5.enable
"password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"}
${optionalString cfg.enableGnomeKeyring
"password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"}
"password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"}
# Session management.
${optionalString cfg.setEnvironment ''
@ -512,7 +512,7 @@ let
("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" +
" kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")}
${optionalString (cfg.enableGnomeKeyring)
"session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
"session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"}
${optionalString cfg.gnupg.enable
"session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"
+ optionalString cfg.gnupg.noAutostart " no-autostart"

2
nixos/modules/services/desktops/flatpak.nix

@ -20,7 +20,7 @@ in {
internal = true;
type = types.listOf types.package;
default = [];
example = literalExample "[ pkgs.gnome3.gnome-software ]";
example = literalExample "[ pkgs.gnome.gnome-software ]";
description = ''
Packages that provide an interface for flatpak
(like gnome-software) that will be automatically available

14
nixos/modules/services/desktops/gnome3/at-spi2-core.nix → nixos/modules/services/desktops/gnome/at-spi2-core.nix

@ -12,9 +12,17 @@ with lib;
###### interface
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "at-spi2-core" "enable" ]
[ "services" "gnome" "at-spi2-core" "enable" ]
)
];
options = {
services.gnome3.at-spi2-core = {
services.gnome.at-spi2-core = {
enable = mkOption {
type = types.bool;
@ -36,13 +44,13 @@ with lib;
###### implementation
config = mkMerge [
(mkIf config.services.gnome3.at-spi2-core.enable {
(mkIf config.services.gnome.at-spi2-core.enable {
environment.systemPackages = [ pkgs.at-spi2-core ];
services.dbus.packages = [ pkgs.at-spi2-core ];
systemd.packages = [ pkgs.at-spi2-core ];
})
(mkIf (!config.services.gnome3.at-spi2-core.enable) {
(mkIf (!config.services.gnome.at-spi2-core.enable) {
environment.variables.NO_AT_BRIDGE = "1";
})
];

12
nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix → nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix

@ -8,9 +8,17 @@ with lib;
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "chrome-gnome-shell" "enable" ]
[ "services" "gnome" "chrome-gnome-shell" "enable" ]
)
];
###### interface
options = {
services.gnome3.chrome-gnome-shell.enable = mkEnableOption ''
services.gnome.chrome-gnome-shell.enable = mkEnableOption ''
Chrome GNOME Shell native host connector, a DBus service
allowing to install GNOME Shell extensions from a web browser.
'';
@ -18,7 +26,7 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.chrome-gnome-shell.enable {
config = mkIf config.services.gnome.chrome-gnome-shell.enable {
environment.etc = {
"chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";
"opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json";

22
nixos/modules/services/desktops/gnome3/evolution-data-server.nix → nixos/modules/services/desktops/gnome/evolution-data-server.nix

@ -10,11 +10,23 @@ with lib;
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "evolution-data-server" "enable" ]
[ "services" "gnome" "evolution-data-server" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "evolution-data-server" "plugins" ]
[ "services" "gnome" "evolution-data-server" "plugins" ]
)
];
###### interface
options = {
services.gnome3.evolution-data-server = {
services.gnome.evolution-data-server = {
enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars.";
plugins = mkOption {
type = types.listOf types.package;
@ -38,10 +50,10 @@ with lib;
config =
let
bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome3.evolution-data-server) plugins; };
bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome.evolution-data-server) plugins; };
in
mkMerge [
(mkIf config.services.gnome3.evolution-data-server.enable {
(mkIf config.services.gnome.evolution-data-server.enable {
environment.systemPackages = [ bundle ];
services.dbus.packages = [ bundle ];
@ -49,11 +61,11 @@ with lib;
systemd.packages = [ bundle ];
})
(mkIf config.programs.evolution.enable {
services.gnome3.evolution-data-server = {
services.gnome.evolution-data-server = {
enable = true;
plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins;
};
services.gnome3.gnome-keyring.enable = true;
services.gnome.gnome-keyring.enable = true;
})
];
}

12
nixos/modules/services/desktops/gnome3/glib-networking.nix → nixos/modules/services/desktops/gnome/glib-networking.nix

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "glib-networking" "enable" ]
[ "services" "gnome" "glib-networking" "enable" ]
)
];
###### interface
options = {
services.gnome3.glib-networking = {
services.gnome.glib-networking = {
enable = mkEnableOption "network extensions for GLib";
@ -24,7 +32,7 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.glib-networking.enable {
config = mkIf config.services.gnome.glib-networking.enable {
services.dbus.packages = [ pkgs.glib-networking ];

16
nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix → nixos/modules/services/desktops/gnome/gnome-initial-setup.nix

@ -48,11 +48,19 @@ in
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-initial-setup" "enable" ]
[ "services" "gnome" "gnome-initial-setup" "enable" ]
)
];
###### interface
options = {
services.gnome3.gnome-initial-setup = {
services.gnome.gnome-initial-setup = {
enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system";
@ -63,16 +71,16 @@ in
###### implementation
config = mkIf config.services.gnome3.gnome-initial-setup.enable {
config = mkIf config.services.gnome.gnome-initial-setup.enable {
environment.systemPackages = [
pkgs.gnome3.gnome-initial-setup
pkgs.gnome.gnome-initial-setup
]
++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart
;
systemd.packages = [
pkgs.gnome3.gnome-initial-setup
pkgs.gnome.gnome-initial-setup
];
systemd.user.targets."gnome-session".wants = [

20
nixos/modules/services/desktops/gnome3/gnome-keyring.nix → nixos/modules/services/desktops/gnome/gnome-keyring.nix

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-keyring" "enable" ]
[ "services" "gnome" "gnome-keyring" "enable" ]
)
];
###### interface
options = {
services.gnome3.gnome-keyring = {
services.gnome.gnome-keyring = {
enable = mkOption {
type = types.bool;
@ -33,18 +41,18 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.gnome-keyring.enable {
config = mkIf config.services.gnome.gnome-keyring.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-keyring ];
environment.systemPackages = [ pkgs.gnome.gnome-keyring ];
services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ];
services.dbus.packages = [ pkgs.gnome.gnome-keyring pkgs.gcr ];
xdg.portal.extraPortals = [ pkgs.gnome3.gnome-keyring ];
xdg.portal.extraPortals = [ pkgs.gnome.gnome-keyring ];
security.pam.services.login.enableGnomeKeyring = true;
security.wrappers.gnome-keyring-daemon = {
source = "${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon";
source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon";
capabilities = "cap_ipc_lock=ep";
};

12
nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix → nixos/modules/services/desktops/gnome/gnome-online-accounts.nix

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-online-accounts" "enable" ]
[ "services" "gnome" "gnome-online-accounts" "enable" ]
)
];
###### interface
options = {
services.gnome3.gnome-online-accounts = {
services.gnome.gnome-online-accounts = {
enable = mkOption {
type = types.bool;
@ -32,7 +40,7 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.gnome-online-accounts.enable {
config = mkIf config.services.gnome.gnome-online-accounts.enable {
environment.systemPackages = [ pkgs.gnome-online-accounts ];

16
nixos/modules/services/desktops/gnome3/gnome-online-miners.nix → nixos/modules/services/desktops/gnome/gnome-online-miners.nix

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-online-miners" "enable" ]
[ "services" "gnome" "gnome-online-miners" "enable" ]
)
];
###### interface
options = {
services.gnome3.gnome-online-miners = {
services.gnome.gnome-online-miners = {
enable = mkOption {
type = types.bool;
@ -32,11 +40,11 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.gnome-online-miners.enable {
config = mkIf config.services.gnome.gnome-online-miners.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ];
environment.systemPackages = [ pkgs.gnome.gnome-online-miners ];
services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ];
services.dbus.packages = [ pkgs.gnome.gnome-online-miners ];
};

32
nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix

@ -0,0 +1,32 @@
# Remote desktop daemon using Pipewire.
{ config, lib, pkgs, ... }:
with lib;
{
meta = {
maintainers = teams.gnome.members;
};
# Added 2021-05-07
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-remote-desktop" "enable" ]
[ "services" "gnome" "gnome-remote-desktop" "enable" ]
)
];
###### interface
options = {
services.gnome.gnome-remote-desktop = {
enable = mkEnableOption "Remote Desktop support using Pipewire";
};
};
###### implementation
config = mkIf config.services.gnome.gnome-remote-desktop.enable {
services.pipewire.enable = true;
systemd.packages = [ pkgs.gnome.gnome-remote-desktop ];
};
}

16
nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix → nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix

@ -6,7 +6,7 @@ with lib;
let
cfg = config.services.gnome3.gnome-settings-daemon;
cfg = config.services.gnome.gnome-settings-daemon;
in
@ -20,13 +20,19 @@ in
(mkRemovedOptionModule
["services" "gnome3" "gnome-settings-daemon" "package"]
"")
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-settings-daemon" "enable" ]
[ "services" "gnome" "gnome-settings-daemon" "enable" ]
)
];
###### interface
options = {
services.gnome3.gnome-settings-daemon = {
services.gnome.gnome-settings-daemon = {
enable = mkEnableOption "GNOME Settings Daemon";
@ -40,15 +46,15 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [
pkgs.gnome3.gnome-settings-daemon
pkgs.gnome.gnome-settings-daemon
];
services.udev.packages = [
pkgs.gnome3.gnome-settings-daemon
pkgs.gnome.gnome-settings-daemon
];
systemd.packages = [
pkgs.gnome3.gnome-settings-daemon
pkgs.gnome.gnome-settings-daemon
];
systemd.user.targets."gnome-session-initialized".wants = [

16
nixos/modules/services/desktops/gnome3/gnome-user-share.nix → nixos/modules/services/desktops/gnome/gnome-user-share.nix

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members;
};
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-user-share" "enable" ]
[ "services" "gnome" "gnome-user-share" "enable" ]
)
];
###### interface
options = {
services.gnome3.gnome-user-share = {
services.gnome.gnome-user-share = {
enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME";
@ -25,14 +33,14 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.gnome-user-share.enable {
config = mkIf config.services.gnome.gnome-user-share.enable {
environment.systemPackages = [
pkgs.gnome3.gnome-user-share
pkgs.gnome.gnome-user-share
];
systemd.packages = [
pkgs.gnome3.gnome-user-share
pkgs.gnome.gnome-user-share
];
};

20
nixos/modules/services/desktops/gnome3/rygel.nix → nixos/modules/services/desktops/gnome/rygel.nix

@ -8,9 +8,17 @@ with lib;
maintainers = teams.gnome.members;
};
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "rygel" "enable" ]
[ "services" "gnome" "rygel" "enable" ]
)
];
###### interface
options = {
services.gnome3.rygel = {
services.gnome.rygel = {
enable = mkOption {
default = false;
description = ''
@ -24,13 +32,13 @@ with lib;
};
###### implementation
config = mkIf config.services.gnome3.rygel.enable {
environment.systemPackages = [ pkgs.gnome3.rygel ];
config = mkIf config.services.gnome.rygel.enable {
environment.systemPackages = [ pkgs.gnome.rygel ];
services.dbus.packages = [ pkgs.gnome3.rygel ];
services.dbus.packages = [ pkgs.gnome.rygel ];
systemd.packages = [ pkgs.gnome3.rygel ];
systemd.packages = [ pkgs.gnome.rygel ];
environment.etc."rygel.conf".source = "${pkgs.gnome3.rygel}/etc/rygel.conf";
environment.etc."rygel.conf".source = "${pkgs.gnome.rygel}/etc/rygel.conf";
};
}

16
nixos/modules/services/desktops/gnome3/sushi.nix → nixos/modules/services/desktops/gnome/sushi.nix

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members;
};
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "sushi" "enable" ]
[ "services" "gnome" "sushi" "enable" ]
)
];
###### interface
options = {
services.gnome3.sushi = {
services.gnome.sushi = {
enable = mkOption {
type = types.bool;
@ -31,11 +39,11 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.sushi.enable {
config = mkIf config.services.gnome.sushi.enable {
environment.systemPackages = [ pkgs.gnome3.sushi ];
environment.systemPackages = [ pkgs.gnome.sushi ];
services.dbus.packages = [ pkgs.gnome3.sushi ];
services.dbus.packages = [ pkgs.gnome.sushi ];
};

12
nixos/modules/services/desktops/gnome3/tracker-miners.nix → nixos/modules/services/desktops/gnome/tracker-miners.nix

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members;
};
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "tracker-miners" "enable" ]
[ "services" "gnome" "tracker-miners" "enable" ]
)
];
###### interface
options = {
services.gnome3.tracker-miners = {
services.gnome.tracker-miners = {
enable = mkOption {
type = types.bool;
@ -31,7 +39,7 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.tracker-miners.enable {
config = mkIf config.services.gnome.tracker-miners.enable {
environment.systemPackages = [ pkgs.tracker-miners ];

12
nixos/modules/services/desktops/gnome3/tracker.nix → nixos/modules/services/desktops/gnome/tracker.nix

@ -10,11 +10,19 @@ with lib;
maintainers = teams.gnome.members;
};
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "tracker" "enable" ]
[ "services" "gnome" "tracker" "enable" ]
)
];
###### interface
options = {
services.gnome3.tracker = {
services.gnome.tracker = {
enable = mkOption {
type = types.bool;
@ -32,7 +40,7 @@ with lib;
###### implementation
config = mkIf config.services.gnome3.tracker.enable {
config = mkIf config.services.gnome.tracker.enable {
environment.systemPackages = [ pkgs.tracker ];

24
nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix

@ -1,24 +0,0 @@
# Remote desktop daemon using Pipewire.
{ config, lib, pkgs, ... }:
with lib;
{
meta = {
maintainers = teams.gnome.members;
};
###### interface
options = {
services.gnome3.gnome-remote-desktop = {
enable = mkEnableOption "Remote Desktop support using Pipewire";
};
};
###### implementation
config = mkIf config.services.gnome3.gnome-remote-desktop.enable {
services.pipewire.enable = true;
systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ];
};
}

2
nixos/modules/services/desktops/gvfs.nix

@ -34,7 +34,7 @@ in
# gvfs can be built with multiple configurations
package = mkOption {
type = types.package;
default = pkgs.gnome3.gvfs;
default = pkgs.gnome.gvfs;
description = "Which GVfs package to use.";
};

2
nixos/modules/services/desktops/telepathy.nix

@ -39,7 +39,7 @@ with lib;
services.dbus.packages = [ pkgs.telepathy-mission-control ];
# Enable runtime optional telepathy in gnome-shell
services.xserver.desktopManager.gnome3.sessionPath = with pkgs; [
services.xserver.desktopManager.gnome.sessionPath = with pkgs; [
telepathy-glib
telepathy-logger
];

18
nixos/modules/services/x11/desktop-managers/cinnamon.nix

@ -26,7 +26,7 @@ in
sessionPath = mkOption {
default = [];
type = types.listOf types.package;
example = literalExample "[ pkgs.gnome3.gpaste ]";
example = literalExample "[ pkgs.gnome.gpaste ]";
description = ''
Additional list of packages to be added to the session search path.
Useful for GSettings-conditional autostart.
@ -94,8 +94,8 @@ in
xapps
];
services.cinnamon.apps.enable = mkDefault true;
services.gnome3.glib-networking.enable = true;
services.gnome3.gnome-keyring.enable = true;
services.gnome.glib-networking.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gvfs.enable = true;
services.udisks2.enable = true;
services.upower.enable = mkDefault config.powerManagement.enable;
@ -110,7 +110,7 @@ in
programs.dconf.enable = true;
# Enable org.a11y.Bus
services.gnome3.at-spi2-core.enable = true;
services.gnome.at-spi2-core.enable = true;
# Fix lockscreen
security.pam.services = {
@ -135,19 +135,19 @@ in
# session requirements
cinnamon-screensaver
# cinnamon-killer-daemon: provided by cinnamon-common
gnome3.networkmanagerapplet # session requirement - also nm-applet not needed
gnome.networkmanagerapplet # session requirement - also nm-applet not needed
# packages
nemo
cinnamon-control-center
cinnamon-settings-daemon
gnome3.libgnomekbd
gnome.libgnomekbd
orca
# theme
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
hicolor-icon-theme
gnome3.gnome-themes-extra
gnome.gnome-themes-extra
gtk3.out
mint-artwork
mint-themes
@ -192,7 +192,7 @@ in
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [
environment.systemPackages = (with pkgs // pkgs.gnome // pkgs.cinnamon; pkgs.gnome.removePackagesByName [
# cinnamon team apps
blueberry
warpinator

2
nixos/modules/services/x11/desktop-managers/default.nix

@ -19,7 +19,7 @@ in
# E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix
./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
./cinnamon.nix
];

176
nixos/modules/services/x11/desktop-managers/gnome3.nix → nixos/modules/services/x11/desktop-managers/gnome.nix

@ -4,8 +4,8 @@ with lib;
let
cfg = config.services.xserver.desktopManager.gnome3;
serviceCfg = config.services.gnome3;
cfg = config.services.xserver.desktopManager.gnome;
serviceCfg = config.services.gnome;
# Prioritize nautilus by default when opening directories
mimeAppsList = pkgs.writeTextFile {
@ -23,7 +23,7 @@ let
'';
nixos-gsettings-desktop-schemas = let
defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ];
defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome.gnome-shell ];
in
pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; }
''
@ -33,10 +33,10 @@ let
(pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n")
(defaultPackages ++ cfg.extraGSettingsOverridePackages)}
cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -f ${pkgs.gnome.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${optionalString flashbackEnabled ''
cp -f ${pkgs.gnome3.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
cp -f ${pkgs.gnome.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
''}
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
@ -57,7 +57,7 @@ let
flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;
notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome3.excludePackages));
notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages));
in
@ -67,9 +67,69 @@ in
maintainers = teams.gnome.members;
};
imports = [
# Added 2021-05-07
(mkRenamedOptionModule
[ "services" "gnome3" "core-os-services" "enable" ]
[ "services" "gnome" "core-os-services" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "core-shell" "enable" ]
[ "services" "gnome" "core-shell" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "core-utilities" "enable" ]
[ "services" "gnome" "core-utilities" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "core-developer-tools" "enable" ]
[ "services" "gnome" "core-developer-tools" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "games" "enable" ]
[ "services" "gnome" "games" "enable" ]
)
(mkRenamedOptionModule
[ "services" "gnome3" "experimental-features" "realtime-scheduling" ]
[ "services" "gnome" "experimental-features" "realtime-scheduling" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "enable" ]
[ "services" "xserver" "desktopManager" "gnome" "enable" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "sessionPath" ]
[ "services" "xserver" "desktopManager" "gnome" "sessionPath" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "favoriteAppsOverride" ]
[ "services" "xserver" "desktopManager" "gnome" "favoriteAppsOverride" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverrides" ]
[ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverrides" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverridePackages" ]
[ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverridePackages" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "debug" ]
[ "services" "xserver" "desktopManager" "gnome" "debug" ]
)
(mkRenamedOptionModule
[ "services" "xserver" "desktopManager" "gnome3" "flashback" ]
[ "services" "xserver" "desktopManager" "gnome" "flashback" ]
)
(mkRenamedOptionModule
[ "environment" "gnome3" "excludePackages" ]
[ "environment" "gnome" "excludePackages" ]
)
];
options = {
services.gnome3 = {
services.gnome = {
core-os-services.enable = mkEnableOption "essential services for GNOME3";
core-shell.enable = mkEnableOption "GNOME Shell services";
core-utilities.enable = mkEnableOption "GNOME core utilities";
@ -109,7 +169,7 @@ in
};
};
services.xserver.desktopManager.gnome3 = {
services.xserver.desktopManager.gnome = {
enable = mkOption {
type = types.bool;
default = false;
@ -119,14 +179,14 @@ in
sessionPath = mkOption {
default = [];
type = types.listOf types.package;
example = literalExample "[ pkgs.gnome3.gpaste ]";
example = literalExample "[ pkgs.gnome.gpaste ]";
description = ''
Additional list of packages to be added to the session search path.
Useful for GNOME Shell extensions or GSettings-conditional autostart.
Note that this should be a last resort<