diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-02-09 21:25:03 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-02-09 21:52:00 -0500 |
| commit | b12564cc1b8319b317d98df03fec8ba4bbf71877 (patch) | |
| tree | c0a656ef4db5d571760b9d4265c4d57ba425d7c6 /nixos/modules/services | |
| parent | 400048926602dfe559207123267b183ac7e97c6b (diff) | |
| download | nixpkgs-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')
| -rw-r--r-- | nixos/modules/services/hardware/bluetooth.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/terminal-server.nix | 14 |
3 files changed, 4 insertions, 14 deletions
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index f6cf2d01d80..ef2fce613f2 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -22,7 +22,7 @@ in }; ###### implementation - + config = mkIf config.hardware.bluetooth.enable { environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c0daf30d04e..98d2d0ea834 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -1,5 +1,5 @@ # This module declares the options to define a *display manager*, the -# program responsible for handling X logins (such as xdm, kdm, gdb, or +# program responsible for handling X logins (such as xdm, gdb, or # SLiM). The display manager allows the user to select a *session # type*. When the user logs in, the display manager starts the # *session script* ("xsession" below) to launch the selected session 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"; |