diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-22 22:28:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-22 22:28:39 +0200 |
| commit | b9045a7d9651a2f8a0bbc8c86cd72f970e951068 (patch) | |
| tree | 75ee378fba0bae606e350cb145c2589636a2c660 /nixos | |
| parent | 402688b752a4b2c5548a1d07aed4fbbde2b55e87 (diff) | |
| parent | adc2edd5cf524239690b5cf49779a11fd2eb061b (diff) | |
| download | nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.gz nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.bz2 nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.lz nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.xz nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.zst nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.zip | |
Merge branch 'x-updates' into staging
...in preparation for a merge to master
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 991c68471a67..c62beca60d84 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -17,7 +17,10 @@ in # Note: the order in which desktop manager modules are imported here # determines the default: later modules (if enabled) are preferred. # E.g., if KDE is enabled, it supersedes xterm. - imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix ]; + imports = [ + ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix + ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix + ]; options = { |