Unverified Commit 3e279210 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 6a50bc92 817d55f7
Loading
Loading
Loading
Loading
+23 −0
Original line number Diff line number Diff line
@@ -7822,6 +7822,13 @@
    githubId = 18535642;
    name = "Emily";
  };
  emily-lavender = {
    email = "emily@foggy.city";
    github = "emily-lavender";
    githubId = 253398252;
    name = "Emily Lavender";
    keys = [ { fingerprint = "3572 DE50 D71C 7DD7 1B48 8831 A7EF 615A 2AB9 1EE7"; } ];
  };
  emilylange = {
    email = "nix@emilylange.de";
    github = "emilylange";
@@ -9929,6 +9936,11 @@
    githubId = 6179496;
    name = "Grayson Head";
  };
  graysontinker = {
    github = "GraysonTinker";
    githubId = 146041509;
    name = "Grayson Tinker";
  };
  greaka = {
    email = "git@greaka.de";
    github = "greaka";
@@ -17299,6 +17311,12 @@
    githubId = 96200;
    name = "Jörg Thalheim";
  };
  michael-k-williams = {
    name = "Michael Williams";
    email = "michael.williams@brighter-applications.com";
    github = "Michael-K-Williams";
    githubId = 74472864;
  };
  michaeladler = {
    email = "therisen06@gmail.com";
    github = "michaeladler";
@@ -22207,6 +22225,11 @@
    github = "randomdude16671";
    githubId = 210965013;
  };
  randomizedcoder = {
    name = "randomizedcoder";
    github = "randomizedcoder";
    githubId = 64496590;
  };
  randoneering = {
    name = "randoneering";
    email = "justin@randoneering.tech";
+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@

- [DankMaterialShell](https://danklinux.com), a complete desktop shell for Wayland compositors built with Quickshell. Available as [programs.dms-shell](#opt-programs.dms-shell.enable).

- [pyroscope](https://github.com/grafana/pyroscope), a continuous profiling platform. that allows for performance debugging. Available as [services.pyroscope](#opt-services.pyroscope.enable)

- [dms-greeter](https://danklinux.com), a modern display manager greeter for DankMaterialShell that works with greetd and supports multiple Wayland compositors. Available as [services.displayManager.dms-greeter](#opt-services.displayManager.dms-greeter.enable).

- [dsearch](https://github.com/AvengeMedia/danksearch), a fast filesystem search service with fuzzy matching. Available as [programs.dsearch](#opt-programs.dsearch.enable).
+2 −2
Original line number Diff line number Diff line
@@ -384,8 +384,8 @@ let
          description = ''
            The full path to a file that contains the hash of the user's
            password. The password file is read on each system activation. The
            file should contain exactly one line, which should be the password in
            an encrypted form that is suitable for the `chpasswd -e` command.
            file should contain exactly one line, the salted password hash
            produced by `mkpasswd`.

            ${passwordDescription}
          '';
+1 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,7 @@
  ./services/monitoring/prometheus/pushgateway.nix
  ./services/monitoring/prometheus/sachet.nix
  ./services/monitoring/prometheus/xmpp-alerts.nix
  ./services/monitoring/pyroscope.nix
  ./services/monitoring/riemann-dash.nix
  ./services/monitoring/riemann-tools.nix
  ./services/monitoring/riemann.nix
+13 −4
Original line number Diff line number Diff line
@@ -23,6 +23,17 @@
    serviceMode = lib.mkEnableOption "Service Mode";
    tunMode = lib.mkEnableOption "Setcap for TUN Mode. DNS settings won't work on this way";
    autoStart = lib.mkEnableOption "Clash Verge auto launch";
    group = lib.mkOption {
      type = lib.types.str;
      example = "wheel";
      default = "users";
      description = ''
        The group to grant access to clash-verge-rev's service socket.

        For better security, you should set a group that only contains
        users who need to access clash-verge-rev's service socket.
      '';
    };
  };

  config =
@@ -54,6 +65,7 @@
        serviceConfig = {
          ExecStart = "${cfg.package}/bin/clash-verge-service";
          Restart = "on-failure";
          Group = cfg.group;
          ProtectSystem = "strict";
          NoNewPrivileges = true;
          ProtectHostname = true;
@@ -88,8 +100,5 @@
      };
    };

  meta.maintainers = with lib.maintainers; [
    bot-wxt1221
    Guanran928
  ];
  meta.maintainers = pkgs.clash-verge-rev.meta.maintainers;
}
Loading