diff options
author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-09-20 18:41:15 -0400 |
---|---|---|
committer | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-09-20 18:41:15 -0400 |
commit | 34aaac6d7c9c173728cad610f3798481d5df94d6 (patch) | |
tree | 8c3bf1e003592ef94d5b9c7d16f72ce0785e6450 /nixos/modules/services/x11/xserver.nix | |
parent | 0cc9dd7c16ea3db534274225617c22160eca4311 (diff) | |
parent | a930a6d7ee5004001f74a8dbd786d5253acbf160 (diff) | |
download | nixpkgs-34aaac6d7c9c173728cad610f3798481d5df94d6.tar nixpkgs-34aaac6d7c9c173728cad610f3798481d5df94d6.tar.gz nixpkgs-34aaac6d7c9c173728cad610f3798481d5df94d6.tar.bz2 nixpkgs-34aaac6d7c9c173728cad610f3798481d5df94d6.tar.lz nixpkgs-34aaac6d7c9c173728cad610f3798481d5df94d6.tar.xz nixpkgs-34aaac6d7c9c173728cad610f3798481d5df94d6.tar.zst nixpkgs-34aaac6d7c9c173728cad610f3798481d5df94d6.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
-rw-r--r-- | nixos/modules/services/x11/xserver.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 914063842c9..d3404949935 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -113,14 +113,14 @@ let in concatMapStrings (getAttr "value") monitors; configFile = pkgs.runCommand "xserver.conf" - { xfs = optionalString (cfg.useXFS != false) - ''FontPath "${toString cfg.useXFS}"''; + { fontpath = optionalString (cfg.fontPath != null) + ''FontPath "${cfg.fontPath}"''; inherit (cfg) config; preferLocalBuild = true; } '' echo 'Section "Files"' >> $out - echo $xfs >> $out + echo $fontpath >> $out for i in ${toString fontsForXServer}; do if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then @@ -154,6 +154,8 @@ in (mkRemovedOptionModule [ "services" "xserver" "startDbusSession" ] "The user D-Bus session is now always socket activated and this option can safely be removed.") + (mkRemovedOptionModule ["services" "xserver" "useXFS" ] + "Use services.xserver.fontPath instead of useXFS") ]; @@ -476,11 +478,15 @@ in description = "Default colour depth."; }; - useXFS = mkOption { - # FIXME: what's the type of this option? - default = false; + fontPath = mkOption { + type = types.nullOr types.str; + default = null; example = "unix/:7100"; - description = "Determines how to connect to the X Font Server."; + description = '' + Set the X server FontPath. Defaults to null, which + means the compiled in defaults will be used. See + man xorg.conf for details. + ''; }; tty = mkOption { |