diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2019-09-14 19:51:29 +0200 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-06 10:39:18 -0500 |
| commit | 1d61efb7f177f7b70c467ab4940fde0a3481d4dc (patch) | |
| tree | 860cce85acd87bc07aa2d11f4feac5d0df48a5c0 /nixos/modules/services/x11/xserver.nix | |
| parent | 6bd13ccd8e7fd1f241eb655f7112df1ed2889a3a (diff) | |
| download | nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.gz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.bz2 nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.lz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.xz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.zst nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.zip | |
treewide: use attrs instead of list for types.loaOf options
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 3a9b70c0673..7029919170a 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -590,19 +590,15 @@ in ]; environment.etc = - (optionals cfg.exportConfiguration - [ { source = "${configFile}"; - target = "X11/xorg.conf"; - } + (optionalAttrs cfg.exportConfiguration + { + "X11/xorg.conf".source = "${configFile}"; # -xkbdir command line option does not seems to be passed to xkbcomp. - { source = "${cfg.xkbDir}"; - target = "X11/xkb"; - } - ]) + "X11/xkb".source = "${cfg.xkbDir}"; + }) # localectl looks into 00-keyboard.conf - ++ [ - { - text = '' + //{ + "X11/xorg.conf.d/00-keyboard.conf".text = '' Section "InputClass" Identifier "Keyboard catchall" MatchIsKeyboard "on" @@ -612,16 +608,12 @@ in Option "XkbVariant" "${cfg.xkbVariant}" EndSection ''; - target = "X11/xorg.conf.d/00-keyboard.conf"; } - ] # 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 |