treewide: Switch to displayManager.defaultSession

The option services.xserver.desktopManager.default and
services.xserver.windowManager.default are deprecated since quite a
while[1], so let's use the displayManager.defaultSession option instead.

Additionally, there no longer is any need to explicitly disable the
"xterm" desktopManager, so I removed that option as well.

[1]: https://github.com/NixOS/nixpkgs/commit/8dc5ff7dcfd1c58c32004ffae25

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @devhell

1 files changed, 4 insertions, 8 deletions

diff --git a/modules/user/devhell/profiles/services.nix b/modules/user/devhell/profiles/services.nix
index 922a00c4..321d052f 100644
--- a/modules/user/devhell/profiles/services.nix
+++ b/modules/user/devhell/profiles/services.nix
@@ -44,6 +44,7 @@ in {
 
 
     services.xserver = {
+      displayManager.defaultSession = "none+i3";
       displayManager.lightdm = {
         enable = true;
         greeters.mini = {
@@ -63,16 +64,11 @@ in {
           '';
         };
       };
-      desktopManager.xterm.enable = false;
-      desktopManager.default = "none";
     };
 
-    services.xserver.windowManager = {
-      default = "i3";
-      i3 = {
-        enable = true;
-        package = pkgs.i3-gaps;
-      };
+    services.xserver.windowManager.i3 = {
+      enable = true;
+      package = pkgs.i3-gaps;
     };
 
     services.journald.extraConfig = ''