Unverified Commit 769012e1 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 368809e0 2a49ffd1

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -8268,6 +8268,12 @@ 
    githubId = 16481032;

    name = "Kiba Fox";

  };

  kidanger = {

    email = "angerj.dev@gmail.com";

    github = "kidanger";

    githubId = 297479;

    name = "Jérémy Anger";

  };

  kidd = {

    email = "raimonster@gmail.com";

    github = "kidd";

nixos/modules/services/databases/clickhouse.nix

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ with lib; 
      after = [ "network.target" ];



      serviceConfig = {

        Type = "notify";

        User = "clickhouse";

        Group = "clickhouse";

        ConfigurationDirectory = "clickhouse-server";
@@ -55,6 +56,12 @@ with lib; 
        StateDirectory = "clickhouse";

        LogsDirectory = "clickhouse";

        ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml";

        TimeoutStartSec = "infinity";

      };



      environment = {

        # Switching off watchdog is very important for sd_notify to work correctly.

        CLICKHOUSE_WATCHDOG_ENABLE = "0";

      };

    };

nixos/modules/services/hardware/openrgb.nix

+3 −2
Original line number Diff line number Diff line
@@ -34,14 +34,15 @@ in { 
    services.udev.packages = [ cfg.package ];



    boot.kernelModules = [ "i2c-dev" ]

     ++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix" ]

     ++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix4" ]

     ++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ];



    systemd.services.openrgb = {

      description = "OpenRGB server daemon";

      wantedBy = [ "multi-user.target" ];



      serviceConfig = {

        StateDirectory = "OpenRGB";

        WorkingDirectory = "/var/lib/OpenRGB";

        ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}";

        Restart = "always";

      };

nixos/modules/services/misc/nitter.nix

+27 −6
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ let 
  '';

in

{

  imports = [

    # https://github.com/zedeus/nitter/pull/772

    (mkRemovedOptionModule [ "services" "nitter" "replaceInstagram" ] "Nitter no longer supports this option as Bibliogram has been discontinued.")

  ];



  options = {

    services.nitter = {

      enable = mkEnableOption (lib.mdDoc "Nitter");
@@ -155,6 +160,22 @@ in 
          description = lib.mdDoc "Use base64 encoding for proxied media URLs.";

        };



        enableRSS = mkEnableOption (lib.mdDoc "RSS feeds") // { default = true; };



        enableDebug = mkEnableOption (lib.mdDoc "request logs and debug endpoints");



        proxy = mkOption {

          type = types.nullOr types.str;

          default = null;

          description = lib.mdDoc "URL to a HTTP/HTTPS proxy.";

        };



        proxyAuth = mkOption {

          type = types.nullOr types.str;

          default = null;

          description = lib.mdDoc "Credentials for proxy.";

        };



        tokenCount = mkOption {

          type = types.int;

          default = 10;
@@ -192,12 +213,6 @@ in 
          description = lib.mdDoc "Replace Reddit links with links to this instance (blank to disable).";

        };



        replaceInstagram = mkOption {

          type = types.str;

          default = "";

          description = lib.mdDoc "Replace Instagram links with links to this instance (blank to disable).";

        };



        mp4Playback = mkOption {

          type = types.bool;

          default = true;
@@ -275,6 +290,12 @@ in 
          default = false;

          description = lib.mdDoc "Hide tweet replies.";

        };



        squareAvatars = mkOption {

          type = types.bool;

          default = false;

          description = lib.mdDoc "Square profile pictures.";

        };

      };



      settings = mkOption {

nixos/modules/services/networking/syncthing.nix

+3 −1
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ let 
      else

        device

    ) folder.devices;

  }) cfg.settings.folders;

  }) (filterAttrs (_: folder:

    folder.enable

  ) cfg.settings.folders);



  updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''

    set -efu