From 3b1ac4f78d21802073c82df39ca7080ae70a67a9 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 8 Feb 2022 19:58:38 -0800 Subject: desktop: install sound and xserver only when asked --- modules/desktop/xserver.nix | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'modules/desktop/xserver.nix') diff --git a/modules/desktop/xserver.nix b/modules/desktop/xserver.nix index 894b39b..d007bd8 100644 --- a/modules/desktop/xserver.nix +++ b/modules/desktop/xserver.nix @@ -1,26 +1,31 @@ { config, pkgs, lib, ... }: +with lib; -{ - services.xserver = { - enable = true; - layout = "us"; - xkbOptions = "eurosign:e"; - libinput.enable = true; +let + xorg = (elem "xorg" config.sys.graphics.desktopProtocols); +in { + config= mkIf xorg { + services.xserver = { + enable = true; + layout = "us"; + xkbOptions = "eurosign:e"; + libinput.enable = true; - desktopManager = { - xterm.enable = false; - }; + desktopManager = { + xterm.enable = false; + }; - displayManager = { - lightdm.enable = true; - defaultSession = "none+i3"; - }; + displayManager = { + lightdm.enable = true; + defaultSession = "none+i3"; + }; - windowManager = { - i3.enable = true; + windowManager = { + i3.enable = true; + }; }; - }; - services.gnome.gnome-keyring.enable = true; - services.gvfs.enable = true; + services.gnome.gnome-keyring.enable = true; + services.gvfs.enable = true; + }; } -- cgit v1.2.3