diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2025-01-06 15:22:16 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2025-01-06 15:22:16 +0100 |
commit | 0d999e7d7637afd0f0744d7036b967632d7ea7aa (patch) | |
tree | 0f055634f0d485a48f7577b2d7163dccdbd5dc8e | |
parent | 67f078a4aa1764b8ba63127b2b0b71e1b4d1522d (diff) | |
download | nixos-0d999e7d7637afd0f0744d7036b967632d7ea7aa.tar nixos-0d999e7d7637afd0f0744d7036b967632d7ea7aa.tar.gz nixos-0d999e7d7637afd0f0744d7036b967632d7ea7aa.tar.bz2 nixos-0d999e7d7637afd0f0744d7036b967632d7ea7aa.tar.xz nixos-0d999e7d7637afd0f0744d7036b967632d7ea7aa.zip |
...
-rw-r--r-- | hosts/sif/hw.nix | 2 | ||||
-rw-r--r-- | system-profiles/core/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hosts/sif/hw.nix b/hosts/sif/hw.nix index fc20ef7c..eb0e98a0 100644 --- a/hosts/sif/hw.nix +++ b/hosts/sif/hw.nix | |||
@@ -15,8 +15,6 @@ | |||
15 | "/var/lib/sops-nix".neededForBoot = true; | 15 | "/var/lib/sops-nix".neededForBoot = true; |
16 | "/var/lib/systemd".neededForBoot = true; | 16 | "/var/lib/systemd".neededForBoot = true; |
17 | }; | 17 | }; |
18 | system.etc.overlay.enable = false; | ||
19 | systemd.sysusers.enable = false; | ||
20 | 18 | ||
21 | # boot.initrd.supportedFilesystems.bcachefs = true; | 19 | # boot.initrd.supportedFilesystems.bcachefs = true; |
22 | # boot.initrd.systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false; | 20 | # boot.initrd.systemd.units."dev-sif-nvm0:-dev-sif-nvm1.device".enable = false; |
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix index 3d3ef117..e7e70eb9 100644 --- a/system-profiles/core/default.nix +++ b/system-profiles/core/default.nix | |||
@@ -214,11 +214,13 @@ in { | |||
214 | ++ (optional (options ? services.userborn) { | 214 | ++ (optional (options ? services.userborn) { |
215 | services.userborn.enable = lib.mkDefault true; | 215 | services.userborn.enable = lib.mkDefault true; |
216 | }) | 216 | }) |
217 | ++ (optional (!(options ? services.userborn) && (options ? system.etc)) { | ||
218 | systemd.sysusers.enable = lib.mkDefault true; | ||
219 | }) | ||
217 | ++ (optional (options ? system.etc) { | 220 | ++ (optional (options ? system.etc) { |
218 | boot.initrd.systemd.enable = lib.mkDefault true; | 221 | boot.initrd.systemd.enable = lib.mkDefault true; |
219 | system.etc.overlay.enable = lib.mkDefault true; | 222 | system.etc.overlay.enable = lib.mkDefault true; |
220 | system.etc.overlay.mutable = lib.mkDefault (!config.systemd.sysusers.enable); | 223 | system.etc.overlay.mutable = lib.mkDefault (!config.systemd.sysusers.enable); |
221 | systemd.sysusers.enable = lib.mkDefault true; | ||
222 | 224 | ||
223 | # Random perl remnants | 225 | # Random perl remnants |
224 | system.disableInstallerTools = lib.mkDefault true; | 226 | system.disableInstallerTools = lib.mkDefault true; |