diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2021-02-13 18:45:27 -0500 |
|---|---|---|
| committer | WORLDofPEACE <worldofpeace@protonmail.ch> | 2021-02-13 18:45:27 -0500 |
| commit | 94f0210e60f08640cf8a6392545b4678ffe44218 (patch) | |
| tree | 62b4ba67a1fdbfd44d3777d2952772a6420441aa /nixos/modules/services/x11 | |
| parent | edf3a8376e51458cb44fa282a372fec9517761c3 (diff) | |
| download | nixpkgs-94f0210e60f08640cf8a6392545b4678ffe44218.tar nixpkgs-94f0210e60f08640cf8a6392545b4678ffe44218.tar.gz nixpkgs-94f0210e60f08640cf8a6392545b4678ffe44218.tar.bz2 nixpkgs-94f0210e60f08640cf8a6392545b4678ffe44218.tar.lz nixpkgs-94f0210e60f08640cf8a6392545b4678ffe44218.tar.xz nixpkgs-94f0210e60f08640cf8a6392545b4678ffe44218.tar.zst nixpkgs-94f0210e60f08640cf8a6392545b4678ffe44218.zip | |
nixos/tools: make desktopConfiguation types.listOf types.lines
This fixes #108124.
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 671301246a8..dea45729947 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -197,12 +197,12 @@ in config = mkMerge [ (mkIf (cfg.enable || flashbackEnabled) { # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = '' + 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; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index d6cf86d3a2e..5ca2e69faf0 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -184,12 +184,12 @@ in config = mkMerge [ (mkIf cfg.enable { # Seed our configuration into nixos-generate-config - system.nixos-generate-config.desktopConfiguration = '' + 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"; |