Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a42fbd6210dc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f6dda737a11
Choose a head ref
  • 2 commits
  • 41 files changed
  • 1 contributor

Commits on Apr 2, 2020

  1. nixos: add freedesktop/gnome/myself maintainers

    @worldofpeace
    worldofpeace committed Apr 2, 2020
    Copy the full SHA
    b0ac19e View commit details

  2. Merge pull request #84059 from worldofpeace/teams-nixos 

    nixos: add freedesktop/gnome/myself maintainers
    @worldofpeace
    worldofpeace authored Apr 2, 2020
    Copy the full SHA
    7f6dda7 View commit details
Showing with 172 additions and 9 deletions.
  1. +4 −0 nixos/modules/config/vte.nix
  2. +6 −2 nixos/modules/config/xdg/autostart.nix
  3. +4 −0 nixos/modules/config/xdg/icons.nix
  4. +6 −2 nixos/modules/config/xdg/menus.nix
  5. +4 −0 nixos/modules/config/xdg/mime.nix
  6. +4 −0 nixos/modules/config/xdg/portal.nix
  7. +4 −0 nixos/modules/config/xdg/sounds.nix
  8. +4 −0 nixos/modules/programs/geary.nix
  9. +4 −0 nixos/modules/programs/gnome-disks.nix
  10. +4 −0 nixos/modules/programs/gnome-documents.nix
  11. +4 −2 nixos/modules/programs/gnome-terminal.nix
  12. +4 −0 nixos/modules/programs/nm-applet.nix
  13. +4 −0 nixos/modules/services/desktops/accountsservice.nix
  14. +4 −0 nixos/modules/services/desktops/bamf.nix
  15. +4 −0 nixos/modules/services/desktops/gnome3/at-spi2-core.nix
  16. +4 −0 nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
  17. +5 −1 nixos/modules/services/desktops/gnome3/evolution-data-server.nix
  18. +4 −0 nixos/modules/services/desktops/gnome3/glib-networking.nix
  19. +4 −0 nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
  20. +4 −0 nixos/modules/services/desktops/gnome3/gnome-keyring.nix
  21. +4 −0 nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
  22. +4 −0 nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
  23. +4 −0 nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
  24. +4 −0 nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
  25. +4 −0 nixos/modules/services/desktops/gnome3/gnome-user-share.nix
  26. +4 −0 nixos/modules/services/desktops/gnome3/rygel.nix
  27. +4 −0 nixos/modules/services/desktops/gnome3/sushi.nix
  28. +4 −1 nixos/modules/services/desktops/gnome3/tracker-miners.nix
  29. +4 −0 nixos/modules/services/desktops/gnome3/tracker.nix
  30. +4 −0 nixos/modules/services/desktops/gvfs.nix
  31. +5 −1 nixos/modules/services/desktops/pipewire.nix
  32. +4 −0 nixos/modules/services/desktops/telepathy.nix
  33. +4 −0 nixos/modules/services/desktops/tumbler.nix
  34. +5 −0 nixos/modules/services/desktops/zeitgeist.nix
  35. +4 −0 nixos/modules/services/networking/networkmanager.nix
  36. +4 −0 nixos/modules/services/x11/desktop-managers/gnome3.nix
  37. +4 −0 nixos/modules/services/x11/desktop-managers/xfce.nix
  38. +5 −0 nixos/modules/services/x11/display-managers/account-service-util.nix
  39. +4 −0 nixos/modules/services/x11/display-managers/gdm.nix
  40. +4 −0 nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
  41. +4 −0 nixos/modules/services/x11/display-managers/lightdm.nix
4 changes: 4 additions & 0 deletions nixos/modules/config/vte.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,10 @@ in

