3 files changed, 28 insertions, 2 deletions

diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index 71d0619a..b85aea4e 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -181,7 +181,7 @@ in {
             programs.ssh.internallyManaged = mkForce true;
           }
         ];
-        extraSpecialArgs = { inherit flake flakeInputs path; };
+        extraSpecialArgs = { inherit flake flakeInputs path; hostConfig = config; };
       };
 
       sops = mkIf hasSops {
@@ -208,11 +208,22 @@ in {
       enableNg = true;
     };
   })
+  ++ (optional (options ? system.rebuild.enableNg) {
+    system.rebuild.enableNg = lib.mkDefault true;
+  })
+  ++ (optional (options ? services.userborn) {
+    services.userborn = {
+      enable = lib.mkDefault true;
+      passwordFilesLocation = lib.mkDefault "/var/lib/nixos";
+    };
+  })
+  ++ (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;
diff --git a/system-profiles/niri-flake.nix b/system-profiles/niri-flake.nix
new file mode 100644
index 00000000..b28d51ff
--- /dev/null
+++ b/system-profiles/niri-flake.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  config.niri-flake.cache.enable = false;
+}
diff --git a/system-profiles/niri-unstable.nix b/system-profiles/niri-unstable.nix
new file mode 100644
index 00000000..3a8b393d
--- /dev/null
+++ b/system-profiles/niri-unstable.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, lib, ... }:
+{
+  config = {
+    programs.niri.package = lib.mkDefault pkgs.niri-unstable;
+    home-manager.sharedModules = [
+      {
+        programs.niri.package = lib.mkDefault config.programs.niri.package;
+      }
+    ];
+  };
+}