diff options
Diffstat (limited to 'nixos/modules/system/boot/systemd.nix')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index bb6fcc1d38ce..9260bc22b13e 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -33,12 +33,11 @@ let "nss-lookup.target" "nss-user-lookup.target" "time-sync.target" + "first-boot-complete.target" ] ++ optionals cfg.package.withCryptsetup [ "cryptsetup.target" "cryptsetup-pre.target" "remote-cryptsetup.target" - ] ++ optionals cfg.package.withTpm2Tss [ - "tpm2.target" ] ++ [ "sigpwr.target" "timers.target" @@ -161,6 +160,7 @@ let # Misc. "systemd-sysctl.service" + "systemd-machine-id-commit.service" ] ++ optionals cfg.package.withTimedated [ "dbus-org.freedesktop.timedate1.service" "systemd-timedated.service" @@ -198,6 +198,8 @@ in package = mkPackageOption pkgs "systemd" {}; + enableStrictShellChecks = mkEnableOption "" // { description = "Whether to run shellcheck on the generated scripts for systemd units."; }; + units = mkOption { description = "Definition of systemd units; see {manpage}`systemd.unit(5)`."; default = {}; @@ -570,6 +572,15 @@ in "systemd/user-generators" = { source = hooks "user-generators" cfg.user.generators; }; "systemd/system-generators" = { source = hooks "system-generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "system-shutdown" cfg.shutdown; }; + + # Ignore all other preset files so systemd doesn't try to enable/disable + # units during runtime. + "systemd/system-preset/00-nixos.preset".text = '' + ignore * + ''; + "systemd/user-preset/00-nixos.preset".text = '' + ignore * + ''; }); services.dbus.enable = true; @@ -679,7 +690,7 @@ in # Increase numeric PID range (set directly instead of copying a one-line file from systemd) # https://github.com/systemd/systemd/pull/12226 - boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.is64bit (lib.mkDefault 4194304); + boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.hostPlatform.is64bit (lib.mkDefault 4194304); services.logrotate.settings = { "/var/log/btmp" = mapAttrs (_: mkDefault) { |