summary refs log tree commit diff
path: root/nixos/modules/services/x11/extra-layouts.nix
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2019-09-08 14:51:23 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2019-09-08 14:51:23 +0200
commite57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50 (patch)
tree3be049f6513fb70385852d17b7443f6075986587 /nixos/modules/services/x11/extra-layouts.nix
parent3b5b9a73f59ff93d50156e250203410bdd07f4e0 (diff)
downloadnixpkgs-e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50.tar
nixpkgs-e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50.tar.gz
nixpkgs-e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50.tar.bz2
nixpkgs-e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50.tar.lz
nixpkgs-e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50.tar.xz
nixpkgs-e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50.tar.zst
nixpkgs-e57c0f3bf9625d0cf6f4b0c3cf65aa086d3f8a50.zip
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.
Diffstat (limited to 'nixos/modules/services/x11/extra-layouts.nix')
-rw-r--r--nixos/modules/services/x11/extra-layouts.nix5
1 files changed, 4 insertions, 1 deletions
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;
+    };
 
   };