movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge branch 'staging-next' into staging

Browse source
This commit is contained in:
Vladimír Čunát 2020-10-25 09:47:04 +01:00
commit 2f6b00b15e
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
418 changed files with 7056 additions and 3808 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -180,6 +180,14 @@ in
config = mkMerge [
(mkIf (cfg.enable || flashbackEnabled) {
# Seed our configuration into nixos-generate-config
system.nixos-generate-config.desktopConfiguration = ''
# Enable the GNOME 3 Desktop Environment.
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome3.enable = true;
'';
services.gnome3.core-os-services.enable = true;
services.gnome3.core-shell.enable = true;
services.gnome3.core-utilities.enable = mkDefault true;

8
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -184,6 +184,14 @@ in
config = mkMerge [
(mkIf cfg.enable {
# Seed our configuration into nixos-generate-config
system.nixos-generate-config.desktopConfiguration = ''
# Enable the Plasma 5 Desktop Environment.
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
'';
services.xserver.desktopManager.session = singleton {
name = "plasma5";
bgSupport = true;