diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-14 13:39:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 13:39:57 +0200 |
| commit | 32d00f50ec86aa19c1974950c88abb5bd4ab0e73 (patch) | |
| tree | d1130350aa5d7aa6a96715752d0b991782c24644 /nixos/modules/system | |
| parent | 1010271c63f503113c0e8337977610ea783880ec (diff) | |
| parent | 23b76b23f57c5b2372da85ff39371f26e74e00a1 (diff) | |
| download | nixlib-32d00f50ec86aa19c1974950c88abb5bd4ab0e73.tar nixlib-32d00f50ec86aa19c1974950c88abb5bd4ab0e73.tar.gz nixlib-32d00f50ec86aa19c1974950c88abb5bd4ab0e73.tar.bz2 nixlib-32d00f50ec86aa19c1974950c88abb5bd4ab0e73.tar.lz nixlib-32d00f50ec86aa19c1974950c88abb5bd4ab0e73.tar.xz nixlib-32d00f50ec86aa19c1974950c88abb5bd4ab0e73.tar.zst nixlib-32d00f50ec86aa19c1974950c88abb5bd4ab0e73.zip | |
Merge pull request #18573 from peterhoeg/systemd_user_cfg
systemd: support setting defaults for user instances
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 397e9a4987b7..b724995bb1fc 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -571,6 +571,16 @@ in ''; }; + systemd.user.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultCPUAccounting=yes"; + description = '' + Extra config options for systemd user instances. See man systemd-user.conf for + available options. + ''; + }; + systemd.tmpfiles.rules = mkOption { type = types.listOf types.str; default = []; @@ -665,6 +675,11 @@ in ${config.systemd.extraConfig} ''; + "systemd/user.conf".text = '' + [Manager] + ${config.systemd.user.extraConfig} + ''; + "systemd/journald.conf".text = '' [Journal] RateLimitInterval=${config.services.journald.rateLimitInterval} |