From e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 8 Sep 2019 14:51:23 +0200
Subject: [PATCH] nixos/xserver: export configuration with startx and extra
 layouts

If the X server is run manually it must be started with an `-xkbdir` argument
pointing to the custom xkb directory. So we export it to /etc/X11/xkb.
---
 nixos/modules/services/x11/extra-layouts.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix
index 5523dd2bf02..1af98a1318b 100644
--- a/nixos/modules/services/x11/extra-layouts.nix
+++ b/nixos/modules/services/x11/extra-layouts.nix
@@ -158,7 +158,10 @@ in
 
     });
 
-    services.xserver.xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb";
+    services.xserver = {
+      xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb";
+      exportConfiguration = config.services.xserver.displayManager.startx.enable;
+    };
 
   };