Unverified Commit 0ba80a0f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #315120 from eclairevoyant/revert-steam-fonts

[24.05] Revert "nixos/steam: add option fontPackages"
parents c5ddb6cb 8ed61d15
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -100,18 +100,6 @@ in {
      '';
    };

    fontPackages = lib.mkOption {
      type = lib.types.listOf lib.types.package;
      default = config.fonts.packages;
      defaultText = lib.literalExpression "fonts.packages";
      example = lib.literalExpression "with pkgs; [ source-han-sans ]";
      description = ''
        Font packages to use in Steam.

        Defaults to system fonts, but could be overridden to use other fonts — useful for users who would like to customize CJK fonts used in Steam. According to the [upstream issue](https://github.com/ValveSoftware/steam-for-linux/issues/10422#issuecomment-1944396010), Steam only follows the per-user fontconfig configuration.
      '';
    };

    remotePlay.openFirewall = lib.mkOption {
      type = lib.types.bool;
      default = false;
@@ -184,8 +172,6 @@ in {
      };
    };

    programs.steam.extraPackages = cfg.fontPackages;

    programs.gamescope.enable = lib.mkDefault cfg.gamescopeSession.enable;
    services.displayManager.sessionPackages = lib.mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ];