From 24f3abdafbf0a4840d63baa91e60ba34fad00d4d Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 30 Jan 2017 14:03:42 +0100 Subject: Revert "Make services.xserver.xkbDir conflict free when overriden." This reverts commit 82bcfef109ecf58ac1503e4cab15ae53dd524f4b. cc @nbp Fixes #22290, #22352. Signed-off-by: Franz Pletz --- nixos/modules/services/x11/desktop-managers/enlightenment.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nixos/modules/services/x11/desktop-managers/enlightenment.nix') diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 615504bab15..7ea8b30d23d 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -64,7 +64,10 @@ in security.setuidPrograms = [ "e_freqset" ]; - services.xserver.exportConfiguration = true; + environment.etc = singleton + { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + target = "X11/xkb"; + }; fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; -- cgit 1.4.1