From 5fd9de0f19386dad14ea24d5d04ba1ebd554f624 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 10 Feb 2020 06:58:22 +0100
Subject: 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
---
 modules/user/aszlig/profiles/managed.nix             |  3 +--
 modules/user/aszlig/profiles/workstation/default.nix |  4 +---
 modules/user/aszlig/services/i3/default.nix          |  2 --
 modules/user/devhell/profiles/services.nix           | 12 ++++--------
 4 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'modules')

diff --git a/modules/user/aszlig/profiles/managed.nix b/modules/user/aszlig/profiles/managed.nix
index 2f9d0def..92566e04 100644
--- a/modules/user/aszlig/profiles/managed.nix
+++ b/modules/user/aszlig/profiles/managed.nix
@@ -71,9 +71,8 @@ in {
     services.xserver.layout = "de";
     services.xserver.xkbOptions = lib.mkOverride 900 "eurosign:e";
     services.xserver.displayManager.sddm.enable = true;
-    services.xserver.desktopManager.default = "plasma5";
+    services.xserver.displayManager.defaultSession = "plasma5";
     services.xserver.desktopManager.plasma5.enable = true;
-    services.xserver.desktopManager.xterm.enable = false;
 
     # And also most common scanners are also HP ones.
     hardware.sane.enable = true;
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index ce2e661c..4e4ea876 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -160,6 +160,7 @@ in {
         layout = "dvorak";
 
         displayManager.lightdm.enable = true;
+        displayManager.defaultSession = "none+i3";
         displayManager.sessionCommands = ''
           ${pkgs.xorg.xrdb}/bin/xrdb "${pkgs.writeText "xrdb.config" ''
             XTerm*font:                vga
@@ -172,9 +173,6 @@ in {
             XTerm*ptyInitialErase:     true
           ''}"
         '';
-
-        desktopManager.default = "none";
-        desktopManager.xterm.enable = false;
       };
     };
 
diff --git a/modules/user/aszlig/services/i3/default.nix b/modules/user/aszlig/services/i3/default.nix
index 34767e38..733541ee 100644
--- a/modules/user/aszlig/services/i3/default.nix
+++ b/modules/user/aszlig/services/i3/default.nix
@@ -107,8 +107,6 @@ in
     vuizvui.user.aszlig.services.i3.workspaces = defaultWorkspaces;
 
     services.xserver.windowManager = {
-      default = "i3";
-
       i3.enable = true;
       i3.configFile = pkgs.substituteAll {
         name = "i3.conf";
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 = ''
-- 
cgit 1.4.1