public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt
2021-05-08 14:43:43 +02:00
parent 0388b1a029 b28f0d640f
commit 9651084620
657 changed files with 2572 additions and 1628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
+1 -1
View File
@@ -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]
nixos/modules/installer/virtualbox-demo.nix
+1 -1
View File
@@ -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";
nixos/modules/module-list.nix
+15 -15
View File
@@ -338,21 +338,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
nixos/modules/programs/file-roller.nix
+2 -2
View File
@@ -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 ];
};
nixos/modules/programs/geary.nix
+3 -3
View File
@@ -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;
};
}
nixos/modules/programs/gnome-disks.nix
+2 -2
View File
@@ -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 ];
};
nixos/modules/programs/gnome-documents.nix
+5 -5
View File
@@ -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;
};
nixos/modules/programs/gnome-terminal.nix
+3 -3
View File
@@ -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;
nixos/modules/programs/gpaste.nix
+4 -4
View File
@@ -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 ];
};
}
nixos/modules/programs/phosh.nix
+2 -2
View File
@@ -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 =
nixos/modules/programs/seahorse.nix
+3 -3
View File
@@ -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
];
};
nixos/modules/security/pam.nix
+3 -3
View File
@@ -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"
nixos/modules/services/desktops/bamf.nix
+1 -1
View File
@@ -6,7 +6,7 @@ with lib;
{
meta = {
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
###### interface
nixos/modules/services/desktops/flatpak.nix
+1 -1
View File
@@ -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
nixos/modules/services/desktops/geoclue2.nix
+1 -1
View File
@@ -266,5 +266,5 @@ in
} // mapAttrs' appConfigToINICompatible cfg.appConfig);
};
meta.maintainers = with lib.maintainers; [ worldofpeace ];
meta.maintainers = with lib.maintainers; [ ];
}
nixos/modules/services/desktops/gnome3/at-spi2-core.nix → nixos/modules/services/desktops/gnome/at-spi2-core.nix
+11 -3
View File
@@ -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";
})
];
nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix → nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix
+10 -2
View File
@@ -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";
nixos/modules/services/desktops/gnome3/evolution-data-server.nix → nixos/modules/services/desktops/gnome/evolution-data-server.nix
+17 -5
View File
@@ -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;
})
];
}
nixos/modules/services/desktops/gnome3/glib-networking.nix → nixos/modules/services/desktops/gnome/glib-networking.nix
+10 -2
View File
@@ -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 ];
nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix → nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
+12 -4
View File
@@ -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 = [
nixos/modules/services/desktops/gnome3/gnome-keyring.nix → nixos/modules/services/desktops/gnome/gnome-keyring.nix
+14 -6
View File
@@ -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";
};
nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix → nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
+10 -2
View File
@@ -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 ];
nixos/modules/services/desktops/gnome3/gnome-online-miners.nix → nixos/modules/services/desktops/gnome/gnome-online-miners.nix
+12 -4
View File
@@ -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 ];
};
nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
+32
View File
@@ -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 ];
};
}
nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix → nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
+11 -5
View File
@@ -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 = [
nixos/modules/services/desktops/gnome3/gnome-user-share.nix → nixos/modules/services/desktops/gnome/gnome-user-share.nix
+12 -4
View File
@@ -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
];
};
nixos/modules/services/desktops/gnome3/rygel.nix → nixos/modules/services/desktops/gnome/rygel.nix
+14 -6
View File
@@ -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";
};
}
nixos/modules/services/desktops/gnome3/sushi.nix → nixos/modules/services/desktops/gnome/sushi.nix
+12 -4
View File
@@ -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 ];
};
nixos/modules/services/desktops/gnome3/tracker-miners.nix → nixos/modules/services/desktops/gnome/tracker-miners.nix
+10 -2
View File
@@ -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 ];
nixos/modules/services/desktops/gnome3/tracker.nix → nixos/modules/services/desktops/gnome/tracker.nix
+10 -2
View File
@@ -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 ];
nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
-24
View File
@@ -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 ];
};
}
nixos/modules/services/desktops/gvfs.nix
+1 -1
View File
@@ -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.";
};
nixos/modules/services/desktops/telepathy.nix
+1 -1
View File
@@ -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
];
nixos/modules/services/desktops/tumbler.nix
+1 -1
View File
@@ -19,7 +19,7 @@ in
];
meta = {
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
###### interface
nixos/modules/services/desktops/zeitgeist.nix
+1 -1
View File
@@ -7,7 +7,7 @@ with lib;
{
meta = {
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
###### interface
nixos/modules/services/networking/yggdrasil.nix
+2 -3
View File
@@ -64,7 +64,7 @@ in {
type = types.str;
default = "root";
example = "wheel";
description = "Group to grant acces to the Yggdrasil control socket.";
description = "Group to grant access to the Yggdrasil control socket.";
};
openMulticastPort = mkOption {
@@ -122,12 +122,11 @@ in {
system.activationScripts.yggdrasil = mkIf cfg.persistentKeys ''
if [ ! -e ${keysPath} ]
then
mkdir -p ${builtins.dirOf keysPath}
mkdir --mode=700 -p ${builtins.dirOf keysPath}
${binYggdrasil} -genconf -json \
| ${pkgs.jq}/bin/jq \
'to_entries|map(select(.key|endswith("Key")))|from_entries' \
> ${keysPath}
chmod 600 ${keysPath}
fi
'';
nixos/modules/services/x11/desktop-managers/cinnamon.nix
+9 -9
View File
@@ -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
nixos/modules/services/x11/desktop-managers/default.nix
+1 -1
View File
@@ -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
];
nixos/modules/services/x11/desktop-managers/gnome3.nix → nixos/modules/services/x11/desktop-managers/gnome.nix
+118 -58
View File
@@ -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; patching the package is preferred (see GPaste).
'';
apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ];
apply = list: list ++ [ pkgs.gnome.gnome-shell pkgs.gnome.gnome-shell-extensions ];
};
favoriteAppsOverride = mkOption {
@@ -185,9 +245,9 @@ in
};
};
environment.gnome3.excludePackages = mkOption {
environment.gnome.excludePackages = mkOption {
default = [];
example = literalExample "[ pkgs.gnome3.totem ]";
example = literalExample "[ pkgs.gnome.totem ]";
type = types.listOf types.package;
description = "Which packages gnome should exclude from the default environment";
};
@@ -200,14 +260,14 @@ in
system.nixos-generate-config.desktopConfiguration = [''
# Enable the GNOME 3 Desktop Environment.
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true;
services.xserver.desktopManager.gnome.enable = true;
''];
services.gnome3.core-os-services.enable = true;
services.gnome3.core-shell.enable = true;
services.gnome3.core-utilities.enable = mkDefault true;
services.gnome.core-os-services.enable = true;
services.gnome.core-shell.enable = true;
services.gnome.core-utilities.enable = mkDefault true;
services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session.sessions ];
services.xserver.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ];
environment.extraInit = ''
${concatMapStrings (p: ''
@@ -229,30 +289,30 @@ in
# Override GSettings schemas
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
# If gnome3 is installed, build vim for gtk3 too.
# If gnome is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3";
# Install gnome-software if flatpak is enabled
services.flatpak.guiPackages = [
pkgs.gnome3.gnome-software
pkgs.gnome.gnome-software
];
})
(mkIf flashbackEnabled {
services.xserver.displayManager.sessionPackages = map
(wm: pkgs.gnome3.gnome-flashback.mkSessionForWm {
(wm: pkgs.gnome.gnome-flashback.mkSessionForWm {
inherit (wm) wmName wmLabel wmCommand;
}) (optional cfg.flashback.enableMetacity {
wmName = "metacity";
wmLabel = "Metacity";
wmCommand = "${pkgs.gnome3.metacity}/bin/metacity";
wmCommand = "${pkgs.gnome.metacity}/bin/metacity";
} ++ cfg.flashback.customSessions);
security.pam.services.gnome-flashback = {
enableGnomeKeyring = true;
};
systemd.packages = with pkgs.gnome3; [
systemd.packages = with pkgs.gnome; [
gnome-flashback
] ++ (map
(wm: gnome-flashback.mkSystemdTargetForWm {
@@ -260,9 +320,9 @@ in
}) cfg.flashback.customSessions);
# gnome-panel needs these for menu applet
environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gnome-flashback}/share" ];
environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ];
# TODO: switch to sessionVariables (resolve conflict)
environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome3.gnome-flashback}/etc/xdg" ];
environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ];
})
(mkIf serviceCfg.core-os-services.enable {
@@ -274,13 +334,13 @@ in
services.dleyna-renderer.enable = mkDefault true;
services.dleyna-server.enable = mkDefault true;
services.power-profiles-daemon.enable = mkDefault true;
services.gnome3.at-spi2-core.enable = true;
services.gnome3.evolution-data-server.enable = true;
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = mkDefault true;
services.gnome3.gnome-online-miners.enable = true;
services.gnome3.tracker-miners.enable = mkDefault true;
services.gnome3.tracker.enable = mkDefault true;
services.gnome.at-spi2-core.enable = true;
services.gnome.evolution-data-server.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gnome.gnome-online-accounts.enable = mkDefault true;
services.gnome.gnome-online-miners.enable = true;
services.gnome.tracker-miners.enable = mkDefault true;
services.gnome.tracker.enable = mkDefault true;
services.hardware.bolt.enable = mkDefault true;
services.packagekit.enable = mkDefault true;
services.udisks2.enable = true;
@@ -308,23 +368,23 @@ in
(mkIf serviceCfg.core-shell.enable {
services.colord.enable = mkDefault true;
services.gnome3.chrome-gnome-shell.enable = mkDefault true;
services.gnome3.glib-networking.enable = true;
services.gnome3.gnome-initial-setup.enable = mkDefault true;
services.gnome3.gnome-remote-desktop.enable = mkDefault true;
services.gnome3.gnome-settings-daemon.enable = true;
services.gnome3.gnome-user-share.enable = mkDefault true;
services.gnome3.rygel.enable = mkDefault true;
services.gnome.chrome-gnome-shell.enable = mkDefault true;
services.gnome.glib-networking.enable = true;
services.gnome.gnome-initial-setup.enable = mkDefault true;
services.gnome.gnome-remote-desktop.enable = mkDefault true;
services.gnome.gnome-settings-daemon.enable = true;
services.gnome.gnome-user-share.enable = mkDefault true;
services.gnome.rygel.enable = mkDefault true;
services.gvfs.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.telepathy.enable = mkDefault true;
systemd.packages = with pkgs.gnome3; [
systemd.packages = with pkgs.gnome; [
gnome-session
gnome-shell
];
services.udev.packages = with pkgs.gnome3; [
services.udev.packages = with pkgs.gnome; [
# Force enable KMS modifiers for devices that require them.
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
mutter
@@ -333,7 +393,7 @@ in
services.avahi.enable = mkDefault true;
xdg.portal.extraPortals = [
pkgs.gnome3.gnome-shell
pkgs.gnome.gnome-shell
];
services.geoclue2.enable = mkDefault true;
@@ -360,7 +420,7 @@ in
];
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = with pkgs.gnome3; [
environment.systemPackages = with pkgs.gnome; [
adwaita-icon-theme
gnome-backgrounds
gnome-bluetooth
@@ -386,12 +446,12 @@ in
# Enable soft realtime scheduling, only supported on wayland
(mkIf serviceCfg.experimental-features.realtime-scheduling {
security.wrappers.".gnome-shell-wrapped" = {
source = "${pkgs.gnome3.gnome-shell}/bin/.gnome-shell-wrapped";
source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped";
capabilities = "cap_sys_nice=ep";
};
systemd.user.services.gnome-shell-wayland = let
gnomeShellRT = with pkgs.gnome3; pkgs.runCommand "gnome-shell-rt" {} ''
gnomeShellRT = with pkgs.gnome; pkgs.runCommand "gnome-shell-rt" {} ''
mkdir -p $out/bin/
cp ${gnome-shell}/bin/gnome-shell $out/bin
sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell
@@ -406,7 +466,7 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst
(mkIf serviceCfg.core-utilities.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
environment.systemPackages = (with pkgs.gnome; removePackagesByName [
baobab
cheese
eog
@@ -430,19 +490,19 @@ in
simple-scan
totem
yelp
] config.environment.gnome3.excludePackages);
] config.environment.gnome.excludePackages);
# Enable default program modules
# Since some of these have a corresponding package, we only
# enable that program module if the package hasn't been excluded
# through `environment.gnome3.excludePackages`
programs.evince.enable = notExcluded pkgs.gnome3.evince;
programs.file-roller.enable = notExcluded pkgs.gnome3.file-roller;
programs.geary.enable = notExcluded pkgs.gnome3.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome3.gnome-disk-utility;
programs.gnome-terminal.enable = notExcluded pkgs.gnome3.gnome-terminal;
programs.seahorse.enable = notExcluded pkgs.gnome3.seahorse;
services.gnome3.sushi.enable = notExcluded pkgs.gnome3.sushi;
# through `environment.gnome.excludePackages`
programs.evince.enable = notExcluded pkgs.gnome.evince;
programs.file-roller.enable = notExcluded pkgs.gnome.file-roller;
programs.geary.enable = notExcluded pkgs.gnome.geary;
programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;
programs.gnome-terminal.enable = notExcluded pkgs.gnome.gnome-terminal;
programs.seahorse.enable = notExcluded pkgs.gnome.seahorse;
services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi;
# Let nautilus find extensions
# TODO: Create nautilus-with-extensions package
@@ -457,7 +517,7 @@ in
})
(mkIf serviceCfg.games.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
environment.systemPackages = (with pkgs.gnome; removePackagesByName [
aisleriot
atomix
five-or-more
@@ -477,12 +537,12 @@ in
quadrapassel
swell-foop
tali
] config.environment.gnome3.excludePackages);
] config.environment.gnome.excludePackages);
})
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst
(mkIf serviceCfg.core-developer-tools.enable {
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
environment.systemPackages = (with pkgs.gnome; removePackagesByName [
dconf-editor
devhelp
pkgs.gnome-builder
@@ -491,7 +551,7 @@ in
# in default configurations.
# https://github.com/NixOS/nixpkgs/issues/60908
/* gnome-boxes */
] config.environment.gnome3.excludePackages);
] config.environment.gnome.excludePackages);
services.sysprof.enable = true;
})
nixos/modules/services/x11/desktop-managers/lxqt.nix
+1 -1
View File
@@ -51,7 +51,7 @@ in
environment.systemPackages =
pkgs.lxqt.preRequisitePackages ++
pkgs.lxqt.corePackages ++
(pkgs.gnome3.removePackagesByName
(pkgs.gnome.removePackagesByName
pkgs.lxqt.optionalPackages
config.environment.lxqt.excludePackages);
nixos/modules/services/x11/desktop-managers/mate.nix
+3 -3
View File
@@ -76,7 +76,7 @@ in
environment.systemPackages =
pkgs.mate.basePackages ++
(pkgs.gnome3.removePackagesByName
(pkgs.gnome.removePackagesByName
pkgs.mate.extraPackages
config.environment.mate.excludePackages) ++
[
@@ -97,8 +97,8 @@ in
# Mate uses this for printing
programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.gnome3.at-spi2-core.enable = true;
services.gnome3.gnome-keyring.enable = true;
services.gnome.at-spi2-core.enable = true;
services.gnome.gnome-keyring.enable = true;
services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
services.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable;
nixos/modules/services/x11/desktop-managers/pantheon.nix
+12 -12
View File
@@ -43,7 +43,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.
@@ -142,12 +142,12 @@ in
];
services.pantheon.apps.enable = mkDefault true;
services.pantheon.contractor.enable = mkDefault true;
services.gnome3.at-spi2-core.enable = true;
services.gnome3.evolution-data-server.enable = true;
services.gnome3.glib-networking.enable = true;
services.gnome3.gnome-keyring.enable = true;
services.gnome.at-spi2-core.enable = true;
services.gnome.evolution-data-server.enable = true;
services.gnome.glib-networking.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gvfs.enable = true;
services.gnome3.rygel.enable = mkDefault true;
services.gnome.rygel.enable = mkDefault true;
services.gsignond.enable = mkDefault true;
services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
services.udisks2.enable = true;
@@ -177,7 +177,7 @@ in
desktop-file-utils
glib
gnome-menus
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gtk3.out
hicolor-icon-theme
lightlocker
@@ -213,10 +213,10 @@ in
elementary-settings-daemon
pantheon-agent-geoclue2
pantheon-agent-polkit
]) ++ (gnome3.removePackagesByName [
gnome3.geary
gnome3.epiphany
gnome3.gnome-font-viewer
]) ++ (gnome.removePackagesByName [
gnome.geary
gnome.epiphany
gnome.gnome-font-viewer
] config.environment.pantheon.excludePackages);
programs.evince.enable = mkDefault true;
@@ -265,7 +265,7 @@ in
})
(mkIf serviceCfg.apps.enable {
environment.systemPackages = (with pkgs.pantheon; pkgs.gnome3.removePackagesByName [
environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [
elementary-calculator
elementary-calendar
elementary-camera
nixos/modules/services/x11/desktop-managers/xfce.nix
+4 -4
View File
@@ -9,7 +9,7 @@ in
{
meta = {
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
imports = [
@@ -74,8 +74,8 @@ in
glib # for gsettings
gtk3.out # gtk-update-icon-cache
gnome3.gnome-themes-extra
gnome3.adwaita-icon-theme
gnome.gnome-themes-extra
gnome.adwaita-icon-theme
hicolor-icon-theme
tango-icon-theme
xfce4-icon-theme
@@ -149,7 +149,7 @@ in
security.polkit.enable = true;
services.accounts-daemon.enable = true;
services.upower.enable = config.powerManagement.enable;
services.gnome3.glib-networking.enable = true;
services.gnome.glib-networking.enable = true;
services.gvfs.enable = true;
services.tumbler.enable = true;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
nixos/modules/services/x11/display-managers/account-service-util.nix
+1 -1
View File
@@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication {
'';
meta = with lib; {
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
}
nixos/modules/services/x11/display-managers/gdm.nix
+5 -5
View File
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.xserver.displayManager;
gdm = pkgs.gnome3.gdm;
gdm = pkgs.gnome.gdm;
xSessionWrapper = if (cfg.setupCommands == "") then null else
pkgs.writeScript "gdm-x-session-wrapper" ''
@@ -154,14 +154,14 @@ in
] ++ optionals config.hardware.pulseaudio.enable [
"d /run/gdm/.config/pulse 0711 gdm gdm"
"L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
] ++ optionals config.services.gnome3.gnome-initial-setup.enable [
] ++ optionals config.services.gnome.gnome-initial-setup.enable [
# Create stamp file for gnome-initial-setup to prevent it starting in GDM.
"f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
];
# Otherwise GDM will not be able to start correctly and display Wayland sessions
systemd.packages = with pkgs.gnome3; [ gdm gnome-session gnome-shell ];
environment.systemPackages = [ pkgs.gnome3.adwaita-icon-theme ];
systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ];
environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ];
systemd.services.display-manager.wants = [
# Because sd_login_monitor_new requires /run/systemd/machines
@@ -208,7 +208,7 @@ in
EnvironmentFile = "-/etc/locale.conf";
};
systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];
systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ];
# Allow choosing an user account
services.accounts-daemon.enable = true;
nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
+2 -2
View File
@@ -34,8 +34,8 @@ in {
theme = {
package = mkOption {
type = types.package;
default = pkgs.gnome3.gnome-themes-extra;
defaultText = "pkgs.gnome3.gnome-themes-extra";
default = pkgs.gnome.gnome-themes-extra;
defaultText = "pkgs.gnome.gnome-themes-extra";
description = ''
The package path that contains the theme given in the name option.
'';
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+6 -6
View File
@@ -47,8 +47,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.gnome3.gnome-themes-extra;
defaultText = "pkgs.gnome3.gnome-themes-extra";
default = pkgs.gnome.gnome-themes-extra;
defaultText = "pkgs.gnome.gnome-themes-extra";
description = ''
The package path that contains the theme given in the name option.
'';
@@ -68,8 +68,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.gnome3.adwaita-icon-theme;
defaultText = "pkgs.gnome3.adwaita-icon-theme";
default = pkgs.gnome.adwaita-icon-theme;
defaultText = "pkgs.gnome.adwaita-icon-theme";
description = ''
The package path that contains the icon theme given in the name option.
'';
@@ -89,8 +89,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.gnome3.adwaita-icon-theme;
defaultText = "pkgs.gnome3.adwaita-icon-theme";
default = pkgs.gnome.adwaita-icon-theme;
defaultText = "pkgs.gnome.adwaita-icon-theme";
description = ''
The package path that contains the cursor theme given in the name option.
'';
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+1 -1
View File
@@ -11,7 +11,7 @@ let
in
{
meta = {
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
options = {
nixos/modules/services/x11/display-managers/lightdm.nix
+1 -1
View File
@@ -70,7 +70,7 @@ let
in
{
meta = {
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
};
# Note: the order in which lightdm greeter modules are imported
nixos/modules/services/x11/window-managers/metacity.nix
+3 -3
View File
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.xserver.windowManager.metacity;
inherit (pkgs) gnome3;
inherit (pkgs) gnome;
in
{
@@ -18,12 +18,12 @@ in
services.xserver.windowManager.session = singleton
{ name = "metacity";
start = ''
${gnome3.metacity}/bin/metacity &
${gnome.metacity}/bin/metacity &
waitPID=$!
'';
};
environment.systemPackages = [ gnome3.metacity ];
environment.systemPackages = [ gnome.metacity ];
};