diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-06 10:25:58 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-06 10:25:58 +0200 |
| commit | 692d219a9312fbe3f8b34858a7ca0e32fb72bd07 (patch) | |
| tree | 4c0f5e46b2cf639e71acb43990697d769a969d2c /nixos/modules/services/x11/xserver.nix | |
| parent | c1a0aa7eb73f86b0224a57671752673befe08953 (diff) | |
| parent | 82390e264704e4e1bf1652c9bebdc30a48f7fd07 (diff) | |
| download | nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.gz nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.bz2 nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.lz nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.xz nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.tar.zst nixpkgs-692d219a9312fbe3f8b34858a7ca0e32fb72bd07.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index d3404949935..70716a35485 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -136,6 +136,7 @@ let fi done + echo '${cfg.filesSection}' >> $out echo 'EndSection' >> $out echo "$config" >> $out @@ -361,6 +362,13 @@ in ''; }; + filesSection = mkOption { + type = types.lines; + default = ""; + example = ''FontPath "/path/to/my/fonts"''; + description = "Contents of the first <literal>Files</literal> section of the X server configuration file."; + }; + deviceSection = mkOption { type = types.lines; default = ""; |