From f1bf13d0a4b72131f70da04fd8d085696c68d02c Mon Sep 17 00:00:00 2001
From: phaer <phaer@phaer.org>
Date: Fri, 3 Apr 2026 13:31:35 +0200
Subject: [PATCH 1/2] nixos/stage-1,swraid: move mdadmConf rename to swraid.nix

stage-1.nix had mkRenamedOptionModule from boot.initrd.mdadmConf to
boot.swraid.mdadmConf. Move it to tasks/swraid.nix where the target
option is defined.
---
 nixos/modules/system/boot/stage-1.nix | 1 -
 nixos/modules/tasks/swraid.nix        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 343777d05c3a..003ff7c78cff 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -786,6 +786,5 @@ in
   };
 
   imports = [
-    (mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
   ];
 }
diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix
index 01bc91b1b896..556bb45a456b 100644
--- a/nixos/modules/tasks/swraid.nix
+++ b/nixos/modules/tasks/swraid.nix
@@ -26,6 +26,7 @@ in
       [ "boot" "initrd" "services" "swraid" "mdadmConf" ]
       [ "boot" "swraid" "mdadmConf" ]
     )
+    (lib.mkRenamedOptionModule [ "boot" "initrd" "mdadmConf" ] [ "boot" "swraid" "mdadmConf" ])
   ];
 
   options.boot.swraid = {

From 9c32386c278f4d0028caf839506892780400014f Mon Sep 17 00:00:00 2001
From: phaer <phaer@phaer.org>
Date: Fri, 3 Apr 2026 13:31:55 +0200
Subject: [PATCH 2/2] nixos/journald: move enableHttpGateway rename to
 journald-gateway.nix

journald.nix had mkRenamedOptionModule from enableHttpGateway to
services.journald.gateway.enable. Move it to journald-gateway.nix
where the target option is defined.
---
 nixos/modules/system/boot/systemd/journald-gateway.nix | 7 +++++++
 nixos/modules/system/boot/systemd/journald.nix         | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix
index b8c0a1a25d6d..cede0a65f510 100644
--- a/nixos/modules/system/boot/systemd/journald-gateway.nix
+++ b/nixos/modules/system/boot/systemd/journald-gateway.nix
@@ -21,6 +21,13 @@ let
   };
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "journald" "enableHttpGateway" ]
+      [ "services" "journald" "gateway" "enable" ]
+    )
+  ];
+
   meta.maintainers = [ lib.maintainers.raitobezarius ];
   options.services.journald.gateway = {
     enable = lib.mkEnableOption "the HTTP gateway to the journal";
diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix
index 279da8f47c0b..7596228b75ff 100644
--- a/nixos/modules/system/boot/systemd/journald.nix
+++ b/nixos/modules/system/boot/systemd/journald.nix
@@ -10,10 +10,6 @@ let
 in
 {
   imports = [
-    (lib.mkRenamedOptionModule
-      [ "services" "journald" "enableHttpGateway" ]
-      [ "services" "journald" "gateway" "enable" ]
-    )
   ];
 
   options = {