summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorBenjamin Staffin <benley@gmail.com>2017-03-18 17:51:11 -0400
committerBenjamin Staffin <benley@gmail.com>2017-03-18 17:56:38 -0400
commitb79c28495213ce8b8038d7b85ac5ba850b378dc6 (patch)
tree9ad113aa98212904ef7503d5abbffc26905687c6 /nixos/modules/services
parent7960739f8616f5eb708de7c0badc714af3b08147 (diff)
downloadnixlib-b79c28495213ce8b8038d7b85ac5ba850b378dc6.tar
nixlib-b79c28495213ce8b8038d7b85ac5ba850b378dc6.tar.gz
nixlib-b79c28495213ce8b8038d7b85ac5ba850b378dc6.tar.bz2
nixlib-b79c28495213ce8b8038d7b85ac5ba850b378dc6.tar.lz
nixlib-b79c28495213ce8b8038d7b85ac5ba850b378dc6.tar.xz
nixlib-b79c28495213ce8b8038d7b85ac5ba850b378dc6.tar.zst
nixlib-b79c28495213ce8b8038d7b85ac5ba850b378dc6.zip
nixos: Use xkbDir consistently so it has an effect
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/x11/desktop-managers/enlightenment.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/plasma5.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 38e24e9b709a..b02eaf861a0d 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -64,7 +64,7 @@ in
     security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset";
 
     environment.etc = singleton
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+      { source = xcfg.xkbDir;
         target = "X11/xkb";
       };
 
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index bc6e728169b4..993002a57795 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -176,7 +176,7 @@ in
       environment.pathsToLink = [ "/share" ];
 
       environment.etc = singleton {
-        source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        source = xcfg.xkbDir;
         target = "X11/xkb";
       };