diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-10-24 11:35:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 11:35:33 -0400 |
| commit | ef803ab1bba31f16183b756c206916f85b1a4a34 (patch) | |
| tree | ea9c78da2ef1d2c2d3ac465ce4c421bbee62e4fd /nixos/modules/services/x11 | |
| parent | 7ecdf141d2cac7ead207c0d0a65613a4dc8463d8 (diff) | |
| parent | 99d511124620cad08e1bac2c0ca29ea3222d7f5d (diff) | |
Merge pull request #100199 from worldofpeace/seeded-config
nixos/tools: add desktopConfiguration option (to seed configuration into configuration.nix)
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index acccbdb9950a..97eb74991abf 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -179,6 +179,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; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index e48b5f23b58f..ad0385ddeed2 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -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; |