movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-08 11:35:37 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-07-15 18:01:23 +00:00 • committed by GitHub
commit 9f53d5cc15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 894 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/display-managers/greetd.nix
View file

@ -54,7 +54,7 @@ in
config = mkIf cfg.enable {
services.greetd.settings.terminal.vt = mkDefault cfg.vt;
services.greetd.settings.default_session = mkDefault "greeter";
services.greetd.settings.default_session.user = mkDefault "greeter";
security.pam.services.greetd = {
allowNullPassword = true;

2
nixos/modules/services/monitoring/netdata.nix
View file

@ -201,7 +201,7 @@ in {
serviceConfig = {
ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
ExecPostStart = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done'';
ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done'';
TimeoutStopSec = 60;
Restart = "on-failure";