diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-23 00:01:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 00:01:50 +0000 |
| commit | 796a5df129d52d7a7913355130c86add2145a494 (patch) | |
| tree | 746f8c988cc42cfd78204dad0bc2c86baecfb6fc /nixos | |
| parent | 314e0f22d87ea7e8f3dc63273e59a033f956377b (diff) | |
| parent | ed4f741c9c7ff7d2283d216debd3a721fd1b6ec2 (diff) | |
| download | nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.gz nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.bz2 nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.lz nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.xz nixpkgs-796a5df129d52d7a7913355130c86add2145a494.tar.zst nixpkgs-796a5df129d52d7a7913355130c86add2145a494.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/mail/opensmtpd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/safeeyes.nix | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index dc209e8add4..ef7d53e7d92 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -111,7 +111,7 @@ in { }; services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail - security.wrappers.smtpctl // { program = "sendmail"; }; + (security.wrappers.smtpctl // { program = "sendmail"; }); systemd.tmpfiles.rules = [ "d /var/spool/smtpd 711 root - - -" diff --git a/nixos/modules/services/misc/safeeyes.nix b/nixos/modules/services/misc/safeeyes.nix index 1e748195e41..638218d8bb0 100644 --- a/nixos/modules/services/misc/safeeyes.nix +++ b/nixos/modules/services/misc/safeeyes.nix @@ -26,12 +26,16 @@ in config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.safeeyes ]; + systemd.user.services.safeeyes = { description = "Safeeyes"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; + path = [ pkgs.alsa-utils ]; + startLimitIntervalSec = 350; startLimitBurst = 10; serviceConfig = { |