diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 05:54:01 -0600 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 05:54:01 -0600 |
| commit | 6777e6f812913f0213b71392bf2499a3e49b8dee (patch) | |
| tree | 1870777ba0d1ba0be8a66fd94d6c070b62729cdf /nixos/modules/services/x11 | |
| parent | c5f1f9a3b5bcf5d2990aba0ab086767d1d384922 (diff) | |
| parent | 82bcfef109ecf58ac1503e4cab15ae53dd524f4b (diff) | |
| download | nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.gz nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.bz2 nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.lz nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.xz nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.zst nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.zip | |
Merging with upstream
Diffstat (limited to 'nixos/modules/services/x11')
4 files changed, 12 insertions, 29 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 77050bcb23f..9b4caafe3b3 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -63,11 +63,8 @@ in }]; security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset"; - - environment.etc = singleton - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - target = "X11/xkb"; - }; + + services.xserver.exportConfiguration = true; fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 25ae75592c9..f810ffdfbb3 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -177,10 +177,7 @@ in GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; }; - environment.etc = singleton - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - target = "X11/xkb"; - }; + services.xserver.exportConfiguration = true; # Enable helpful DBus services. services.udisks2.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 00fdfedbc7b..5874e080fd8 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -188,10 +188,7 @@ in environment.pathsToLink = [ "/share" ]; - environment.etc = singleton { - source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - target = "X11/xkb"; - }; + services.xserver.exportConfiguration = true; environment.variables = { diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f5ed5233818..8617a5fab03 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -465,23 +465,15 @@ in } ]; - environment.etc = - (optionals cfg.exportConfiguration - [ { source = "${configFile}"; - target = "X11/xorg.conf"; - } - # -xkbdir command line option does not seems to be passed to xkbcomp. - { source = "${cfg.xkbDir}"; - target = "X11/xkb"; - } - ]) + environment.etc = mkMerge [ + (mkIf cfg.exportConfiguration { + "X11/xorg.conf".source = configFile; + "X11/xkb".source = cfg.xkbDir; + }) # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5 - ++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in - [{ - source = xorg.xf86inputevdev.out + "/share" + cfgPath; - target = cfgPath; - }] - ); + (let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in + { "${cfgPath}".source = xorg.xf86inputevdev.out + "/share" + cfgPath; }) + ]; environment.systemPackages = [ xorg.xorgserver.out |