about summary refs log tree commit diff
path: root/modules/user/aszlig/profiles/workstation
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2020-02-10 06:58:22 +0100
committeraszlig <aszlig@nix.build>2020-02-10 06:58:22 +0100
commit5fd9de0f19386dad14ea24d5d04ba1ebd554f624 (patch)
tree442aa5a76a03adf520c05ed0ea34cd94c7a64363 /modules/user/aszlig/profiles/workstation
parent67e921d264c7832ac97e39ef73df760a20ad2b47 (diff)
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
Diffstat (limited to 'modules/user/aszlig/profiles/workstation')
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix4
1 files changed, 1 insertions, 3 deletions
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;
       };
     };