{

meta = {
maintainers = teams.gnome.members;
};

options = {

programs.bash.vteIntegration = mkOption {
8 changes: 6 additions & 2 deletions nixos/modules/config/xdg/autostart.nix
View file
Original file line number Diff line number Diff line change
@@ -2,19 +2,23 @@

with lib;
{
meta = {
maintainers = teams.freedesktop.members;
};

options = {
xdg.autostart.enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to install files to support the
Whether to install files to support the
<link xlink:href="https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html">XDG Autostart specification</link>.
'';
};
};

config = mkIf config.xdg.autostart.enable {
environment.pathsToLink = [
environment.pathsToLink = [
"/etc/xdg/autostart"
];
};
4 changes: 4 additions & 0 deletions nixos/modules/config/xdg/icons.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

with lib;
{
meta = {
maintainers = teams.freedesktop.members;
};

options = {
xdg.icons.enable = mkOption {
type = types.bool;
8 changes: 6 additions & 2 deletions nixos/modules/config/xdg/menus.nix
View file
Original file line number Diff line number Diff line change
@@ -2,19 +2,23 @@

with lib;
{
meta = {
maintainers = teams.freedesktop.members;
};

options = {
xdg.menus.enable = mkOption {
type = types.bool;
default = true;
description = ''
Whether to install files to support the
Whether to install files to support the
<link xlink:href="https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html">XDG Desktop Menu specification</link>.
'';
};
};

config = mkIf config.xdg.menus.enable {
environment.pathsToLink = [
environment.pathsToLink = [
"/share/applications"
"/share/desktop-directories"
"/etc/xdg/menus"
4 changes: 4 additions & 0 deletions nixos/modules/config/xdg/mime.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

with lib;
{
meta = {
maintainers = teams.freedesktop.members;
};

options = {
xdg.mime.enable = mkOption {
type = types.bool;
4 changes: 4 additions & 0 deletions nixos/modules/config/xdg/portal.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,10 @@ with lib;
(mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])
];

meta = {
maintainers = teams.freedesktop.members;
};

options.xdg.portal = {
enable =
mkEnableOption "<link xlink:href='https://github.com/flatpak/xdg-desktop-portal'>xdg desktop integration</link>"//{
4 changes: 4 additions & 0 deletions nixos/modules/config/xdg/sounds.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,10 @@

with lib;
{
meta = {
maintainers = teams.freedesktop.members;
};

options = {
xdg.sounds.enable = mkOption {
type = types.bool;
4 changes: 4 additions & 0 deletions nixos/modules/programs/geary.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ let
cfg = config.programs.geary;

in {
meta = {
maintainers = teams.gnome.members;
};

options = {
programs.geary.enable = mkEnableOption "Geary, a Mail client for GNOME 3";
};
4 changes: 4 additions & 0 deletions nixos/modules/programs/gnome-disks.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

# Added 2019-08-09
imports = [
(mkRenamedOptionModule
4 changes: 4 additions & 0 deletions nixos/modules/programs/gnome-documents.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

# Added 2019-08-09
imports = [
(mkRenamedOptionModule
6 changes: 4 additions & 2 deletions nixos/modules/programs/gnome-terminal.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ in

{

meta = {
maintainers = teams.gnome.members;
};

# Added 2019-08-19
imports = [
(mkRenamedOptionModule
@@ -20,9 +24,7 @@ in
];

options = {

programs.gnome-terminal.enable = mkEnableOption "GNOME Terminal";

};

config = mkIf cfg.enable {
4 changes: 4 additions & 0 deletions nixos/modules/programs/nm-applet.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{ config, lib, pkgs, ... }:

{
meta = {
maintainers = lib.teams.freedesktop.members;
};

options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet";

config = lib.mkIf config.programs.nm-applet.enable {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/accountsservice.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.freedesktop.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/bamf.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,10 @@
with lib;

{
meta = {
maintainers = with maintainers; [ worldofpeace ];
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/at-spi2-core.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,10 @@
with lib;

{
meta = {
maintainers = teams.gnome.members;
};

###### interface
options = {
services.gnome3.chrome-gnome-shell.enable = mkEnableOption ''
6 changes: 5 additions & 1 deletion nixos/modules/services/desktops/gnome3/evolution-data-server.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
@@ -16,7 +20,7 @@ with lib;
type = types.bool;
default = false;
description = ''
Whether to enable Evolution Data Server, a collection of services for
Whether to enable Evolution Data Server, a collection of services for
storing addressbooks and calendars.
'';
};
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/glib-networking.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix
View file
Original file line number Diff line number Diff line change
@@ -44,6 +44,10 @@ in

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-keyring.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,10 @@
with lib;

{
meta = {
maintainers = teams.gnome.members;
};

###### interface
options = {
services.gnome3.gnome-remote-desktop = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ in

{

meta = {
maintainers = teams.gnome.members;
};

imports = [
(mkRemovedOptionModule
["services" "gnome3" "gnome-settings-daemon" "package"]
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/gnome-user-share.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/rygel.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,10 @@
with lib;

{
meta = {
maintainers = teams.gnome.members;
};

###### interface
options = {
services.gnome3.rygel = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/sushi.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
5 changes: 4 additions & 1 deletion nixos/modules/services/desktops/gnome3/tracker-miners.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
@@ -25,7 +29,6 @@ with lib;

};


###### implementation

config = mkIf config.services.gnome3.tracker-miners.enable {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gnome3/tracker.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ with lib;

{

meta = {
maintainers = teams.gnome.members;
};

###### interface

options = {
4 changes: 4 additions & 0 deletions nixos/modules/services/desktops/gvfs.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ in

{

meta = {
maintainers = teams.gnome.members;
};

# Added 2019-08-19
imports = [
(mkRenamedOptionModule
Loading