From 0d999e7d7637afd0f0744d7036b967632d7ea7aa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 6 Jan 2025 15:22:16 +0100
Subject: ...

---
 hosts/sif/hw.nix                 | 2 --
 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 @@
     "/var/lib/sops-nix".neededForBoot = true;
     "/var/lib/systemd".neededForBoot = true;
   };
-  system.etc.overlay.enable = false;
-  systemd.sysusers.enable = false;
 
   # boot.initrd.supportedFilesystems.bcachefs = true;
   # 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 {
   ++ (optional (options ? services.userborn) {
     services.userborn.enable = lib.mkDefault true;
   })
+  ++ (optional (!(options ? services.userborn) && (options ? system.etc)) {
+    systemd.sysusers.enable = lib.mkDefault true;
+  })
   ++ (optional (options ? system.etc) {
     boot.initrd.systemd.enable = lib.mkDefault true;
     system.etc.overlay.enable = lib.mkDefault true;
     system.etc.overlay.mutable = lib.mkDefault (!config.systemd.sysusers.enable);
-    systemd.sysusers.enable = lib.mkDefault true;
 
     # Random perl remnants
     system.disableInstallerTools = lib.mkDefault true;
-- 
cgit v1.2.3