summary refs log tree commit diff
path: root/nixos/modules/services/x11/terminal-server.nix
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-02-09 21:25:03 -0500
committerGraham Christensen <graham@grahamc.com>2017-02-09 21:52:00 -0500
commitb12564cc1b8319b317d98df03fec8ba4bbf71877 (patch)
treec0a656ef4db5d571760b9d4265c4d57ba425d7c6 /nixos/modules/services/x11/terminal-server.nix
parent400048926602dfe559207123267b183ac7e97c6b (diff)
downloadnixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar
nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.gz
nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.bz2
nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.lz
nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.xz
nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.tar.zst
nixpkgs-b12564cc1b8319b317d98df03fec8ba4bbf71877.zip
nixos: update default cases from KDM/KDE4 to SDDM/KDE5
Diffstat (limited to 'nixos/modules/services/x11/terminal-server.nix')
-rw-r--r--nixos/modules/services/x11/terminal-server.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index 785394d9648..09a7f386876 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -16,18 +16,8 @@ with lib;
     services.xserver.enable = true;
     services.xserver.videoDrivers = [];
 
-    # Enable KDM.  Any display manager will do as long as it supports XDMCP.
-    services.xserver.displayManager.kdm.enable = true;
-    services.xserver.displayManager.kdm.enableXDMCP = true;
-    services.xserver.displayManager.kdm.extraConfig =
-      ''
-        [General]
-        # We're headless, so don't bother starting an X server.
-        StaticServers=
-
-        [Xdmcp]
-        Xaccess=${pkgs.writeText "Xaccess" "localhost"}
-      '';
+    # Enable GDM.  Any display manager will do as long as it supports XDMCP.
+    services.xserver.displayManager.gdm.enable = true;
 
     systemd.sockets.terminal-server =
       { description = "Terminal Server Socket";